From 6b924c51528e663dda5091a1493229a361676aca Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 30 Aug 2024 10:31:46 +0200 Subject: [PATCH] ESM merge to main (#227184) Co-authored-by: Johannes Rieken Co-authored-by: Alexandru Dima --- .eslintplugin/code-import-patterns.ts | 27 +- .eslintrc.json | 20 +- .github/workflows/monaco-editor.yml | 50 +-- .vscode/settings.json | 2 +- .../darwin/product-build-darwin-test.yml | 50 +-- .../darwin/product-build-darwin.yml | 4 +- .../product-build-linux-legacy-server.yml | 4 +- .../linux/product-build-linux-test.yml | 50 +-- .../linux/product-build-linux.yml | 4 +- build/azure-pipelines/product-build-pr.yml | 7 + build/azure-pipelines/product-build.yml | 50 +-- build/azure-pipelines/product-compile.yml | 8 +- .../win32/product-build-win32-test.yml | 54 +-- .../win32/product-build-win32.yml | 4 +- build/buildfile.js | 6 +- build/darwin/create-universal-app.js | 4 +- build/darwin/create-universal-app.ts | 4 +- build/gulpfile.compile.js | 8 +- build/gulpfile.js | 6 +- build/gulpfile.reh.js | 8 +- build/gulpfile.vscode.js | 19 +- build/gulpfile.vscode.web.js | 6 +- build/lib/{esm.js => amd.js} | 24 +- build/lib/{esm.ts => amd.ts} | 18 +- build/lib/layersChecker.js | 1 + build/lib/layersChecker.ts | 1 + build/lib/mangle/index.js | 4 +- build/lib/mangle/index.ts | 6 +- build/lib/nls.js | 6 +- build/lib/nls.ts | 6 +- build/lib/optimize.js | 4 +- build/lib/optimize.ts | 4 +- build/linux/dependencies-generator.js | 4 +- build/linux/dependencies-generator.ts | 4 +- migrate.mjs | 6 +- package.json | 14 +- scripts/code-web.js | 2 +- scripts/{test-esm.bat => test-amd.bat} | 2 +- scripts/{test-esm.sh => test-amd.sh} | 4 +- ...ation-esm.bat => test-integration-amd.bat} | 2 +- ...gration-esm.sh => test-integration-amd.sh} | 2 +- src/bootstrap-amd.js | 182 ++++---- src/bootstrap-fork.js | 12 +- src/bootstrap-meta.js | 14 +- src/bootstrap-node.js | 117 ++--- src/bootstrap-window.js | 232 +++++----- src/cli.js | 38 +- src/main.js | 58 +-- src/package.json | 3 + src/server-cli.js | 32 +- src/server-main.js | 58 +-- src/tsconfig.base.json | 7 +- src/vs/amdX.ts | 12 +- src/vs/base/browser/broadcast.ts | 8 +- src/vs/base/browser/browser.ts | 4 +- src/vs/base/browser/canIUse.ts | 6 +- src/vs/base/browser/contextmenu.ts | 14 +- src/vs/base/browser/defaultWorkerFactory.ts | 34 +- src/vs/base/browser/dnd.ts | 6 +- src/vs/base/browser/dom.ts | 32 +- src/vs/base/browser/domObservable.ts | 6 +- src/vs/base/browser/dompurify/dompurify.js | 24 +- src/vs/base/browser/event.ts | 6 +- src/vs/base/browser/fonts.ts | 2 +- src/vs/base/browser/formattedTextRenderer.ts | 8 +- .../base/browser/globalPointerMoveMonitor.ts | 4 +- src/vs/base/browser/hash.ts | 4 +- src/vs/base/browser/history.ts | 2 +- src/vs/base/browser/indexedDB.ts | 6 +- src/vs/base/browser/keyboardEvent.ts | 8 +- src/vs/base/browser/markdownRenderer.ts | 44 +- src/vs/base/browser/mouseEvent.ts | 6 +- src/vs/base/browser/pixelRatio.ts | 6 +- src/vs/base/browser/touch.ts | 14 +- src/vs/base/browser/trustedTypes.ts | 2 +- .../browser/ui/actionbar/actionViewItems.ts | 36 +- src/vs/base/browser/ui/actionbar/actionbar.ts | 22 +- src/vs/base/browser/ui/aria/aria.ts | 4 +- .../ui/breadcrumbs/breadcrumbsWidget.ts | 18 +- src/vs/base/browser/ui/button/button.ts | 44 +- .../browser/ui/centered/centeredViewLayout.ts | 14 +- .../base/browser/ui/codicons/codiconStyles.ts | 4 +- .../browser/ui/contextview/contextview.ts | 16 +- .../base/browser/ui/countBadge/countBadge.ts | 6 +- src/vs/base/browser/ui/dialog/dialog.ts | 30 +- src/vs/base/browser/ui/dropdown/dropdown.ts | 28 +- .../ui/dropdown/dropdownActionViewItem.ts | 36 +- src/vs/base/browser/ui/findinput/findInput.ts | 28 +- .../browser/ui/findinput/findInputToggles.ts | 10 +- .../base/browser/ui/findinput/replaceInput.ts | 28 +- src/vs/base/browser/ui/grid/grid.ts | 16 +- src/vs/base/browser/ui/grid/gridview.ts | 26 +- .../ui/highlightedlabel/highlightedLabel.ts | 16 +- src/vs/base/browser/ui/hover/hover.ts | 10 +- src/vs/base/browser/ui/hover/hoverDelegate.ts | 8 +- .../base/browser/ui/hover/hoverDelegate2.ts | 2 +- .../browser/ui/hover/hoverDelegateFactory.ts | 4 +- src/vs/base/browser/ui/hover/hoverWidget.ts | 14 +- src/vs/base/browser/ui/iconLabel/iconLabel.ts | 28 +- .../base/browser/ui/iconLabel/iconLabels.ts | 4 +- .../browser/ui/iconLabel/simpleIconLabel.ts | 12 +- src/vs/base/browser/ui/icons/iconSelectBox.ts | 24 +- src/vs/base/browser/ui/inputbox/inputBox.ts | 40 +- .../ui/keybindingLabel/keybindingLabel.ts | 22 +- src/vs/base/browser/ui/list/list.ts | 12 +- src/vs/base/browser/ui/list/listPaging.ts | 20 +- src/vs/base/browser/ui/list/listView.ts | 42 +- src/vs/base/browser/ui/list/listWidget.ts | 52 +-- src/vs/base/browser/ui/list/rangeMap.ts | 2 +- src/vs/base/browser/ui/list/rowCache.ts | 6 +- src/vs/base/browser/ui/list/splice.ts | 2 +- src/vs/base/browser/ui/menu/menu.ts | 44 +- src/vs/base/browser/ui/menu/menubar.ts | 40 +- .../browser/ui/mouseCursor/mouseCursor.ts | 2 +- .../progressAccessibilitySignal.ts | 2 +- .../browser/ui/progressbar/progressbar.ts | 12 +- src/vs/base/browser/ui/radio/radio.ts | 18 +- src/vs/base/browser/ui/resizable/resizable.ts | 8 +- src/vs/base/browser/ui/sash/sash.ts | 18 +- .../browser/ui/scrollbar/abstractScrollbar.ts | 20 +- .../ui/scrollbar/horizontalScrollbar.ts | 14 +- .../browser/ui/scrollbar/scrollableElement.ts | 30 +- .../ui/scrollbar/scrollableElementOptions.ts | 2 +- .../browser/ui/scrollbar/scrollbarArrow.ts | 10 +- .../scrollbarVisibilityController.ts | 8 +- .../browser/ui/scrollbar/verticalScrollbar.ts | 14 +- src/vs/base/browser/ui/selectBox/selectBox.ts | 20 +- .../browser/ui/selectBox/selectBoxCustom.ts | 40 +- .../browser/ui/selectBox/selectBoxNative.ts | 16 +- src/vs/base/browser/ui/splitview/paneview.ts | 30 +- src/vs/base/browser/ui/splitview/splitview.ts | 26 +- src/vs/base/browser/ui/table/table.ts | 4 +- src/vs/base/browser/ui/table/tableWidget.ts | 24 +- src/vs/base/browser/ui/toggle/toggle.ts | 28 +- src/vs/base/browser/ui/toolbar/toolbar.ts | 28 +- src/vs/base/browser/ui/tree/abstractTree.ts | 68 +-- src/vs/base/browser/ui/tree/asyncDataTree.ts | 36 +- .../ui/tree/compressedObjectTreeModel.ts | 14 +- src/vs/base/browser/ui/tree/dataTree.ts | 12 +- src/vs/base/browser/ui/tree/indexTree.ts | 12 +- src/vs/base/browser/ui/tree/indexTreeModel.ts | 18 +- src/vs/base/browser/ui/tree/objectTree.ts | 18 +- .../base/browser/ui/tree/objectTreeModel.ts | 10 +- src/vs/base/browser/ui/tree/tree.ts | 10 +- src/vs/base/browser/ui/tree/treeDefaults.ts | 6 +- src/vs/base/browser/ui/widget.ts | 10 +- src/vs/base/common/actions.ts | 6 +- src/vs/base/common/amd.ts | 8 +- src/vs/base/common/arrays.ts | 8 +- src/vs/base/common/arraysFind.ts | 2 +- src/vs/base/common/assert.ts | 2 +- src/vs/base/common/async.ts | 18 +- src/vs/base/common/buffer.ts | 4 +- src/vs/base/common/cache.ts | 4 +- src/vs/base/common/cancellation.ts | 4 +- src/vs/base/common/codicons.ts | 6 +- src/vs/base/common/codiconsLibrary.ts | 2 +- src/vs/base/common/codiconsUtil.ts | 4 +- src/vs/base/common/color.ts | 2 +- src/vs/base/common/comparers.ts | 4 +- src/vs/base/common/console.ts | 2 +- src/vs/base/common/controlFlow.ts | 2 +- src/vs/base/common/dataTransfer.ts | 8 +- src/vs/base/common/date.ts | 2 +- src/vs/base/common/desktopEnvironmentInfo.ts | 2 +- src/vs/base/common/diff/diff.ts | 6 +- src/vs/base/common/equals.ts | 2 +- src/vs/base/common/errorMessage.ts | 8 +- src/vs/base/common/event.ts | 16 +- src/vs/base/common/extpath.ts | 10 +- src/vs/base/common/filters.ts | 8 +- src/vs/base/common/fuzzyScorer.ts | 14 +- src/vs/base/common/glob.ts | 16 +- src/vs/base/common/hash.ts | 2 +- src/vs/base/common/history.ts | 4 +- src/vs/base/common/hotReload.ts | 4 +- src/vs/base/common/hotReloadHelpers.ts | 4 +- src/vs/base/common/htmlContent.ts | 10 +- src/vs/base/common/iconLabels.ts | 6 +- src/vs/base/common/ime.ts | 2 +- src/vs/base/common/jsonEdit.ts | 4 +- src/vs/base/common/jsonErrorMessages.ts | 4 +- src/vs/base/common/jsonFormatter.ts | 2 +- src/vs/base/common/jsonc.js | 8 +- src/vs/base/common/keybindingLabels.ts | 6 +- src/vs/base/common/keybindingParser.ts | 4 +- src/vs/base/common/keybindings.ts | 6 +- src/vs/base/common/labels.ts | 14 +- src/vs/base/common/lifecycle.ts | 10 +- src/vs/base/common/linkedText.ts | 2 +- src/vs/base/common/map.ts | 2 +- src/vs/base/common/marked/marked.js | 50 +-- src/vs/base/common/marshalling.ts | 6 +- src/vs/base/common/mime.ts | 2 +- src/vs/base/common/network.ts | 18 +- src/vs/base/common/normalization.ts | 2 +- src/vs/base/common/objects.ts | 2 +- src/vs/base/common/observable.ts | 18 +- src/vs/base/common/observableInternal/api.ts | 10 +- .../base/common/observableInternal/autorun.ts | 10 +- src/vs/base/common/observableInternal/base.ts | 12 +- .../base/common/observableInternal/derived.ts | 12 +- .../observableInternal/lazyObservableValue.ts | 8 +- .../base/common/observableInternal/logging.ts | 8 +- .../base/common/observableInternal/promise.ts | 14 +- .../base/common/observableInternal/utils.ts | 18 +- src/vs/base/common/paging.ts | 6 +- src/vs/base/common/path.ts | 2 +- src/vs/base/common/performance.js | 8 +- src/vs/base/common/platform.ts | 2 +- src/vs/base/common/prefixTree.ts | 2 +- src/vs/base/common/process.ts | 2 +- src/vs/base/common/processes.ts | 2 +- src/vs/base/common/product.ts | 4 +- src/vs/base/common/resourceTree.ts | 10 +- src/vs/base/common/resources.ts | 14 +- src/vs/base/common/scrollable.ts | 4 +- src/vs/base/common/search.ts | 2 +- src/vs/base/common/semver/semver.d.ts | 6 +- src/vs/base/common/semver/semver.js | 78 ++-- src/vs/base/common/sequence.ts | 2 +- src/vs/base/common/severity.ts | 2 +- src/vs/base/common/stream.ts | 6 +- src/vs/base/common/strings.ts | 8 +- src/vs/base/common/ternarySearchTree.ts | 8 +- src/vs/base/common/tfIdf.ts | 2 +- src/vs/base/common/themables.ts | 2 +- src/vs/base/common/uri.ts | 8 +- src/vs/base/common/uriIpc.ts | 8 +- src/vs/base/common/verifier.ts | 2 +- src/vs/base/common/worker/simpleWorker.ts | 24 +- .../common/worker/simpleWorkerBootstrap.ts | 2 +- src/vs/base/node/crypto.ts | 2 +- src/vs/base/node/extpath.ts | 10 +- src/vs/base/node/id.ts | 8 +- src/vs/base/node/nls.js | 20 +- src/vs/base/node/nodeStreams.ts | 2 +- src/vs/base/node/osDisplayProtocolInfo.ts | 4 +- src/vs/base/node/osReleaseInfo.ts | 2 +- src/vs/base/node/pfs.ts | 14 +- src/vs/base/node/powershell.ts | 4 +- src/vs/base/node/processes.ts | 12 +- src/vs/base/node/ps.ts | 4 +- src/vs/base/node/shell.ts | 6 +- src/vs/base/node/terminalEncoding.ts | 2 +- src/vs/base/node/unc.js | 14 +- src/vs/base/node/zip.ts | 12 +- .../contextmenu/electron-main/contextmenu.ts | 4 +- .../electron-sandbox/contextmenu.ts | 4 +- src/vs/base/parts/ipc/browser/ipc.mp.ts | 4 +- src/vs/base/parts/ipc/common/ipc.electron.ts | 6 +- src/vs/base/parts/ipc/common/ipc.mp.ts | 8 +- src/vs/base/parts/ipc/common/ipc.net.ts | 8 +- src/vs/base/parts/ipc/common/ipc.ts | 22 +- .../parts/ipc/electron-main/ipc.electron.ts | 12 +- src/vs/base/parts/ipc/electron-main/ipc.mp.ts | 10 +- .../base/parts/ipc/electron-main/ipcMain.ts | 6 +- .../ipc/electron-sandbox/ipc.electron.ts | 12 +- .../base/parts/ipc/electron-sandbox/ipc.mp.ts | 8 +- src/vs/base/parts/ipc/node/ipc.cp.ts | 22 +- src/vs/base/parts/ipc/node/ipc.mp.ts | 12 +- src/vs/base/parts/ipc/node/ipc.net.ts | 18 +- .../parts/ipc/test/browser/ipc.mp.test.ts | 8 +- src/vs/base/parts/ipc/test/common/ipc.test.ts | 20 +- .../ipc/test/electron-sandbox/ipc.mp.test.ts | 4 +- .../ipc/test/node/ipc.cp.integrationTest.ts | 10 +- .../base/parts/ipc/test/node/ipc.net.test.ts | 18 +- src/vs/base/parts/ipc/test/node/testApp.ts | 4 +- .../base/parts/ipc/test/node/testService.ts | 6 +- src/vs/base/parts/request/browser/request.ts | 8 +- src/vs/base/parts/request/common/request.ts | 2 +- .../request/test/browser/request.test.ts | 10 +- .../base/parts/sandbox/common/sandboxTypes.ts | 4 +- .../parts/sandbox/electron-sandbox/globals.ts | 10 +- .../test/electron-sandbox/globals.test.ts | 4 +- src/vs/base/parts/storage/common/storage.ts | 10 +- src/vs/base/parts/storage/node/storage.ts | 16 +- .../test/node/storage.integrationTest.ts | 22 +- src/vs/base/test/browser/actionbar.test.ts | 6 +- src/vs/base/test/browser/browser.test.ts | 4 +- src/vs/base/test/browser/comparers.test.ts | 4 +- src/vs/base/test/browser/dom.test.ts | 10 +- .../browser/formattedTextRenderer.test.ts | 6 +- src/vs/base/test/browser/hash.test.ts | 6 +- .../test/browser/highlightedLabel.test.ts | 4 +- src/vs/base/test/browser/iconLabels.test.ts | 6 +- src/vs/base/test/browser/indexedDB.test.ts | 6 +- .../test/browser/markdownRenderer.test.ts | 14 +- src/vs/base/test/browser/progressBar.test.ts | 6 +- .../ui/contextview/contextview.test.ts | 4 +- src/vs/base/test/browser/ui/grid/grid.test.ts | 12 +- .../test/browser/ui/grid/gridview.test.ts | 8 +- src/vs/base/test/browser/ui/grid/util.ts | 6 +- .../test/browser/ui/list/listView.test.ts | 8 +- .../test/browser/ui/list/listWidget.test.ts | 10 +- .../test/browser/ui/list/rangeMap.test.ts | 6 +- .../base/test/browser/ui/menu/menubar.test.ts | 8 +- .../ui/scrollbar/scrollableElement.test.ts | 4 +- .../ui/scrollbar/scrollbarState.test.ts | 4 +- .../browser/ui/splitview/splitview.test.ts | 8 +- .../browser/ui/tree/asyncDataTree.test.ts | 16 +- .../ui/tree/compressedObjectTreeModel.test.ts | 12 +- .../test/browser/ui/tree/dataTree.test.ts | 8 +- .../browser/ui/tree/indexTreeModel.test.ts | 8 +- .../test/browser/ui/tree/objectTree.test.ts | 10 +- .../browser/ui/tree/objectTreeModel.test.ts | 10 +- src/vs/base/test/common/arrays.test.ts | 6 +- src/vs/base/test/common/arraysFind.test.ts | 4 +- src/vs/base/test/common/assert.test.ts | 4 +- src/vs/base/test/common/async.test.ts | 18 +- src/vs/base/test/common/buffer.test.ts | 8 +- src/vs/base/test/common/cache.test.ts | 6 +- src/vs/base/test/common/cancellation.test.ts | 4 +- src/vs/base/test/common/charCode.test.ts | 4 +- src/vs/base/test/common/collections.test.ts | 4 +- src/vs/base/test/common/color.test.ts | 4 +- src/vs/base/test/common/console.test.ts | 6 +- src/vs/base/test/common/date.test.ts | 4 +- src/vs/base/test/common/decorators.test.ts | 4 +- src/vs/base/test/common/diff/diff.test.ts | 4 +- src/vs/base/test/common/errors.test.ts | 4 +- src/vs/base/test/common/event.test.ts | 20 +- src/vs/base/test/common/extpath.test.ts | 8 +- src/vs/base/test/common/filters.perf.test.ts | 10 +- src/vs/base/test/common/filters.test.ts | 4 +- src/vs/base/test/common/fuzzyScorer.test.ts | 12 +- src/vs/base/test/common/glob.test.ts | 10 +- src/vs/base/test/common/history.test.ts | 4 +- src/vs/base/test/common/iconLabels.test.ts | 6 +- src/vs/base/test/common/iterator.test.ts | 4 +- src/vs/base/test/common/json.test.ts | 6 +- src/vs/base/test/common/jsonEdit.test.ts | 6 +- src/vs/base/test/common/jsonFormatter.test.ts | 4 +- src/vs/base/test/common/jsonParse.test.ts | 4 +- src/vs/base/test/common/jsonSchema.test.ts | 4 +- src/vs/base/test/common/keyCodes.test.ts | 8 +- src/vs/base/test/common/keybindings.test.ts | 6 +- src/vs/base/test/common/labels.test.ts | 8 +- src/vs/base/test/common/lazy.test.ts | 4 +- src/vs/base/test/common/lifecycle.test.ts | 6 +- src/vs/base/test/common/linkedList.test.ts | 4 +- src/vs/base/test/common/linkedText.test.ts | 4 +- src/vs/base/test/common/map.test.ts | 8 +- .../base/test/common/markdownString.test.ts | 4 +- src/vs/base/test/common/marshalling.test.ts | 6 +- src/vs/base/test/common/mime.test.ts | 4 +- .../common/naturalLanguage/korean.test.ts | 4 +- src/vs/base/test/common/network.test.ts | 10 +- src/vs/base/test/common/normalization.test.ts | 4 +- src/vs/base/test/common/numbers.test.ts | 4 +- src/vs/base/test/common/objects.test.ts | 4 +- src/vs/base/test/common/observable.test.ts | 12 +- src/vs/base/test/common/paging.test.ts | 10 +- src/vs/base/test/common/path.test.ts | 8 +- src/vs/base/test/common/prefixTree.test.ts | 4 +- src/vs/base/test/common/processes.test.ts | 4 +- src/vs/base/test/common/resourceTree.test.ts | 6 +- src/vs/base/test/common/resources.test.ts | 12 +- src/vs/base/test/common/scrollable.test.ts | 4 +- src/vs/base/test/common/skipList.test.ts | 8 +- src/vs/base/test/common/snapshot.ts | 6 +- src/vs/base/test/common/stream.test.ts | 10 +- src/vs/base/test/common/strings.test.ts | 4 +- .../test/common/ternarySearchtree.test.ts | 12 +- src/vs/base/test/common/tfIdf.test.ts | 6 +- .../base/test/common/timeTravelScheduler.ts | 8 +- src/vs/base/test/common/troubleshooting.ts | 2 +- src/vs/base/test/common/types.test.ts | 4 +- src/vs/base/test/common/uri.test.ts | 6 +- src/vs/base/test/common/utils.ts | 8 +- src/vs/base/test/common/uuid.test.ts | 4 +- src/vs/base/test/node/crypto.test.ts | 10 +- src/vs/base/test/node/css.build.test.ts | 4 +- src/vs/base/test/node/extpath.test.ts | 8 +- src/vs/base/test/node/id.test.ts | 8 +- src/vs/base/test/node/nodeStreams.test.ts | 4 +- src/vs/base/test/node/pfs/pfs.test.ts | 18 +- src/vs/base/test/node/port.test.ts | 6 +- src/vs/base/test/node/powershell.test.ts | 6 +- .../base/test/node/processes/fixtures/fork.ts | 2 +- .../node/processes/fixtures/fork_large.ts | 2 +- .../processes/processes.integrationTest.ts | 8 +- src/vs/base/test/node/snapshot.test.ts | 10 +- src/vs/base/test/node/testUtils.ts | 6 +- src/vs/base/test/node/unc.test.ts | 4 +- src/vs/base/test/node/uri.perf.test.ts | 6 +- src/vs/base/test/node/zip/zip.test.ts | 14 +- src/vs/base/worker/workerMain.ts | 18 +- src/vs/code/browser/workbench/workbench.ts | 36 +- src/vs/code/electron-main/app.ts | 234 +++++----- src/vs/code/electron-main/main.ts | 132 +++--- .../processExplorer/processExplorerMain.ts | 46 +- src/vs/code/node/cli.ts | 42 +- src/vs/code/node/cliProcessMain.ts | 118 ++--- .../sharedProcess/contrib/codeCacheCleaner.ts | 14 +- .../node/sharedProcess/contrib/extensions.ts | 14 +- .../contrib/languagePackCachedDataCleaner.ts | 18 +- .../contrib/localizationsUpdater.ts | 6 +- .../sharedProcess/contrib/logsDataCleaner.ts | 18 +- .../contrib/storageDataCleaner.ts | 26 +- .../contrib/userDataProfilesCleaner.ts | 6 +- .../node/sharedProcess/sharedProcessMain.ts | 230 +++++----- .../editor/browser/config/charWidthReader.ts | 4 +- src/vs/editor/browser/config/domFontInfo.ts | 4 +- .../browser/config/editorConfiguration.ts | 38 +- .../browser/config/elementSizeObserver.ts | 8 +- .../editor/browser/config/fontMeasurements.ts | 14 +- .../editor/browser/config/migrateOptions.ts | 2 +- src/vs/editor/browser/config/tabFocus.ts | 2 +- .../editor/browser/controller/mouseHandler.ts | 36 +- .../editor/browser/controller/mouseTarget.ts | 38 +- .../browser/controller/pointerHandler.ts | 26 +- .../browser/controller/textAreaHandler.ts | 68 +-- .../browser/controller/textAreaInput.ts | 34 +- .../browser/controller/textAreaState.ts | 8 +- src/vs/editor/browser/coreCommands.ts | 56 +-- src/vs/editor/browser/dnd.ts | 10 +- src/vs/editor/browser/editorBrowser.ts | 44 +- src/vs/editor/browser/editorDom.ts | 16 +- src/vs/editor/browser/editorExtensions.ts | 44 +- src/vs/editor/browser/observableCodeEditor.ts | 24 +- .../services/abstractCodeEditorService.ts | 26 +- .../browser/services/bulkEditService.ts | 18 +- .../browser/services/codeEditorService.ts | 16 +- .../browser/services/editorWorkerService.ts | 60 +-- .../services/hoverService/hoverService.ts | 42 +- .../services/hoverService/hoverWidget.ts | 40 +- .../hoverService/updatableHoverWidget.ts | 18 +- .../browser/services/markerDecorations.ts | 8 +- .../editor/browser/services/openerService.ts | 28 +- .../treeSitter/treeSitterParserService.ts | 36 +- src/vs/editor/browser/stableEditorScroll.ts | 6 +- src/vs/editor/browser/view.ts | 106 ++--- .../browser/view/domLineBreaksComputer.ts | 22 +- .../editor/browser/view/dynamicViewOverlay.ts | 4 +- .../editor/browser/view/renderingContext.ts | 8 +- src/vs/editor/browser/view/viewController.ts | 22 +- src/vs/editor/browser/view/viewLayer.ts | 14 +- src/vs/editor/browser/view/viewOverlays.ts | 22 +- src/vs/editor/browser/view/viewPart.ts | 8 +- .../browser/view/viewUserInputEvents.ts | 10 +- .../blockDecorations/blockDecorations.ts | 14 +- .../contentWidgets/contentWidgets.ts | 26 +- .../currentLineHighlight.ts | 24 +- .../viewParts/decorations/decorations.ts | 16 +- .../editorScrollbar/editorScrollbar.ts | 24 +- .../viewParts/glyphMargin/glyphMargin.ts | 26 +- .../viewParts/indentGuides/indentGuides.ts | 28 +- .../viewParts/lineNumbers/lineNumbers.ts | 22 +- .../browser/viewParts/lines/rangeUtil.ts | 6 +- .../browser/viewParts/lines/viewLine.ts | 30 +- .../browser/viewParts/lines/viewLines.ts | 42 +- .../linesDecorations/linesDecorations.ts | 12 +- .../editor/browser/viewParts/margin/margin.ts | 14 +- .../marginDecorations/marginDecorations.ts | 10 +- .../browser/viewParts/minimap/minimap.ts | 68 +-- .../viewParts/minimap/minimapCharRenderer.ts | 6 +- .../minimap/minimapCharRendererFactory.ts | 8 +- .../viewParts/minimap/minimapPreBaked.ts | 2 +- .../overlayWidgets/overlayWidgets.ts | 18 +- .../overviewRuler/decorationsOverviewRuler.ts | 30 +- .../viewParts/overviewRuler/overviewRuler.ts | 14 +- .../editor/browser/viewParts/rulers/rulers.ts | 14 +- .../scrollDecoration/scrollDecoration.ts | 14 +- .../viewParts/selections/selections.ts | 18 +- .../viewParts/viewCursors/viewCursor.ts | 22 +- .../viewParts/viewCursors/viewCursors.ts | 30 +- .../browser/viewParts/viewZones/viewZones.ts | 20 +- .../viewParts/whitespace/whitespace.ts | 28 +- .../codeEditor/codeEditorContributions.ts | 14 +- .../widget/codeEditor/codeEditorWidget.ts | 114 ++--- .../codeEditor/embeddedCodeEditorWidget.ts | 26 +- .../browser/widget/diffEditor/commands.ts | 34 +- .../components/accessibleDiffViewer.ts | 62 +-- .../components/diffEditorDecorations.ts | 22 +- .../components/diffEditorEditors.ts | 32 +- .../diffEditor/components/diffEditorSash.ts | 10 +- .../diffEditorViewZones.ts | 56 +-- .../inlineDiffDeletedCodeMargin.ts | 30 +- .../diffEditorViewZones/renderLines.ts | 22 +- .../widget/diffEditor/delegatingEditorImpl.ts | 20 +- .../diffEditor/diffEditor.contribution.ts | 16 +- .../widget/diffEditor/diffEditorOptions.ts | 18 +- .../widget/diffEditor/diffEditorViewModel.ts | 42 +- .../widget/diffEditor/diffEditorWidget.ts | 92 ++-- .../diffEditor/diffProviderFactoryService.ts | 24 +- .../diffEditor/embeddedDiffEditorWidget.ts | 18 +- .../diffEditor/features/gutterFeature.ts | 56 +-- .../features/hideUnchangedRegionsFeature.ts | 48 +- .../features/movedBlocksLinesFeature.ts | 36 +- .../features/overviewRulerFeature.ts | 34 +- .../features/revertButtonsFeature.ts | 30 +- .../diffEditor/registrations.contribution.ts | 12 +- .../editor/browser/widget/diffEditor/utils.ts | 24 +- .../widget/diffEditor/utils/editorGutter.ts | 12 +- .../browser/markdownRenderer.ts | 28 +- .../browser/widget/multiDiffEditor/colors.ts | 4 +- .../multiDiffEditor/diffEditorItemTemplate.ts | 40 +- .../browser/widget/multiDiffEditor/model.ts | 10 +- .../multiDiffEditorViewModel.ts | 28 +- .../multiDiffEditor/multiDiffEditorWidget.ts | 34 +- .../multiDiffEditorWidgetImpl.ts | 58 +-- .../widget/multiDiffEditor/objectPool.ts | 2 +- .../browser/widget/multiDiffEditor/utils.ts | 2 +- .../workbenchUIElementFactory.ts | 4 +- .../editor/common/commands/replaceCommand.ts | 8 +- src/vs/editor/common/commands/shiftCommand.ts | 20 +- .../commands/surroundSelectionCommand.ts | 10 +- .../commands/trimTrailingWhitespaceCommand.ts | 16 +- src/vs/editor/common/config/diffEditor.ts | 2 +- .../common/config/editorConfiguration.ts | 10 +- .../config/editorConfigurationSchema.ts | 12 +- src/vs/editor/common/config/editorOptions.ts | 26 +- src/vs/editor/common/config/editorZoom.ts | 2 +- src/vs/editor/common/config/fontInfo.ts | 6 +- .../editor/common/core/characterClassifier.ts | 2 +- src/vs/editor/common/core/cursorColumns.ts | 4 +- src/vs/editor/common/core/editOperation.ts | 4 +- .../editor/common/core/editorColorRegistry.ts | 8 +- src/vs/editor/common/core/eolCounter.ts | 2 +- src/vs/editor/common/core/indentation.ts | 4 +- src/vs/editor/common/core/lineRange.ts | 8 +- src/vs/editor/common/core/offsetRange.ts | 2 +- src/vs/editor/common/core/positionToOffset.ts | 10 +- src/vs/editor/common/core/range.ts | 2 +- src/vs/editor/common/core/rangeMapping.ts | 8 +- src/vs/editor/common/core/selection.ts | 4 +- src/vs/editor/common/core/stringBuilder.ts | 6 +- src/vs/editor/common/core/textChange.ts | 4 +- src/vs/editor/common/core/textEdit.ts | 14 +- src/vs/editor/common/core/textLength.ts | 4 +- .../common/core/wordCharacterClassifier.ts | 6 +- src/vs/editor/common/core/wordHelper.ts | 6 +- src/vs/editor/common/cursor/cursor.ts | 38 +- .../cursor/cursorAtomicMoveOperations.ts | 4 +- .../editor/common/cursor/cursorCollection.ts | 16 +- .../common/cursor/cursorColumnSelection.ts | 6 +- src/vs/editor/common/cursor/cursorContext.ts | 6 +- .../common/cursor/cursorDeleteOperations.ts | 22 +- .../common/cursor/cursorMoveCommands.ts | 16 +- .../common/cursor/cursorMoveOperations.ts | 16 +- .../common/cursor/cursorTypeEditOperations.ts | 40 +- .../common/cursor/cursorTypeOperations.ts | 18 +- .../common/cursor/cursorWordOperations.ts | 24 +- src/vs/editor/common/cursor/oneCursor.ts | 12 +- src/vs/editor/common/cursorCommon.ts | 28 +- src/vs/editor/common/cursorEvents.ts | 4 +- .../algorithms/diffAlgorithm.ts | 6 +- .../algorithms/dynamicProgrammingDiffing.ts | 6 +- .../algorithms/myersDiffAlgorithm.ts | 4 +- .../computeMovedLines.ts | 20 +- .../defaultLinesDiffComputer.ts | 30 +- .../heuristicSequenceOptimizations.ts | 10 +- .../defaultLinesDiffComputer/lineSequence.ts | 6 +- .../linesSliceCharSequence.ts | 14 +- .../diff/defaultLinesDiffComputer/utils.ts | 6 +- .../common/diff/documentDiffProvider.ts | 10 +- .../common/diff/legacyLinesDiffComputer.ts | 16 +- .../editor/common/diff/linesDiffComputer.ts | 2 +- .../editor/common/diff/linesDiffComputers.ts | 6 +- src/vs/editor/common/diff/rangeMapping.ts | 10 +- src/vs/editor/common/editorAction.ts | 6 +- src/vs/editor/common/editorCommon.ts | 26 +- src/vs/editor/common/editorContextKeys.ts | 4 +- src/vs/editor/common/editorFeatures.ts | 2 +- src/vs/editor/common/editorTheme.ts | 8 +- .../editor/common/languageFeatureRegistry.ts | 10 +- src/vs/editor/common/languageSelector.ts | 6 +- src/vs/editor/common/languages.ts | 46 +- src/vs/editor/common/languages/autoIndent.ts | 20 +- .../defaultDocumentColorsComputer.ts | 8 +- src/vs/editor/common/languages/enterAction.ts | 12 +- src/vs/editor/common/languages/language.ts | 10 +- .../common/languages/languageConfiguration.ts | 6 +- .../languageConfigurationRegistry.ts | 36 +- .../editor/common/languages/linkComputer.ts | 6 +- .../editor/common/languages/modesRegistry.ts | 14 +- .../editor/common/languages/nullTokenize.ts | 4 +- src/vs/editor/common/languages/supports.ts | 6 +- .../languages/supports/characterPair.ts | 2 +- .../languages/supports/electricCharacter.ts | 6 +- .../common/languages/supports/indentRules.ts | 2 +- .../supports/indentationLineProcessor.ts | 20 +- .../supports/inplaceReplaceSupport.ts | 4 +- .../supports/languageBracketsConfiguration.ts | 8 +- .../common/languages/supports/onEnter.ts | 8 +- .../languages/supports/richEditBrackets.ts | 8 +- .../common/languages/supports/tokenization.ts | 4 +- .../common/languages/textToHtmlTokenizer.ts | 14 +- src/vs/editor/common/model.ts | 40 +- .../bracketPairsImpl.ts | 28 +- .../bracketPairsTree/ast.ts | 14 +- .../beforeEditPositionMapper.ts | 8 +- .../bracketPairsTree/bracketPairsTree.ts | 40 +- .../bracketPairsTree/brackets.ts | 14 +- .../bracketPairsTree/combineTextEditInfos.ts | 6 +- .../bracketPairsTree/concat23Trees.ts | 2 +- .../bracketPairsTree/length.ts | 8 +- .../bracketPairsTree/nodeReader.ts | 4 +- .../bracketPairsTree/parser.ts | 14 +- .../bracketPairsTree/tokenizer.ts | 14 +- ...colorizedBracketPairsDecorationProvider.ts | 22 +- .../bracketPairsTextModelPart/fixBrackets.ts | 16 +- .../editor/common/model/decorationProvider.ts | 6 +- src/vs/editor/common/model/editStack.ts | 24 +- src/vs/editor/common/model/fixedArray.ts | 2 +- .../common/model/guidesTextModelPart.ts | 22 +- .../editor/common/model/indentationGuesser.ts | 4 +- src/vs/editor/common/model/intervalTree.ts | 6 +- src/vs/editor/common/model/mirrorTextModel.ts | 12 +- .../pieceTreeTextBuffer/pieceTreeBase.ts | 12 +- .../pieceTreeTextBuffer.ts | 18 +- .../pieceTreeTextBufferBuilder.ts | 12 +- .../model/pieceTreeTextBuffer/rbTreeBase.ts | 2 +- .../editor/common/model/prefixSumComputer.ts | 4 +- src/vs/editor/common/model/textModel.ts | 86 ++-- src/vs/editor/common/model/textModelPart.ts | 2 +- src/vs/editor/common/model/textModelSearch.ts | 14 +- src/vs/editor/common/model/textModelText.ts | 8 +- src/vs/editor/common/model/textModelTokens.ts | 32 +- .../common/model/tokenizationTextModelPart.ts | 58 +-- src/vs/editor/common/model/tokens.ts | 26 +- .../editor/common/model/treeSitterTokens.ts | 16 +- src/vs/editor/common/model/utils.ts | 2 +- .../editor/common/modelLineProjectionData.ts | 12 +- .../editor/common/services/editorBaseApi.ts | 18 +- .../common/services/editorSimpleWorker.esm.ts | 4 +- .../common/services/editorSimpleWorker.ts | 60 +-- src/vs/editor/common/services/editorWorker.ts | 18 +- .../common/services/editorWorkerBootstrap.ts | 6 +- .../common/services/editorWorkerHost.ts | 2 +- .../common/services/findSectionHeaders.ts | 4 +- .../editor/common/services/getIconClasses.ts | 16 +- .../services/languageFeatureDebounce.ts | 20 +- .../common/services/languageFeatures.ts | 6 +- .../services/languageFeaturesService.ts | 10 +- .../editor/common/services/languageService.ts | 18 +- .../common/services/languagesAssociations.ts | 16 +- .../common/services/languagesRegistry.ts | 22 +- .../common/services/markerDecorations.ts | 12 +- .../services/markerDecorationsService.ts | 32 +- src/vs/editor/common/services/model.ts | 12 +- src/vs/editor/common/services/modelService.ts | 42 +- .../services/modelUndoRedoParticipant.ts | 10 +- .../editor/common/services/resolverService.ts | 14 +- .../common/services/semanticTokensDto.ts | 4 +- .../services/semanticTokensProviderStyling.ts | 12 +- .../common/services/semanticTokensStyling.ts | 6 +- .../services/semanticTokensStylingService.ts | 16 +- .../textModelSync/textModelSync.impl.ts | 26 +- .../textModelSync/textModelSync.protocol.ts | 2 +- .../services/textResourceConfiguration.ts | 10 +- .../textResourceConfigurationService.ts | 16 +- .../services/treeSitterParserService.ts | 6 +- .../common/services/treeViewsDndService.ts | 8 +- .../services/unicodeTextModelHighlighter.ts | 12 +- src/vs/editor/common/standaloneStrings.ts | 2 +- src/vs/editor/common/textModelBracketPairs.ts | 12 +- src/vs/editor/common/textModelEvents.ts | 6 +- src/vs/editor/common/textModelGuides.ts | 2 +- src/vs/editor/common/tokenizationRegistry.ts | 10 +- .../common/tokenizationTextModelPart.ts | 10 +- .../tokens/contiguousMultilineTokens.ts | 14 +- .../contiguousMultilineTokensBuilder.ts | 4 +- .../common/tokens/contiguousTokensEditing.ts | 2 +- .../common/tokens/contiguousTokensStore.ts | 18 +- src/vs/editor/common/tokens/lineTokens.ts | 8 +- .../common/tokens/sparseMultilineTokens.ts | 8 +- .../editor/common/tokens/sparseTokensStore.ts | 12 +- src/vs/editor/common/viewEventHandler.ts | 4 +- src/vs/editor/common/viewEvents.ts | 16 +- .../common/viewLayout/lineDecorations.ts | 8 +- .../editor/common/viewLayout/linesLayout.ts | 4 +- src/vs/editor/common/viewLayout/viewLayout.ts | 18 +- .../common/viewLayout/viewLineRenderer.ts | 16 +- .../viewLayout/viewLinesViewportData.ts | 6 +- src/vs/editor/common/viewModel.ts | 30 +- .../common/viewModel/glyphLanesModel.ts | 4 +- .../viewModel/minimapTokensColorTracker.ts | 10 +- .../common/viewModel/modelLineProjection.ts | 14 +- .../viewModel/monospaceLineBreaksComputer.ts | 16 +- src/vs/editor/common/viewModel/viewContext.ts | 10 +- .../common/viewModel/viewModelDecorations.ts | 18 +- .../editor/common/viewModel/viewModelImpl.ts | 74 ++-- .../editor/common/viewModel/viewModelLines.ts | 30 +- .../editor/common/viewModelEventDispatcher.ts | 16 +- .../anchorSelect/browser/anchorSelect.ts | 28 +- .../browser/bracketMatching.ts | 38 +- .../test/browser/bracketMatching.test.ts | 20 +- .../browser/caretOperations.ts | 12 +- .../browser/moveCaretCommand.ts | 8 +- .../caretOperations/browser/transpose.ts | 20 +- .../test/browser/moveCarretCommand.test.ts | 8 +- .../contrib/clipboard/browser/clipboard.ts | 36 +- .../contrib/codeAction/browser/codeAction.ts | 46 +- .../codeAction/browser/codeActionCommands.ts | 28 +- .../browser/codeActionContributions.ts | 16 +- .../browser/codeActionController.ts | 74 ++-- .../browser/codeActionKeybindingResolver.ts | 14 +- .../codeAction/browser/codeActionMenu.ts | 20 +- .../codeAction/browser/codeActionModel.ts | 42 +- .../codeAction/browser/lightBulbWidget.ts | 38 +- .../editor/contrib/codeAction/common/types.ts | 12 +- .../test/browser/codeAction.test.ts | 28 +- .../codeActionKeybindingResolver.test.ts | 20 +- .../test/browser/codeActionModel.test.ts | 28 +- .../contrib/codelens/browser/codeLensCache.ts | 22 +- .../contrib/codelens/browser/codelens.ts | 22 +- .../codelens/browser/codelensController.ts | 40 +- .../codelens/browser/codelensWidget.ts | 20 +- .../contrib/colorPicker/browser/color.ts | 26 +- .../colorPicker/browser/colorContributions.ts | 22 +- .../colorPicker/browser/colorDetector.ts | 40 +- .../browser/colorHoverParticipant.ts | 38 +- .../colorPicker/browser/colorPickerModel.ts | 6 +- .../colorPicker/browser/colorPickerWidget.ts | 32 +- .../browser/defaultDocumentColorProvider.ts | 16 +- .../browser/standaloneColorPickerActions.ts | 18 +- .../browser/standaloneColorPickerWidget.ts | 46 +- .../comment/browser/blockCommentCommand.ts | 16 +- .../editor/contrib/comment/browser/comment.ts | 26 +- .../comment/browser/lineCommentCommand.ts | 22 +- .../test/browser/blockCommentCommand.test.ts | 18 +- .../test/browser/lineCommentCommand.test.ts | 28 +- .../contextmenu/browser/contextmenu.ts | 48 +- .../contrib/cursorUndo/browser/cursorUndo.ts | 18 +- .../test/browser/cursorUndo.test.ts | 12 +- .../browser/contribution.ts | 22 +- src/vs/editor/contrib/dnd/browser/dnd.ts | 34 +- .../contrib/dnd/browser/dragAndDropCommand.ts | 10 +- .../browser/documentSymbols.ts | 12 +- .../documentSymbols/browser/outlineModel.ts | 38 +- .../test/browser/outlineModel.test.ts | 30 +- .../browser/copyPasteContribution.ts | 22 +- .../browser/copyPasteController.ts | 68 +-- .../browser/defaultProviders.ts | 32 +- .../browser/dropIntoEditorContribution.ts | 22 +- .../browser/dropIntoEditorController.ts | 50 +-- .../contrib/dropOrPasteInto/browser/edit.ts | 12 +- .../dropOrPasteInto/browser/postEditWidget.ts | 42 +- .../test/browser/editSort.test.ts | 8 +- .../editorState/browser/editorState.ts | 16 +- .../browser/keybindingCancellation.ts | 20 +- .../test/browser/editorState.test.ts | 14 +- .../contrib/find/browser/findController.ts | 58 +-- .../contrib/find/browser/findDecorations.ts | 16 +- .../editor/contrib/find/browser/findModel.ts | 42 +- .../contrib/find/browser/findOptionsWidget.ts | 22 +- .../editor/contrib/find/browser/findState.ts | 8 +- .../editor/contrib/find/browser/findWidget.ts | 86 ++-- .../contrib/find/browser/replaceAllCommand.ts | 8 +- .../contrib/find/browser/replacePattern.ts | 4 +- .../contrib/find/test/browser/find.test.ts | 10 +- .../find/test/browser/findController.test.ts | 38 +- .../find/test/browser/findModel.test.ts | 22 +- .../find/test/browser/replacePattern.test.ts | 6 +- .../editor/contrib/folding/browser/folding.ts | 78 ++-- .../folding/browser/foldingDecorations.ts | 20 +- .../contrib/folding/browser/foldingModel.ts | 10 +- .../contrib/folding/browser/foldingRanges.ts | 2 +- .../folding/browser/hiddenRangeModel.ts | 18 +- .../folding/browser/indentRangeProvider.ts | 14 +- .../folding/browser/syntaxRangeProvider.ts | 14 +- .../folding/test/browser/foldingModel.test.ts | 26 +- .../test/browser/foldingRanges.test.ts | 10 +- .../test/browser/hiddenRangeModel.test.ts | 14 +- .../folding/test/browser/indentFold.test.ts | 6 +- .../test/browser/indentRangeProvider.test.ts | 8 +- .../folding/test/browser/syntaxFold.test.ts | 14 +- .../contrib/fontZoom/browser/fontZoom.ts | 8 +- .../editor/contrib/format/browser/format.ts | 56 +-- .../contrib/format/browser/formatActions.ts | 48 +- .../contrib/format/browser/formattingEdit.ts | 12 +- .../contrib/gotoError/browser/gotoError.ts | 42 +- .../gotoError/browser/gotoErrorWidget.ts | 54 +-- .../browser/markerNavigationService.ts | 26 +- .../gotoSymbol/browser/goToCommands.ts | 74 ++-- .../contrib/gotoSymbol/browser/goToSymbol.ts | 22 +- .../browser/link/clickLinkGesture.ts | 16 +- .../browser/link/goToDefinitionAtPosition.ts | 56 +-- .../browser/peek/referencesController.ts | 52 +-- .../gotoSymbol/browser/peek/referencesTree.ts | 36 +- .../browser/peek/referencesWidget.ts | 62 +-- .../gotoSymbol/browser/referencesModel.ts | 30 +- .../gotoSymbol/browser/symbolNavigation.ts | 34 +- .../test/browser/referencesModel.test.ts | 10 +- .../hover/browser/contentHoverComputer.ts | 14 +- .../hover/browser/contentHoverController2.ts | 40 +- .../hover/browser/contentHoverRendered.ts | 38 +- .../hover/browser/contentHoverStatusBar.ts | 10 +- .../hover/browser/contentHoverTypes.ts | 2 +- .../hover/browser/contentHoverWidget.ts | 28 +- .../browser/contentHoverWidgetWrapper.ts | 36 +- .../editor/contrib/hover/browser/getHover.ts | 18 +- .../hover/browser/hoverAccessibleViews.ts | 38 +- .../contrib/hover/browser/hoverActionIds.ts | 2 +- .../contrib/hover/browser/hoverActions.ts | 30 +- .../hover/browser/hoverContribution.ts | 24 +- .../contrib/hover/browser/hoverOperation.ts | 14 +- .../contrib/hover/browser/hoverTypes.ts | 18 +- .../contrib/hover/browser/hoverUtils.ts | 2 +- .../hover/browser/marginHoverComputer.ts | 10 +- .../hover/browser/marginHoverController.ts | 24 +- .../hover/browser/marginHoverWidget.ts | 24 +- .../hover/browser/markdownHoverParticipant.ts | 62 +-- .../hover/browser/markerHoverParticipant.ts | 46 +- .../hover/browser/resizableContentWidget.ts | 12 +- .../hover/test/browser/contentHover.test.ts | 12 +- .../inPlaceReplace/browser/inPlaceReplace.ts | 34 +- .../browser/inPlaceReplaceCommand.ts | 8 +- .../indentation/browser/indentation.ts | 48 +- .../contrib/indentation/common/indentation.ts | 18 +- .../test/browser/indentation.test.ts | 44 +- .../browser/indentationLineProcessor.test.ts | 26 +- .../contrib/inlayHints/browser/inlayHints.ts | 20 +- .../browser/inlayHintsContribution.ts | 8 +- .../browser/inlayHintsController.ts | 64 +-- .../inlayHints/browser/inlayHintsHover.ts | 48 +- .../inlayHints/browser/inlayHintsLocations.ts | 38 +- .../browser/controller/commands.ts | 30 +- .../controller/inlineCompletionContextKeys.ts | 14 +- .../controller/inlineCompletionsController.ts | 66 +-- .../browser/hintsWidget/hoverParticipant.ts | 36 +- .../inlineCompletionsHintsWidget.ts | 62 +-- .../browser/inlineCompletions.contribution.ts | 16 +- .../inlineCompletionsAccessibleView.ts | 22 +- .../browser/model/ghostText.ts | 12 +- .../browser/model/inlineCompletionsModel.ts | 58 +-- .../browser/model/inlineCompletionsSource.ts | 32 +- .../browser/model/provideInlineCompletions.ts | 34 +- .../browser/model/singleTextEdit.ts | 16 +- .../browser/model/suggestWidgetAdaptor.ts | 30 +- .../inlineCompletions/browser/utils.ts | 14 +- .../browser/view/ghostTextView.ts | 42 +- .../browser/inlineCompletionsModel.test.ts | 12 +- .../browser/inlineCompletionsProvider.test.ts | 38 +- .../test/browser/suggestWidgetModel.test.ts | 64 +-- .../inlineCompletions/test/browser/utils.ts | 20 +- .../contrib/inlineEdit/browser/commands.ts | 18 +- .../inlineEdit/browser/ghostTextWidget.ts | 28 +- .../inlineEdit/browser/hoverParticipant.ts | 24 +- .../browser/inlineEdit.contribution.ts | 6 +- .../browser/inlineEditController.ts | 46 +- .../browser/inlineEditHintsWidget.ts | 44 +- .../browser/inlineEditSideBySideWidget.ts | 44 +- .../contrib/inlineEdits/browser/commands.ts | 26 +- .../contrib/inlineEdits/browser/consts.ts | 4 +- .../browser/inlineEdits.contribution.ts | 6 +- .../browser/inlineEditsController.ts | 32 +- .../inlineEdits/browser/inlineEditsModel.ts | 42 +- .../inlineEdits/browser/inlineEditsWidget.ts | 48 +- .../inlineProgress/browser/inlineProgress.ts | 30 +- .../lineSelection/browser/lineSelection.ts | 16 +- .../test/browser/lineSelection.test.ts | 14 +- .../browser/copyLinesCommand.ts | 8 +- .../browser/linesOperations.ts | 48 +- .../browser/moveLinesCommand.ts | 26 +- .../browser/sortLinesCommand.ts | 10 +- .../test/browser/copyLinesCommand.test.ts | 12 +- .../test/browser/linesOperations.test.ts | 24 +- .../test/browser/moveLinesCommand.test.ts | 22 +- .../test/browser/sortLinesCommand.test.ts | 8 +- .../linkedEditing/browser/linkedEditing.ts | 64 +-- .../test/browser/linkedEditing.test.ts | 36 +- .../editor/contrib/links/browser/getLinks.ts | 26 +- src/vs/editor/contrib/links/browser/links.ts | 54 +-- .../browser/longLinesHelper.ts | 10 +- .../message/browser/messageController.ts | 38 +- .../multicursor/browser/multicursor.ts | 50 +-- .../test/browser/multicursor.test.ts | 20 +- .../parameterHints/browser/parameterHints.ts | 32 +- .../browser/parameterHintsModel.ts | 22 +- .../browser/parameterHintsWidget.ts | 50 +-- .../browser/provideSignatureHelp.ts | 24 +- .../test/browser/parameterHintsModel.test.ts | 36 +- .../contrib/peekView/browser/peekView.ts | 48 +- .../browser/placeholderText.contribution.ts | 14 +- .../browser/placeholderTextContribution.ts | 20 +- .../browser/commandsQuickAccess.ts | 20 +- .../browser/editorNavigationQuickAccess.ts | 28 +- .../browser/gotoLineQuickAccess.ts | 20 +- .../browser/gotoSymbolQuickAccess.ts | 42 +- .../readOnlyMessage/browser/contribution.ts | 16 +- .../editor/contrib/rename/browser/rename.ts | 72 +-- .../contrib/rename/browser/renameWidget.ts | 70 +-- .../sectionHeaders/browser/sectionHeaders.ts | 24 +- .../browser/documentSemanticTokens.ts | 38 +- .../browser/viewportSemanticTokens.ts | 36 +- .../common/getSemanticTokens.ts | 26 +- .../common/semanticTokensConfig.ts | 6 +- .../browser/documentSemanticTokens.test.ts | 64 +-- .../test/browser/getSemanticTokens.test.ts | 18 +- .../smartSelect/browser/bracketSelections.ts | 10 +- .../smartSelect/browser/smartSelect.ts | 52 +-- .../smartSelect/browser/wordSelections.ts | 12 +- .../test/browser/smartSelect.test.ts | 34 +- .../snippet/browser/snippetController2.ts | 42 +- .../contrib/snippet/browser/snippetParser.ts | 2 +- .../contrib/snippet/browser/snippetSession.ts | 40 +- .../snippet/browser/snippetVariables.ts | 26 +- .../browser/snippetController2.old.test.ts | 28 +- .../test/browser/snippetController2.test.ts | 40 +- .../test/browser/snippetParser.test.ts | 4 +- .../test/browser/snippetSession.test.ts | 32 +- .../test/browser/snippetVariables.test.ts | 32 +- .../browser/stickyScrollActions.ts | 22 +- .../browser/stickyScrollContribution.ts | 8 +- .../browser/stickyScrollController.ts | 52 +-- .../browser/stickyScrollElement.ts | 2 +- .../browser/stickyScrollModelProvider.ts | 32 +- .../browser/stickyScrollProvider.ts | 24 +- .../browser/stickyScrollWidget.ts | 32 +- .../test/browser/stickyScroll.test.ts | 40 +- .../suggest/browser/completionModel.ts | 16 +- .../editor/contrib/suggest/browser/suggest.ts | 50 +-- .../suggest/browser/suggestAlternatives.ts | 10 +- .../browser/suggestCommitCharacters.ts | 14 +- .../suggest/browser/suggestController.ts | 86 ++-- .../browser/suggestInlineCompletions.ts | 42 +- .../contrib/suggest/browser/suggestMemory.ts | 24 +- .../contrib/suggest/browser/suggestModel.ts | 58 +-- .../browser/suggestOvertypingCapturer.ts | 6 +- .../contrib/suggest/browser/suggestWidget.ts | 64 +-- .../suggest/browser/suggestWidgetDetails.ts | 28 +- .../suggest/browser/suggestWidgetRenderer.ts | 42 +- .../suggest/browser/suggestWidgetStatus.ts | 16 +- .../contrib/suggest/browser/wordContextKey.ts | 8 +- .../contrib/suggest/browser/wordDistance.ts | 16 +- .../test/browser/completionModel.test.ts | 14 +- .../suggest/test/browser/suggest.test.ts | 20 +- .../test/browser/suggestController.test.ts | 58 +-- .../browser/suggestInlineCompletions.test.ts | 34 +- .../test/browser/suggestMemory.test.ts | 14 +- .../suggest/test/browser/suggestModel.test.ts | 76 ++-- .../suggest/test/browser/wordDistance.test.ts | 44 +- .../symbolIcons/browser/symbolIcons.ts | 6 +- .../browser/toggleTabFocusMode.ts | 12 +- .../tokenization/browser/tokenization.ts | 8 +- .../browser/bannerController.ts | 24 +- .../browser/unicodeHighlighter.ts | 58 +-- .../browser/unusualLineTerminators.ts | 20 +- .../browser/highlightDecorations.ts | 14 +- .../browser/textualHighlightProvider.ts | 18 +- .../browser/wordHighlighter.ts | 64 +-- .../wordOperations/browser/wordOperations.ts | 42 +- .../test/browser/wordOperations.test.ts | 32 +- .../test/browser/wordTestUtils.ts | 4 +- .../browser/wordPartOperations.ts | 22 +- .../wordPartOperations/test/browser/utils.ts | 2 +- .../test/browser/wordPartOperations.test.ts | 18 +- .../contrib/zoneWidget/browser/zoneWidget.ts | 28 +- src/vs/editor/editor.all.ts | 124 +++--- src/vs/editor/editor.api.ts | 10 +- src/vs/editor/editor.main.ts | 20 +- src/vs/editor/editor.worker.ts | 2 +- src/vs/editor/standalone/browser/colorizer.ts | 22 +- .../iPadShowKeyboard/iPadShowKeyboard.ts | 16 +- .../browser/inspectTokens/inspectTokens.ts | 34 +- .../standaloneCommandsQuickAccess.ts | 34 +- .../standaloneGotoLineQuickAccess.ts | 22 +- .../standaloneGotoSymbolQuickAccess.ts | 32 +- .../quickAccess/standaloneHelpQuickAccess.ts | 8 +- .../quickInput/standaloneQuickInputService.ts | 32 +- .../standaloneReferenceSearch.ts | 18 +- .../browser/standaloneCodeEditor.ts | 78 ++-- .../browser/standaloneCodeEditorService.ts | 26 +- .../standalone/browser/standaloneEditor.ts | 72 +-- .../standalone/browser/standaloneLanguages.ts | 44 +- .../browser/standaloneLayoutService.ts | 14 +- .../standalone/browser/standaloneServices.ts | 192 ++++---- .../browser/standaloneThemeService.ts | 34 +- .../browser/standaloneTreeSitterService.ts | 6 +- .../standalone/browser/standaloneWebWorker.ts | 12 +- .../toggleHighContrast/toggleHighContrast.ts | 12 +- .../common/monarch/monarchCompile.ts | 4 +- .../standalone/common/monarch/monarchLexer.ts | 18 +- .../standalone/common/standaloneTheme.ts | 8 +- src/vs/editor/standalone/common/themes.ts | 6 +- .../standalone/test/browser/monarch.test.ts | 22 +- .../test/browser/standaloneLanguages.test.ts | 28 +- .../test/browser/standaloneServices.test.ts | 24 +- .../browser/commands/shiftCommand.test.ts | 28 +- .../test/browser/commands/sideEditing.test.ts | 12 +- .../trimTrailingWhitespaceCommand.test.ts | 26 +- .../config/editorConfiguration.test.ts | 14 +- .../config/editorLayoutProvider.test.ts | 6 +- .../test/browser/config/testConfiguration.ts | 14 +- .../controller/cursor.integrationTest.ts | 4 +- .../test/browser/controller/cursor.test.ts | 48 +- .../controller/cursorMoveCommand.test.ts | 16 +- .../browser/controller/imeRecordedTypes.ts | 4 +- .../test/browser/controller/imeRecorder.ts | 12 +- .../test/browser/controller/imeTester.ts | 22 +- .../browser/controller/textAreaInput.test.ts | 20 +- .../browser/controller/textAreaState.test.ts | 12 +- .../diff/testDiffProviderFactoryService.ts | 14 +- .../editor/test/browser/editorTestServices.ts | 12 +- .../services/decorationRenderOptions.test.ts | 12 +- .../browser/services/openerService.test.ts | 20 +- .../services/treeSitterParserService.test.ts | 16 +- src/vs/editor/test/browser/testCodeEditor.ts | 116 ++--- src/vs/editor/test/browser/testCommand.ts | 18 +- .../browser/view/minimapCharRenderer.test.ts | 8 +- .../test/browser/view/viewLayer.test.ts | 4 +- .../viewModel/modelLineProjection.test.ts | 36 +- .../test/browser/viewModel/testViewModel.ts | 16 +- .../viewModel/viewModelDecorations.test.ts | 10 +- .../browser/viewModel/viewModelImpl.test.ts | 14 +- .../browser/widget/codeEditorWidget.test.ts | 14 +- .../browser/widget/diffEditorWidget.test.ts | 8 +- .../widget/observableCodeEditor.test.ts | 18 +- .../cursorAtomicMoveOperations.test.ts | 4 +- .../controller/cursorMoveHelper.test.ts | 4 +- .../common/core/characterClassifier.test.ts | 6 +- .../editor/test/common/core/lineRange.test.ts | 4 +- .../test/common/core/lineTokens.test.ts | 8 +- .../core/positionOffsetTransformer.test.ts | 6 +- src/vs/editor/test/common/core/random.ts | 12 +- src/vs/editor/test/common/core/range.test.ts | 6 +- .../test/common/core/stringBuilder.test.ts | 8 +- .../editor/test/common/core/testLineToken.ts | 6 +- .../editor/test/common/core/textEdit.test.ts | 8 +- .../test/common/diff/diffComputer.test.ts | 12 +- .../beforeEditPositionMapper.test.ts | 12 +- .../bracketPairColorizer/brackets.test.ts | 12 +- .../combineTextEditInfos.test.ts | 18 +- .../concat23Trees.test.ts | 8 +- .../getBracketPairsInRange.test.ts | 24 +- .../model/bracketPairColorizer/length.test.ts | 4 +- .../smallImmutableSet.test.ts | 4 +- .../bracketPairColorizer/tokenizer.test.ts | 24 +- .../test/common/model/editStack.test.ts | 10 +- .../common/model/editableTextModel.test.ts | 18 +- .../model/editableTextModelAuto.test.ts | 12 +- .../model/editableTextModelTestUtils.ts | 14 +- .../test/common/model/intervalTree.test.ts | 6 +- .../linesTextBuffer/linesTextBuffer.test.ts | 10 +- .../linesTextBufferBuilder.test.ts | 8 +- .../test/common/model/model.line.test.ts | 20 +- .../test/common/model/model.modes.test.ts | 18 +- src/vs/editor/test/common/model/model.test.ts | 26 +- .../common/model/modelDecorations.test.ts | 14 +- .../common/model/modelEditOperation.test.ts | 10 +- .../common/model/modelInjectedText.test.ts | 10 +- .../pieceTreeTextBuffer.test.ts | 22 +- .../test/common/model/textChange.test.ts | 4 +- .../test/common/model/textModel.test.ts | 20 +- .../test/common/model/textModelSearch.test.ts | 18 +- .../test/common/model/textModelTokens.test.ts | 6 +- .../common/model/textModelWithTokens.test.ts | 30 +- .../test/common/model/tokensStore.test.ts | 26 +- .../modes/languageConfiguration.test.ts | 8 +- .../common/modes/languageSelector.test.ts | 6 +- .../test/common/modes/linkComputer.test.ts | 6 +- .../modes/supports/autoClosingPairsRules.ts | 2 +- .../common/modes/supports/bracketRules.ts | 2 +- .../modes/supports/characterPair.test.ts | 10 +- .../modes/supports/electricCharacter.test.ts | 10 +- .../common/modes/supports/onEnter.test.ts | 10 +- .../common/modes/supports/onEnterRules.ts | 2 +- .../modes/supports/richEditBrackets.test.ts | 6 +- .../modes/supports/tokenization.test.ts | 6 +- .../modes/testLanguageConfigurationService.ts | 8 +- .../common/modes/textToHtmlTokenizer.test.ts | 20 +- src/vs/editor/test/common/modesTestUtils.ts | 8 +- .../services/editorSimpleWorker.test.ts | 12 +- .../common/services/languageService.test.ts | 6 +- .../services/languagesAssociations.test.ts | 6 +- .../common/services/languagesRegistry.test.ts | 6 +- .../test/common/services/modelService.test.ts | 34 +- .../common/services/semanticTokensDto.test.ts | 6 +- .../semanticTokensProviderStyling.test.ts | 18 +- .../services/testEditorWorkerService.ts | 14 +- .../testTextResourcePropertiesService.ts | 8 +- .../common/services/testTreeSitterService.ts | 6 +- .../textResourceConfigurationService.test.ts | 16 +- .../unicodeTextModelHighlighter.test.ts | 8 +- src/vs/editor/test/common/testTextModel.ts | 66 +-- .../common/view/overviewZoneManager.test.ts | 4 +- .../common/viewLayout/lineDecorations.test.ts | 8 +- .../common/viewLayout/linesLayout.test.ts | 4 +- .../viewLayout/viewLineRenderer.test.ts | 18 +- .../common/viewModel/glyphLanesModel.test.ts | 8 +- .../common/viewModel/lineBreakData.test.ts | 8 +- .../monospaceLineBreaksComputer.test.ts | 10 +- .../viewModel/prefixSumComputer.test.ts | 6 +- .../node/classification/typescript.test.ts | 6 +- .../diffing/defaultLinesDiffComputer.test.ts | 16 +- .../editor/test/node/diffing/fixtures.test.ts | 18 +- src/vs/nls.ts | 4 +- .../browser/accessibilityService.ts | 18 +- .../accessibility/browser/accessibleView.ts | 14 +- .../browser/accessibleViewRegistry.ts | 8 +- .../accessibility/common/accessibility.ts | 6 +- .../test/common/testAccessibilityService.ts | 4 +- .../browser/accessibilitySignalService.ts | 26 +- .../progressAccessibilitySignalScheduler.ts | 6 +- src/vs/platform/action/common/action.ts | 10 +- .../action/common/actionCommonCategories.ts | 2 +- .../actionWidget/browser/actionList.ts | 32 +- .../actionWidget/browser/actionWidget.ts | 32 +- .../actionWidget/common/actionWidget.ts | 2 +- src/vs/platform/actions/browser/buttonbar.ts | 32 +- .../dropdownWithPrimaryActionViewItem.ts | 34 +- .../platform/actions/browser/floatingMenu.ts | 20 +- .../browser/menuEntryActionViewItem.ts | 58 +-- src/vs/platform/actions/browser/toolbar.ts | 38 +- .../actions/common/actions.contribution.ts | 8 +- src/vs/platform/actions/common/actions.ts | 22 +- .../actions/common/menuResetAction.ts | 10 +- src/vs/platform/actions/common/menuService.ts | 24 +- .../actions/test/common/menuService.test.ts | 16 +- .../platform/assignment/common/assignment.ts | 2 +- .../assignment/common/assignmentService.ts | 14 +- .../electron-main/auxiliaryWindow.ts | 18 +- .../electron-main/auxiliaryWindows.ts | 6 +- .../auxiliaryWindowsMainService.ts | 20 +- src/vs/platform/backup/common/backup.ts | 4 +- .../platform/backup/electron-main/backup.ts | 6 +- .../backup/electron-main/backupMainService.ts | 32 +- src/vs/platform/backup/node/backup.ts | 4 +- .../electron-main/backupMainService.test.ts | 40 +- .../checksum/common/checksumService.ts | 4 +- .../platform/checksum/node/checksumService.ts | 8 +- .../test/node/checksumService.test.ts | 16 +- .../clipboard/browser/clipboardService.ts | 22 +- .../clipboard/common/clipboardService.ts | 4 +- .../test/common/testClipboardService.ts | 4 +- src/vs/platform/commands/common/commands.ts | 16 +- .../commands/test/common/commands.test.ts | 6 +- .../test/common/nullCommandService.ts | 4 +- .../configuration/common/configuration.ts | 10 +- .../common/configurationModels.ts | 32 +- .../common/configurationRegistry.ts | 20 +- .../common/configurationService.ts | 40 +- .../configuration/common/configurations.ts | 22 +- .../test/common/configuration.test.ts | 4 +- .../test/common/configurationModels.test.ts | 20 +- .../test/common/configurationRegistry.test.ts | 6 +- .../test/common/configurationService.test.ts | 32 +- .../test/common/configurations.test.ts | 14 +- .../test/common/policyConfiguration.test.ts | 30 +- .../test/common/testConfigurationService.ts | 12 +- .../contextkey/browser/contextKeyService.ts | 26 +- .../platform/contextkey/common/contextkey.ts | 18 +- .../platform/contextkey/common/contextkeys.ts | 6 +- src/vs/platform/contextkey/common/scanner.ts | 6 +- .../test/browser/contextkey.test.ts | 22 +- .../contextkey/test/common/contextkey.test.ts | 6 +- .../contextkey/test/common/parser.test.ts | 4 +- .../contextkey/test/common/scanner.test.ts | 4 +- .../contextview/browser/contextMenuHandler.ts | 24 +- .../contextview/browser/contextMenuService.ts | 26 +- .../contextview/browser/contextView.ts | 18 +- .../contextview/browser/contextViewService.ts | 10 +- src/vs/platform/cssDev/node/cssDevService.ts | 12 +- .../debug/common/extensionHostDebug.ts | 4 +- .../debug/common/extensionHostDebugIpc.ts | 8 +- .../electron-main/extensionHostDebugIpc.ts | 8 +- .../diagnostics/common/diagnostics.ts | 10 +- .../electron-main/diagnosticsMainService.ts | 24 +- .../electron-sandbox/diagnosticsService.ts | 4 +- .../diagnostics/node/diagnosticsService.ts | 32 +- src/vs/platform/dialogs/common/dialogs.ts | 28 +- .../electron-main/dialogMainService.ts | 26 +- .../dialogs/test/common/dialog.test.ts | 10 +- .../dialogs/test/common/testDialogService.ts | 6 +- src/vs/platform/dnd/browser/dnd.ts | 40 +- src/vs/platform/download/common/download.ts | 6 +- .../platform/download/common/downloadIpc.ts | 10 +- .../download/common/downloadService.ts | 12 +- src/vs/platform/editor/common/editor.ts | 4 +- .../encryption/common/encryptionService.ts | 2 +- .../electron-main/encryptionMainService.ts | 6 +- .../environment/common/environment.ts | 6 +- .../environment/common/environmentService.ts | 20 +- .../electron-main/environmentMainService.ts | 14 +- src/vs/platform/environment/node/argv.ts | 6 +- .../platform/environment/node/argvHelper.ts | 8 +- .../environment/node/environmentService.ts | 10 +- src/vs/platform/environment/node/stdin.ts | 6 +- .../platform/environment/node/userDataPath.js | 16 +- src/vs/platform/environment/node/wait.ts | 2 +- .../environmentMainService.test.ts | 8 +- .../environment/test/node/argv.test.ts | 6 +- .../test/node/environmentService.test.ts | 10 +- .../node/nativeModules.integrationTest.ts | 16 +- .../test/node/userDataPath.test.ts | 8 +- .../abstractExtensionManagementService.ts | 40 +- .../common/configRemotes.ts | 2 +- .../common/extensionEnablementService.ts | 12 +- .../common/extensionGalleryService.ts | 48 +- .../common/extensionManagement.ts | 18 +- .../common/extensionManagementCLI.ts | 22 +- .../common/extensionManagementIpc.ts | 16 +- .../common/extensionManagementUtil.ts | 20 +- .../common/extensionNls.ts | 10 +- .../common/extensionStorage.ts | 24 +- .../common/extensionTipsService.ts | 38 +- .../common/extensionsProfileScannerService.ts | 34 +- .../common/extensionsScannerService.ts | 66 +-- .../common/implicitActivationEvents.ts | 4 +- .../common/unsupportedExtensionsMigration.ts | 12 +- .../extensionsProfileScannerService.ts | 18 +- .../node/extensionDownloader.ts | 44 +- .../node/extensionLifecycle.ts | 20 +- .../node/extensionManagementService.ts | 82 ++-- .../node/extensionManagementUtil.ts | 10 +- .../extensionSignatureVerificationService.ts | 22 +- .../node/extensionTipsService.ts | 18 +- .../node/extensionsManifestCache.ts | 16 +- .../node/extensionsProfileScannerService.ts | 16 +- .../node/extensionsScannerService.ts | 20 +- .../node/extensionsWatcher.ts | 28 +- .../test/common/configRemotes.test.ts | 4 +- .../common/extensionGalleryService.test.ts | 40 +- .../test/common/extensionManagement.test.ts | 8 +- .../test/common/extensionNls.test.ts | 14 +- .../extensionsProfileScannerService.test.ts | 34 +- .../test/node/extensionDownloader.test.ts | 42 +- .../node/extensionsScannerService.test.ts | 40 +- .../common/extensionRecommendations.ts | 4 +- .../common/extensionRecommendationsIpc.ts | 6 +- .../browser/extensionResourceLoaderService.ts | 20 +- .../common/extensionResourceLoader.ts | 28 +- .../common/extensionResourceLoaderService.ts | 20 +- .../extensions/common/extensionHostStarter.ts | 4 +- .../extensions/common/extensionValidator.ts | 14 +- .../platform/extensions/common/extensions.ts | 14 +- .../electron-main/extensionHostStarter.ts | 20 +- .../test/common/extensionValidator.test.ts | 6 +- .../extensions/test/common/extensions.test.ts | 4 +- .../externalServices/common/marketplace.ts | 18 +- .../common/serviceMachineId.ts | 10 +- .../common/externalTerminal.ts | 4 +- .../electron-main/externalTerminal.ts | 4 +- .../externalTerminalService.ts | 6 +- .../node/externalTerminalService.ts | 20 +- .../externalTerminalService.test.ts | 6 +- .../files/browser/htmlFileSystemProvider.ts | 30 +- .../browser/indexedDBFileSystemProvider.ts | 22 +- .../files/common/diskFileSystemProvider.ts | 22 +- .../common/diskFileSystemProviderClient.ts | 24 +- src/vs/platform/files/common/fileService.ts | 38 +- src/vs/platform/files/common/files.ts | 34 +- .../common/inMemoryFilesystemProvider.ts | 14 +- src/vs/platform/files/common/io.ts | 14 +- src/vs/platform/files/common/watcher.ts | 14 +- .../diskFileSystemProviderServer.ts | 26 +- .../files/node/diskFileSystemProvider.ts | 42 +- .../node/diskFileSystemProviderServer.ts | 26 +- .../files/node/watcher/baseWatcher.ts | 12 +- .../files/node/watcher/nodejs/nodejsClient.ts | 8 +- .../node/watcher/nodejs/nodejsWatcher.ts | 14 +- .../node/watcher/nodejs/nodejsWatcherLib.ts | 26 +- .../node/watcher/parcel/parcelWatcher.ts | 34 +- src/vs/platform/files/node/watcher/watcher.ts | 14 +- .../files/node/watcher/watcherClient.ts | 12 +- .../files/node/watcher/watcherMain.ts | 12 +- .../files/node/watcher/watcherStats.ts | 6 +- .../files/test/browser/fileService.test.ts | 26 +- .../indexedDBFileService.integrationTest.ts | 22 +- .../platform/files/test/common/files.test.ts | 10 +- .../test/common/nullFileSystemProvider.ts | 12 +- .../files/test/common/watcher.test.ts | 16 +- .../node/diskFileService.integrationTest.ts | 28 +- .../node/nodejsWatcher.integrationTest.ts | 36 +- .../node/parcelWatcher.integrationTest.ts | 32 +- .../browser/contextScopedHistoryWidget.ts | 22 +- .../browser/historyWidgetKeybindingHint.ts | 2 +- src/vs/platform/hover/browser/hover.ts | 14 +- .../hover/test/browser/nullHoverService.ts | 4 +- .../instantiation/common/extensions.ts | 4 +- .../instantiation/common/instantiation.ts | 6 +- .../common/instantiationService.ts | 18 +- .../instantiation/common/serviceCollection.ts | 4 +- .../instantiation/test/common/graph.test.ts | 4 +- .../test/common/instantiationService.test.ts | 14 +- .../test/common/instantiationServiceMock.ts | 10 +- .../platform/ipc/common/mainProcessService.ts | 6 +- src/vs/platform/ipc/common/services.ts | 2 +- .../electron-sandbox/mainProcessService.ts | 8 +- .../platform/ipc/electron-sandbox/services.ts | 12 +- src/vs/platform/issue/common/issue.ts | 8 +- .../issue/common/issueReporterUtil.ts | 2 +- .../issue/electron-main/issueMainService.ts | 38 +- .../issue/electron-main/processMainService.ts | 46 +- .../common/jsonContributionRegistry.ts | 6 +- .../common/abstractKeybindingService.ts | 38 +- .../common/baseResolvedKeybinding.ts | 8 +- .../platform/keybinding/common/keybinding.ts | 16 +- .../keybinding/common/keybindingResolver.ts | 4 +- .../keybinding/common/keybindingsRegistry.ts | 14 +- .../common/resolvedKeybindingItem.ts | 6 +- .../common/usLayoutResolvedKeybinding.ts | 10 +- .../common/abstractKeybindingService.test.ts | 34 +- .../test/common/keybindingLabels.test.ts | 8 +- .../test/common/keybindingResolver.test.ts | 18 +- .../test/common/keybindingsTestUtils.ts | 6 +- .../test/common/mockKeybindingService.ts | 16 +- .../keyboardLayout/common/keyboardConfig.ts | 10 +- .../keyboardLayout/common/keyboardLayout.ts | 10 +- .../common/keyboardLayoutService.ts | 4 +- .../keyboardLayout/common/keyboardMapper.ts | 4 +- .../keyboardLayoutMainService.ts | 12 +- src/vs/platform/label/common/label.ts | 10 +- .../languagePacks/browser/languagePacks.ts | 12 +- .../languagePacks/common/languagePacks.ts | 16 +- .../languagePacks/common/localizedStrings.ts | 2 +- .../languagePacks/node/languagePacks.ts | 26 +- .../launch/electron-main/launchMainService.ts | 28 +- .../platform/layout/browser/layoutService.ts | 8 +- .../platform/layout/browser/zIndexRegistry.ts | 4 +- src/vs/platform/lifecycle/common/lifecycle.ts | 2 +- .../electron-main/lifecycleMainService.ts | 30 +- .../node/sharedProcessLifecycleService.ts | 8 +- src/vs/platform/list/browser/listService.ts | 52 +-- src/vs/platform/log/browser/log.ts | 12 +- src/vs/platform/log/common/bufferLog.ts | 2 +- src/vs/platform/log/common/fileLog.ts | 14 +- src/vs/platform/log/common/log.ts | 28 +- src/vs/platform/log/common/logIpc.ts | 12 +- src/vs/platform/log/common/logService.ts | 6 +- src/vs/platform/log/electron-main/logIpc.ts | 12 +- .../log/electron-main/loggerService.ts | 12 +- src/vs/platform/log/node/loggerService.ts | 8 +- src/vs/platform/log/node/spdlogLog.ts | 4 +- .../platform/markers/common/markerService.ts | 16 +- src/vs/platform/markers/common/markers.ts | 10 +- .../markers/test/common/markerService.test.ts | 8 +- src/vs/platform/menubar/common/menubar.ts | 2 +- .../platform/menubar/electron-main/menubar.ts | 44 +- .../electron-main/menubarMainService.ts | 12 +- .../menubar/electron-sandbox/menubar.ts | 4 +- src/vs/platform/native/common/native.ts | 22 +- .../native/common/nativeHostService.ts | 6 +- src/vs/platform/native/electron-main/auth.ts | 30 +- .../electron-main/nativeHostMainService.ts | 78 ++-- .../notification/common/notification.ts | 10 +- .../test/common/testNotificationService.ts | 6 +- .../common/platformObservableUtils.ts | 10 +- .../common/wrapInReloadableClass.ts | 10 +- src/vs/platform/opener/browser/link.ts | 26 +- src/vs/platform/opener/common/opener.ts | 10 +- .../opener/test/common/nullOpenerService.ts | 6 +- .../opener/test/common/opener.test.ts | 4 +- .../policy/common/filePolicyService.ts | 16 +- src/vs/platform/policy/common/policy.ts | 10 +- src/vs/platform/policy/common/policyIpc.ts | 10 +- .../policy/node/nativePolicyService.ts | 10 +- src/vs/platform/product/common/product.ts | 6 +- .../platform/product/common/productService.ts | 4 +- src/vs/platform/profiling/common/profiling.ts | 4 +- .../profiling/common/profilingModel.ts | 2 +- .../common/profilingTelemetrySpec.ts | 8 +- .../electron-main/windowProfiling.ts | 6 +- .../profileAnalysisWorker.esm.ts | 4 +- .../electron-sandbox/profileAnalysisWorker.ts | 14 +- .../profileAnalysisWorkerService.ts | 20 +- .../electron-sandbox/profilingService.ts | 4 +- .../profiling/node/profilingService.ts | 4 +- src/vs/platform/progress/common/progress.ts | 12 +- .../progress/test/common/progress.test.ts | 6 +- .../protocol/electron-main/protocol.ts | 6 +- .../electron-main/protocolMainService.ts | 24 +- .../quickinput/browser/commandsQuickAccess.ts | 44 +- .../quickinput/browser/helpQuickAccess.ts | 12 +- .../quickinput/browser/pickerQuickAccess.ts | 12 +- .../quickinput/browser/quickAccess.ts | 16 +- .../platform/quickinput/browser/quickInput.ts | 60 +-- .../quickinput/browser/quickInputActions.ts | 20 +- .../quickinput/browser/quickInputBox.ts | 18 +- .../browser/quickInputController.ts | 44 +- .../quickinput/browser/quickInputService.ts | 32 +- .../quickinput/browser/quickInputTree.ts | 74 ++-- .../quickinput/browser/quickInputUtils.ts | 30 +- .../quickinput/browser/quickPickPin.ts | 12 +- .../platform/quickinput/common/quickAccess.ts | 10 +- .../platform/quickinput/common/quickInput.ts | 24 +- .../test/browser/quickinput.test.ts | 60 +-- src/vs/platform/registry/common/platform.ts | 4 +- .../registry/test/common/platform.test.ts | 4 +- .../remote/browser/browserSocketFactory.ts | 18 +- .../browser/remoteAuthorityResolverService.ts | 26 +- .../remote/common/electronRemoteResources.ts | 4 +- .../platform/remote/common/managedSocket.ts | 8 +- .../remote/common/remoteAgentConnection.ts | 34 +- .../remote/common/remoteAgentEnvironment.ts | 8 +- .../remote/common/remoteAuthorityResolver.ts | 8 +- .../remote/common/remoteExtensionsScanner.ts | 4 +- src/vs/platform/remote/common/remoteHosts.ts | 4 +- .../common/remoteSocketFactoryService.ts | 8 +- .../common/sharedProcessTunnelService.ts | 4 +- .../electronRemoteResourceLoader.ts | 20 +- .../remoteAuthorityResolverService.ts | 18 +- .../sharedProcessTunnelService.ts | 4 +- .../platform/remote/node/nodeSocketFactory.ts | 10 +- .../remote/test/common/remoteHosts.test.ts | 4 +- .../remoteAuthorityResolverService.test.ts | 10 +- .../remoteTunnel/common/remoteTunnel.ts | 6 +- .../electron-sandbox/remoteTunnelService.ts | 4 +- .../remoteTunnel/node/remoteTunnelService.ts | 34 +- .../request/browser/requestService.ts | 12 +- src/vs/platform/request/common/request.ts | 20 +- src/vs/platform/request/common/requestIpc.ts | 12 +- .../electron-main/requestMainService.ts | 6 +- src/vs/platform/request/node/proxy.ts | 10 +- .../platform/request/node/requestService.ts | 26 +- src/vs/platform/secrets/common/secrets.ts | 16 +- .../secrets/test/common/secrets.test.ts | 10 +- .../severityIcon/browser/severityIcon.ts | 8 +- .../electron-main/sharedProcess.ts | 32 +- .../sharedProcess/node/sharedProcess.ts | 12 +- src/vs/platform/shell/node/shellEnv.ts | 28 +- src/vs/platform/sign/browser/signService.ts | 18 +- .../sign/common/abstractSignService.ts | 2 +- src/vs/platform/sign/common/sign.ts | 2 +- src/vs/platform/sign/node/signService.ts | 16 +- src/vs/platform/state/node/state.ts | 2 +- src/vs/platform/state/node/stateService.ts | 18 +- src/vs/platform/state/test/node/state.test.ts | 24 +- src/vs/platform/storage/common/storage.ts | 18 +- src/vs/platform/storage/common/storageIpc.ts | 14 +- .../platform/storage/common/storageService.ts | 22 +- .../storage/electron-main/storageIpc.ts | 20 +- .../storage/electron-main/storageMain.ts | 36 +- .../electron-main/storageMainService.ts | 32 +- .../test/common/storageService.test.ts | 6 +- .../electron-main/storageMainService.test.ts | 44 +- .../platform/telemetry/browser/1dsAppender.ts | 2 +- .../telemetry/browser/errorTelemetry.ts | 8 +- .../platform/telemetry/common/1dsAppender.ts | 24 +- .../telemetry/common/commonProperties.ts | 8 +- .../telemetry/common/errorTelemetry.ts | 12 +- .../common/remoteTelemetryChannel.ts | 12 +- .../common/serverTelemetryService.ts | 14 +- src/vs/platform/telemetry/common/telemetry.ts | 4 +- .../platform/telemetry/common/telemetryIpc.ts | 6 +- .../telemetry/common/telemetryLogAppender.ts | 12 +- .../telemetry/common/telemetryService.ts | 26 +- .../telemetry/common/telemetryUtils.ts | 18 +- .../telemetry/electron-main/telemetryUtils.ts | 8 +- .../customEndpointTelemetryService.ts | 4 +- src/vs/platform/telemetry/node/1dsAppender.ts | 10 +- .../node/customEndpointTelemetryService.ts | 20 +- .../platform/telemetry/node/errorTelemetry.ts | 4 +- src/vs/platform/telemetry/node/telemetry.ts | 4 +- .../platform/telemetry/node/telemetryUtils.ts | 10 +- .../test/browser/1dsAppender.test.ts | 6 +- .../test/browser/telemetryService.test.ts | 22 +- .../test/common/telemetryLogAppender.test.ts | 14 +- .../capabilities/bufferMarkCapability.ts | 6 +- .../common/capabilities/capabilities.ts | 12 +- .../commandDetection/promptInputModel.ts | 10 +- .../commandDetection/terminalCommand.ts | 4 +- .../commandDetectionCapability.ts | 18 +- .../capabilities/cwdDetectionCapability.ts | 6 +- .../naiveCwdDetectionCapability.ts | 6 +- .../partialCommandDetectionCapability.ts | 6 +- .../capabilities/terminalCapabilityStore.ts | 6 +- .../terminal/common/environmentVariable.ts | 4 +- .../common/environmentVariableCollection.ts | 4 +- .../common/environmentVariableShared.ts | 2 +- .../platform/terminal/common/requestStore.ts | 10 +- src/vs/platform/terminal/common/terminal.ts | 26 +- .../terminal/common/terminalAutoResponder.ts | 10 +- .../terminal/common/terminalDataBuffering.ts | 6 +- .../terminal/common/terminalEnvironment.ts | 4 +- .../terminal/common/terminalLogService.ts | 16 +- .../common/terminalPlatformConfiguration.ts | 16 +- .../terminal/common/terminalProcess.ts | 6 +- .../terminal/common/terminalProfiles.ts | 10 +- .../terminal/common/terminalRecorder.ts | 4 +- .../common/xterm/shellIntegrationAddon.ts | 28 +- .../electron-main/electronPtyHostStarter.ts | 30 +- .../terminal/node/childProcessMonitor.ts | 14 +- .../terminal/node/heartbeatService.ts | 6 +- .../terminal/node/nodePtyHostStarter.ts | 14 +- src/vs/platform/terminal/node/ptyHost.ts | 6 +- src/vs/platform/terminal/node/ptyHostMain.ts | 38 +- .../platform/terminal/node/ptyHostService.ts | 36 +- src/vs/platform/terminal/node/ptyService.ts | 56 +-- .../terminal/node/terminalEnvironment.ts | 28 +- .../platform/terminal/node/terminalProcess.ts | 28 +- .../terminal/node/terminalProfiles.ts | 24 +- .../terminal/node/windowsShellHelper.ts | 12 +- .../commandDetection/promptInputModel.test.ts | 14 +- .../terminal/test/common/requestStore.test.ts | 10 +- .../test/common/terminalEnvironment.test.ts | 6 +- .../test/common/terminalProcess.test.ts | 4 +- .../test/common/terminalProfiles.test.ts | 8 +- .../test/common/terminalRecorder.test.ts | 6 +- .../test/node/terminalEnvironment.test.ts | 12 +- .../electron-main/workbenchTestServices.ts | 14 +- .../platform/theme/browser/defaultStyles.ts | 30 +- .../platform/theme/browser/iconsStyleSheet.ts | 12 +- src/vs/platform/theme/common/colorRegistry.ts | 22 +- src/vs/platform/theme/common/colorUtils.ts | 18 +- .../theme/common/colors/baseColors.ts | 6 +- .../theme/common/colors/chartsColors.ts | 10 +- .../theme/common/colors/editorColors.ts | 10 +- .../theme/common/colors/inputColors.ts | 10 +- .../theme/common/colors/listColors.ts | 10 +- .../theme/common/colors/menuColors.ts | 10 +- .../theme/common/colors/minimapColors.ts | 10 +- .../theme/common/colors/miscColors.ts | 8 +- .../theme/common/colors/quickpickColors.ts | 10 +- .../theme/common/colors/searchColors.ts | 8 +- src/vs/platform/theme/common/iconRegistry.ts | 22 +- src/vs/platform/theme/common/themeService.ts | 20 +- .../common/tokenClassificationRegistry.ts | 16 +- .../theme/electron-main/themeMainService.ts | 16 +- .../theme/test/common/testThemeService.ts | 10 +- src/vs/platform/tunnel/common/tunnel.ts | 20 +- .../tunnel/node/sharedProcessTunnelService.ts | 14 +- src/vs/platform/tunnel/node/tunnelService.ts | 30 +- .../tunnel/test/common/tunnel.test.ts | 6 +- src/vs/platform/undoRedo/common/undoRedo.ts | 6 +- .../undoRedo/common/undoRedoService.ts | 20 +- .../test/common/undoRedoService.test.ts | 16 +- .../common/update.config.contribution.ts | 8 +- src/vs/platform/update/common/update.ts | 4 +- src/vs/platform/update/common/updateIpc.ts | 6 +- .../electron-main/abstractUpdateService.ts | 20 +- .../electron-main/updateService.darwin.ts | 26 +- .../electron-main/updateService.linux.ts | 22 +- .../electron-main/updateService.snap.ts | 18 +- .../electron-main/updateService.win32.ts | 38 +- .../uriIdentity/common/uriIdentity.ts | 6 +- .../uriIdentity/common/uriIdentityService.ts | 16 +- .../test/common/uriIdentityService.test.ts | 12 +- src/vs/platform/url/common/url.ts | 6 +- src/vs/platform/url/common/urlIpc.ts | 12 +- src/vs/platform/url/common/urlService.ts | 10 +- .../url/electron-main/electronUrlListener.ts | 22 +- src/vs/platform/url/electron-main/url.ts | 4 +- .../userData/common/fileUserDataProvider.ts | 22 +- .../test/browser/fileUserDataProvider.test.ts | 38 +- .../browser/userDataProfile.ts | 16 +- .../userDataProfile/common/userDataProfile.ts | 36 +- .../common/userDataProfileIpc.ts | 14 +- .../common/userDataProfileStorageService.ts | 18 +- .../electron-main/userDataProfile.ts | 20 +- .../userDataProfileStorageIpc.ts | 20 +- .../electron-main/userDataProfilesHandler.ts | 14 +- .../userDataProfileStorageService.ts | 12 +- .../userDataProfile/node/userDataProfile.ts | 20 +- .../node/userDataProfileStorageService.ts | 10 +- .../common/userDataProfileService.test.ts | 22 +- .../userDataProfileStorageService.test.ts | 16 +- .../userDataProfileMainService.test.ts | 24 +- .../common/abstractSynchronizer.ts | 50 +-- .../platform/userDataSync/common/content.ts | 6 +- .../userDataSync/common/extensionsMerge.ts | 12 +- .../userDataSync/common/extensionsSync.ts | 58 +-- .../userDataSync/common/globalStateMerge.ts | 8 +- .../userDataSync/common/globalStateSync.ts | 54 +-- .../userDataSync/common/ignoredExtensions.ts | 8 +- .../userDataSync/common/keybindingsMerge.ts | 18 +- .../userDataSync/common/keybindingsSync.ts | 40 +- .../userDataSync/common/settingsMerge.ts | 18 +- .../userDataSync/common/settingsSync.ts | 38 +- .../userDataSync/common/snippetsMerge.ts | 2 +- .../userDataSync/common/snippetsSync.ts | 32 +- .../platform/userDataSync/common/tasksSync.ts | 26 +- .../common/userDataAutoSyncService.ts | 34 +- .../common/userDataProfilesManifestMerge.ts | 6 +- .../common/userDataProfilesManifestSync.ts | 26 +- .../userDataSync/common/userDataSync.ts | 44 +- .../common/userDataSyncAccount.ts | 8 +- .../common/userDataSyncEnablementService.ts | 14 +- .../userDataSync/common/userDataSyncIpc.ts | 20 +- .../common/userDataSyncLocalStoreService.ts | 22 +- .../userDataSync/common/userDataSyncLog.ts | 10 +- .../common/userDataSyncMachines.ts | 24 +- .../common/userDataSyncResourceProvider.ts | 46 +- .../common/userDataSyncService.ts | 50 +-- .../common/userDataSyncServiceIpc.ts | 16 +- .../common/userDataSyncStoreService.ts | 44 +- .../node/userDataAutoSyncService.ts | 18 +- .../test/common/extensionsMerge.test.ts | 6 +- .../test/common/globalStateMerge.test.ts | 6 +- .../test/common/globalStateSync.test.ts | 22 +- .../test/common/keybindingsMerge.test.ts | 6 +- .../test/common/keybindingsSync.test.ts | 16 +- .../test/common/settingsMerge.test.ts | 6 +- .../test/common/settingsSync.test.ts | 24 +- .../test/common/snippetsMerge.test.ts | 4 +- .../test/common/snippetsSync.test.ts | 22 +- .../test/common/synchronizer.test.ts | 28 +- .../test/common/tasksSync.test.ts | 18 +- .../common/userDataAutoSyncService.test.ts | 24 +- .../userDataProfilesManifestMerge.test.ts | 10 +- .../userDataProfilesManifestSync.test.ts | 12 +- .../test/common/userDataSyncClient.ts | 84 ++-- .../test/common/userDataSyncService.test.ts | 16 +- .../common/userDataSyncStoreService.test.ts | 26 +- .../electron-main/utilityProcess.ts | 28 +- .../utilityProcessWorkerMainService.ts | 22 +- src/vs/platform/webview/common/mimeTypes.ts | 6 +- .../webview/common/webviewManagerService.ts | 4 +- .../webview/common/webviewPortMapping.ts | 10 +- .../electron-main/webviewMainService.ts | 10 +- .../electron-main/webviewProtocolProvider.ts | 6 +- src/vs/platform/window/common/window.ts | 28 +- .../platform/window/electron-main/window.ts | 16 +- .../window/electron-sandbox/window.ts | 10 +- .../windows/electron-main/windowImpl.ts | 80 ++-- .../platform/windows/electron-main/windows.ts | 30 +- .../windows/electron-main/windowsFinder.ts | 8 +- .../electron-main/windowsMainService.ts | 102 ++--- .../electron-main/windowsStateHandler.ts | 24 +- src/vs/platform/windows/node/windowTracker.ts | 6 +- .../test/electron-main/windowsFinder.test.ts | 28 +- .../electron-main/windowsStateHandler.test.ts | 12 +- .../platform/workspace/common/canonicalUri.ts | 8 +- .../platform/workspace/common/editSessions.ts | 8 +- .../workspace/common/virtualWorkspace.ts | 6 +- src/vs/platform/workspace/common/workspace.ts | 18 +- .../workspace/common/workspaceTrust.ts | 8 +- .../workspace/test/common/testWorkspace.ts | 6 +- .../workspace/test/common/workspace.test.ts | 12 +- .../platform/workspaces/common/workspaces.ts | 32 +- .../workspacesHistoryMainService.ts | 42 +- .../electron-main/workspacesMainService.ts | 18 +- .../workspacesManagementMainService.ts | 40 +- src/vs/platform/workspaces/node/workspaces.ts | 10 +- .../workspaces/test/common/workspaces.test.ts | 6 +- .../test/electron-main/workspaces.test.ts | 14 +- .../workspacesHistoryStorage.test.ts | 12 +- .../workspacesManagementMainService.test.ts | 52 +-- src/vs/server/node/extensionHostConnection.ts | 34 +- .../server/node/extensionHostStatusService.ts | 4 +- .../server/node/extensionsScannerService.ts | 24 +- .../server/node/remoteAgentEnvironmentImpl.ts | 36 +- .../node/remoteExtensionHostAgentCli.ts | 94 ++-- .../node/remoteExtensionHostAgentServer.ts | 62 +-- .../server/node/remoteExtensionManagement.ts | 10 +- src/vs/server/node/remoteExtensionsScanner.ts | 40 +- .../node/remoteFileSystemProviderServer.ts | 24 +- src/vs/server/node/remoteLanguagePacks.ts | 12 +- src/vs/server/node/remoteTerminalChannel.ts | 58 +-- src/vs/server/node/server.cli.ts | 16 +- src/vs/server/node/server.main.ts | 16 +- src/vs/server/node/serverConnectionToken.ts | 10 +- .../server/node/serverEnvironmentService.ts | 16 +- src/vs/server/node/serverServices.ts | 148 +++---- src/vs/server/node/webClientServer.ts | 42 +- .../test/node/serverConnectionToken.test.ts | 8 +- .../api/browser/extensionHost.contribution.ts | 162 +++---- .../browser/mainThreadAiEmbeddingVector.ts | 10 +- .../browser/mainThreadAiRelatedInformation.ts | 12 +- .../api/browser/mainThreadAuthentication.ts | 34 +- .../api/browser/mainThreadBulkEdits.ts | 22 +- .../api/browser/mainThreadCLICommands.ts | 38 +- .../api/browser/mainThreadChatAgents2.ts | 56 +-- .../api/browser/mainThreadChatVariables.ts | 10 +- .../api/browser/mainThreadClipboard.ts | 6 +- .../api/browser/mainThreadCodeInsets.ts | 22 +- .../api/browser/mainThreadCommands.ts | 16 +- .../api/browser/mainThreadComments.ts | 54 +-- .../api/browser/mainThreadConfiguration.ts | 18 +- .../api/browser/mainThreadConsole.ts | 14 +- .../api/browser/mainThreadCustomEditors.ts | 82 ++-- .../api/browser/mainThreadDebugService.ts | 28 +- .../api/browser/mainThreadDecorations.ts | 14 +- .../api/browser/mainThreadDiagnostics.ts | 12 +- .../api/browser/mainThreadDialogs.ts | 10 +- .../mainThreadDocumentContentProviders.ts | 26 +- .../api/browser/mainThreadDocuments.ts | 38 +- .../browser/mainThreadDocumentsAndEditors.ts | 58 +-- .../api/browser/mainThreadDownloadService.ts | 10 +- ...ainThreadEditSessionIdentityParticipant.ts | 18 +- .../workbench/api/browser/mainThreadEditor.ts | 38 +- .../api/browser/mainThreadEditorTabs.ts | 50 +-- .../api/browser/mainThreadEditors.ts | 52 +-- .../api/browser/mainThreadEmbeddings.ts | 14 +- .../workbench/api/browser/mainThreadErrors.ts | 6 +- .../api/browser/mainThreadExtensionService.ts | 52 +-- .../api/browser/mainThreadFileSystem.ts | 16 +- .../mainThreadFileSystemEventService.ts | 50 +-- .../api/browser/mainThreadInteractive.ts | 10 +- .../api/browser/mainThreadLabelService.ts | 8 +- .../api/browser/mainThreadLanguageFeatures.ts | 64 +-- .../browser/mainThreadLanguageModelTools.ts | 10 +- .../api/browser/mainThreadLanguageModels.ts | 30 +- .../api/browser/mainThreadLanguages.ts | 22 +- .../api/browser/mainThreadLocalization.ts | 12 +- .../api/browser/mainThreadLogService.ts | 16 +- .../api/browser/mainThreadManagedSockets.ts | 18 +- .../api/browser/mainThreadMessageService.ts | 22 +- .../api/browser/mainThreadNotebook.ts | 42 +- .../browser/mainThreadNotebookDocuments.ts | 24 +- .../mainThreadNotebookDocumentsAndEditors.ts | 36 +- .../api/browser/mainThreadNotebookDto.ts | 8 +- .../api/browser/mainThreadNotebookEditors.ts | 26 +- .../api/browser/mainThreadNotebookKernels.ts | 36 +- .../browser/mainThreadNotebookRenderers.ts | 8 +- .../mainThreadNotebookSaveParticipant.ts | 22 +- .../api/browser/mainThreadOutputService.ts | 18 +- .../mainThreadProfileContentHandlers.ts | 14 +- .../api/browser/mainThreadProgress.ts | 12 +- .../api/browser/mainThreadQuickDiff.ts | 12 +- .../api/browser/mainThreadQuickOpen.ts | 12 +- .../browser/mainThreadRemoteConnectionData.ts | 10 +- src/vs/workbench/api/browser/mainThreadSCM.ts | 48 +- .../api/browser/mainThreadSaveParticipant.ts | 20 +- .../workbench/api/browser/mainThreadSearch.ts | 22 +- .../api/browser/mainThreadSecretState.ts | 14 +- .../workbench/api/browser/mainThreadShare.ts | 12 +- .../workbench/api/browser/mainThreadSpeech.ts | 14 +- .../api/browser/mainThreadStatusBar.ts | 18 +- .../api/browser/mainThreadStorage.ts | 18 +- .../workbench/api/browser/mainThreadTask.ts | 34 +- .../api/browser/mainThreadTelemetry.ts | 18 +- .../api/browser/mainThreadTerminalService.ts | 40 +- .../mainThreadTerminalShellIntegration.ts | 18 +- .../api/browser/mainThreadTesting.ts | 36 +- .../api/browser/mainThreadTheming.ts | 8 +- .../api/browser/mainThreadTimeline.ts | 16 +- .../api/browser/mainThreadTreeViews.ts | 34 +- .../api/browser/mainThreadTunnelService.ts | 34 +- .../api/browser/mainThreadUriOpeners.ts | 32 +- .../workbench/api/browser/mainThreadUrls.ts | 14 +- .../api/browser/mainThreadWebviewManager.ts | 16 +- .../api/browser/mainThreadWebviewPanels.ts | 42 +- .../api/browser/mainThreadWebviewViews.ts | 20 +- .../api/browser/mainThreadWebviews.ts | 30 +- .../workbench/api/browser/mainThreadWindow.ts | 16 +- .../api/browser/mainThreadWorkspace.ts | 52 +-- .../api/browser/statusBarExtensionPoint.ts | 38 +- .../api/browser/viewsExtensionPoint.ts | 54 +-- .../api/common/configurationExtensionPoint.ts | 30 +- .../workbench/api/common/extHost.api.impl.ts | 208 ++++----- .../api/common/extHost.common.services.ts | 58 +-- .../workbench/api/common/extHost.protocol.ts | 160 +++---- .../api/common/extHostAiRelatedInformation.ts | 6 +- .../api/common/extHostApiCommands.ts | 36 +- .../common/extHostApiDeprecationService.ts | 10 +- .../api/common/extHostAuthentication.ts | 14 +- .../workbench/api/common/extHostBulkEdits.ts | 12 +- .../api/common/extHostChatAgents2.ts | 48 +- .../api/common/extHostChatVariables.ts | 20 +- .../workbench/api/common/extHostClipboard.ts | 2 +- .../workbench/api/common/extHostCodeInsets.ts | 14 +- .../workbench/api/common/extHostCommands.ts | 52 +-- .../workbench/api/common/extHostComments.ts | 34 +- .../api/common/extHostConfiguration.ts | 32 +- .../api/common/extHostConsoleForwarder.ts | 10 +- .../api/common/extHostCustomEditors.ts | 34 +- .../api/common/extHostDebugService.ts | 54 +-- .../api/common/extHostDecorations.ts | 24 +- .../api/common/extHostDiagnostics.ts | 26 +- src/vs/workbench/api/common/extHostDialogs.ts | 8 +- .../common/extHostDocumentContentProviders.ts | 20 +- .../api/common/extHostDocumentData.ts | 18 +- .../common/extHostDocumentSaveParticipant.ts | 24 +- .../workbench/api/common/extHostDocuments.ts | 22 +- .../api/common/extHostDocumentsAndEditors.ts | 30 +- .../workbench/api/common/extHostEditorTabs.ts | 18 +- .../workbench/api/common/extHostEmbedding.ts | 10 +- .../api/common/extHostEmbeddingVector.ts | 6 +- .../api/common/extHostExtensionActivator.ts | 14 +- .../api/common/extHostExtensionService.ts | 84 ++-- .../workbench/api/common/extHostFileSystem.ts | 28 +- .../api/common/extHostFileSystemConsumer.ts | 24 +- .../common/extHostFileSystemEventService.ts | 26 +- .../api/common/extHostFileSystemInfo.ts | 12 +- .../api/common/extHostInitDataService.ts | 4 +- .../api/common/extHostInteractive.ts | 12 +- .../api/common/extHostLabelService.ts | 6 +- .../api/common/extHostLanguageFeatures.ts | 66 +-- .../api/common/extHostLanguageModelTools.ts | 20 +- .../api/common/extHostLanguageModels.ts | 40 +- .../workbench/api/common/extHostLanguages.ts | 22 +- .../api/common/extHostLocalizationService.ts | 18 +- .../workbench/api/common/extHostLogService.ts | 8 +- .../api/common/extHostLoggerService.ts | 12 +- .../api/common/extHostManagedSockets.ts | 10 +- src/vs/workbench/api/common/extHostMemento.ts | 8 +- .../api/common/extHostMessageService.ts | 10 +- .../workbench/api/common/extHostNotebook.ts | 68 +-- .../api/common/extHostNotebookDocument.ts | 16 +- .../extHostNotebookDocumentSaveParticipant.ts | 22 +- .../api/common/extHostNotebookDocuments.ts | 12 +- .../api/common/extHostNotebookEditor.ts | 10 +- .../api/common/extHostNotebookEditors.ts | 10 +- .../api/common/extHostNotebookKernels.ts | 44 +- .../api/common/extHostNotebookRenderers.ts | 10 +- src/vs/workbench/api/common/extHostOutput.ts | 32 +- .../common/extHostProfileContentHandler.ts | 16 +- .../workbench/api/common/extHostProgress.ts | 14 +- .../workbench/api/common/extHostQuickDiff.ts | 12 +- .../workbench/api/common/extHostQuickOpen.ts | 30 +- .../api/common/extHostRequireInterceptor.ts | 26 +- .../workbench/api/common/extHostRpcService.ts | 4 +- src/vs/workbench/api/common/extHostSCM.ts | 42 +- src/vs/workbench/api/common/extHostSearch.ts | 26 +- .../api/common/extHostSecretState.ts | 8 +- src/vs/workbench/api/common/extHostSecrets.ts | 8 +- src/vs/workbench/api/common/extHostShare.ts | 10 +- src/vs/workbench/api/common/extHostSpeech.ts | 8 +- .../workbench/api/common/extHostStatusBar.ts | 16 +- src/vs/workbench/api/common/extHostStorage.ts | 12 +- .../api/common/extHostStoragePaths.ts | 14 +- src/vs/workbench/api/common/extHostTask.ts | 44 +- .../workbench/api/common/extHostTelemetry.ts | 28 +- .../api/common/extHostTerminalService.ts | 46 +- .../common/extHostTerminalShellIntegration.ts | 18 +- .../workbench/api/common/extHostTestItem.ts | 16 +- src/vs/workbench/api/common/extHostTesting.ts | 54 +-- .../api/common/extHostTestingPrivateApi.ts | 2 +- .../workbench/api/common/extHostTextEditor.ts | 24 +- .../api/common/extHostTextEditors.ts | 18 +- src/vs/workbench/api/common/extHostTheming.ts | 8 +- .../workbench/api/common/extHostTimeline.ts | 24 +- .../workbench/api/common/extHostTreeViews.ts | 40 +- .../api/common/extHostTunnelService.ts | 26 +- .../api/common/extHostTypeConverters.ts | 100 ++--- src/vs/workbench/api/common/extHostTypes.ts | 30 +- .../workbench/api/common/extHostUriOpener.ts | 14 +- .../common/extHostUriTransformerService.ts | 6 +- src/vs/workbench/api/common/extHostUrls.ts | 10 +- .../common/extHostVariableResolverService.ts | 28 +- src/vs/workbench/api/common/extHostWebview.ts | 30 +- .../api/common/extHostWebviewMessaging.ts | 4 +- .../api/common/extHostWebviewPanels.ts | 22 +- .../api/common/extHostWebviewView.ts | 16 +- src/vs/workbench/api/common/extHostWindow.ts | 14 +- .../workbench/api/common/extHostWorkspace.ts | 62 +-- .../workbench/api/common/extensionHostMain.ts | 40 +- .../common/jsonValidationExtensionPoint.ts | 20 +- .../api/common/shared/dataTransferCache.ts | 6 +- src/vs/workbench/api/common/shared/tasks.ts | 6 +- .../api/node/extHost.node.services.ts | 46 +- src/vs/workbench/api/node/extHostCLIServer.ts | 12 +- .../api/node/extHostConsoleForwarder.ts | 8 +- .../workbench/api/node/extHostDebugService.ts | 48 +- .../api/node/extHostDiskFileSystemProvider.ts | 12 +- .../api/node/extHostDownloadService.ts | 14 +- .../api/node/extHostExtensionService.ts | 34 +- .../api/node/extHostLoggerService.ts | 12 +- src/vs/workbench/api/node/extHostSearch.ts | 32 +- .../workbench/api/node/extHostStoragePaths.ts | 16 +- src/vs/workbench/api/node/extHostTask.ts | 38 +- .../api/node/extHostTerminalService.ts | 8 +- .../api/node/extHostTunnelService.ts | 38 +- .../node/extHostVariableResolverService.ts | 2 +- .../api/node/extensionHostProcess.ts | 46 +- src/vs/workbench/api/node/proxyResolver.ts | 38 +- src/vs/workbench/api/node/uriTransformer.ts | 2 +- .../api/test/browser/extHost.api.impl.test.ts | 8 +- .../test/browser/extHostApiCommands.test.ts | 118 ++--- .../extHostAuthentication.integrationTest.ts | 52 +-- .../api/test/browser/extHostBulkEdits.test.ts | 22 +- .../api/test/browser/extHostCommands.test.ts | 16 +- .../test/browser/extHostConfiguration.test.ts | 32 +- .../test/browser/extHostDecorations.test.ts | 20 +- .../test/browser/extHostDiagnostics.test.ts | 28 +- .../extHostDocumentContentProvider.test.ts | 20 +- .../test/browser/extHostDocumentData.test.ts | 20 +- .../extHostDocumentSaveParticipant.test.ts | 26 +- .../extHostDocumentsAndEditors.test.ts | 10 +- .../test/browser/extHostEditorTabs.test.ts | 14 +- .../extHostFileSystemEventService.test.ts | 8 +- .../browser/extHostLanguageFeatures.test.ts | 102 ++--- .../browser/extHostMessagerService.test.ts | 20 +- .../api/test/browser/extHostNotebook.test.ts | 48 +- .../browser/extHostNotebookKernel.test.ts | 54 +-- .../api/test/browser/extHostTelemetry.test.ts | 20 +- .../api/test/browser/extHostTesting.test.ts | 46 +- .../test/browser/extHostTextEditor.test.ts | 20 +- .../api/test/browser/extHostTreeViews.test.ts | 26 +- .../test/browser/extHostTypeConverter.test.ts | 12 +- .../api/test/browser/extHostTypes.test.ts | 16 +- .../api/test/browser/extHostWebview.test.ts | 32 +- .../api/test/browser/extHostWorkspace.test.ts | 44 +- .../test/browser/mainThreadBulkEdits.test.ts | 18 +- .../test/browser/mainThreadCommands.test.ts | 12 +- .../browser/mainThreadConfiguration.test.ts | 20 +- .../browser/mainThreadDiagnostics.test.ts | 22 +- ...mainThreadDocumentContentProviders.test.ts | 18 +- .../test/browser/mainThreadDocuments.test.ts | 10 +- .../mainThreadDocumentsAndEditors.test.ts | 64 +-- .../test/browser/mainThreadEditors.test.ts | 110 ++--- .../browser/mainThreadManagedSockets.test.ts | 20 +- .../test/browser/mainThreadTreeViews.test.ts | 34 +- .../test/browser/mainThreadWorkspace.test.ts | 18 +- .../common/extHostExtensionActivator.test.ts | 18 +- .../api/test/common/extensionHostMain.test.ts | 34 +- .../api/test/common/testRPCProtocol.ts | 14 +- .../api/test/node/extHostSearch.test.ts | 42 +- .../test/node/extHostTunnelService.test.ts | 2 +- .../api/worker/extHost.worker.services.ts | 14 +- .../api/worker/extHostConsoleForwarder.ts | 6 +- .../api/worker/extHostExtensionService.ts | 18 +- .../api/worker/extensionHostWorker.esm.ts | 2 +- .../api/worker/extensionHostWorker.ts | 28 +- src/vs/workbench/browser/actions.ts | 12 +- .../browser/actions/developerActions.ts | 74 ++-- .../workbench/browser/actions/helpActions.ts | 24 +- .../browser/actions/layoutActions.ts | 58 +-- .../workbench/browser/actions/listCommands.ts | 40 +- .../browser/actions/navigationActions.ts | 32 +- .../browser/actions/quickAccessActions.ts | 24 +- .../browser/actions/textInputActions.ts | 24 +- .../actions/widgetNavigationCommands.ts | 18 +- .../browser/actions/windowActions.ts | 64 +-- .../browser/actions/workspaceActions.ts | 40 +- .../browser/actions/workspaceCommands.ts | 42 +- src/vs/workbench/browser/codeeditor.ts | 38 +- src/vs/workbench/browser/composite.ts | 30 +- src/vs/workbench/browser/contextkeys.ts | 44 +- src/vs/workbench/browser/dnd.ts | 68 +-- src/vs/workbench/browser/editor.ts | 34 +- src/vs/workbench/browser/labels.ts | 46 +- src/vs/workbench/browser/layout.ts | 90 ++-- src/vs/workbench/browser/panecomposite.ts | 40 +- src/vs/workbench/browser/part.ts | 20 +- .../parts/activitybar/activitybarPart.ts | 68 +-- .../parts/auxiliarybar/auxiliaryBarActions.ts | 26 +- .../parts/auxiliarybar/auxiliaryBarPart.ts | 66 +-- .../browser/parts/banner/bannerPart.ts | 50 +-- .../workbench/browser/parts/compositeBar.ts | 36 +- .../browser/parts/compositeBarActions.ts | 48 +- .../workbench/browser/parts/compositePart.ts | 66 +-- .../parts/dialogs/dialog.web.contribution.ts | 26 +- .../browser/parts/dialogs/dialogHandler.ts | 34 +- .../parts/editor/auxiliaryEditorPart.ts | 48 +- .../browser/parts/editor/binaryDiffEditor.ts | 24 +- .../browser/parts/editor/binaryEditor.ts | 22 +- .../browser/parts/editor/breadcrumbs.ts | 22 +- .../parts/editor/breadcrumbsControl.ts | 76 ++-- .../browser/parts/editor/breadcrumbsModel.ts | 26 +- .../browser/parts/editor/breadcrumbsPicker.ts | 56 +-- .../parts/editor/diffEditorCommands.ts | 26 +- .../parts/editor/editor.contribution.ts | 78 ++-- .../workbench/browser/parts/editor/editor.ts | 32 +- .../browser/parts/editor/editorActions.ts | 72 +-- .../browser/parts/editor/editorAutoSave.ts | 30 +- .../browser/parts/editor/editorCommands.ts | 74 ++-- .../parts/editor/editorCommandsContext.ts | 16 +- .../parts/editor/editorConfiguration.ts | 26 +- .../browser/parts/editor/editorDropTarget.ts | 48 +- .../browser/parts/editor/editorGroupView.ts | 110 ++--- .../parts/editor/editorGroupWatermark.ts | 24 +- .../browser/parts/editor/editorPane.ts | 44 +- .../browser/parts/editor/editorPanes.ts | 50 +-- .../browser/parts/editor/editorPart.ts | 66 +-- .../browser/parts/editor/editorParts.ts | 42 +- .../browser/parts/editor/editorPlaceholder.ts | 54 +-- .../browser/parts/editor/editorQuickAccess.ts | 30 +- .../browser/parts/editor/editorStatus.ts | 106 ++--- .../browser/parts/editor/editorTabsControl.ts | 88 ++-- .../parts/editor/editorTitleControl.ts | 30 +- .../parts/editor/editorWithViewState.ts | 28 +- .../browser/parts/editor/editorsObserver.ts | 26 +- .../parts/editor/multiEditorTabsControl.ts | 110 ++--- .../parts/editor/multiRowEditorTabsControl.ts | 22 +- .../parts/editor/noEditorTabsControl.ts | 12 +- .../browser/parts/editor/sideBySideEditor.ts | 58 +-- .../parts/editor/singleEditorTabsControl.ts | 32 +- .../browser/parts/editor/textCodeEditor.ts | 28 +- .../browser/parts/editor/textDiffEditor.ts | 64 +-- .../browser/parts/editor/textEditor.ts | 52 +-- .../parts/editor/textResourceEditor.ts | 50 +-- .../browser/parts/globalCompositeBar.ts | 82 ++-- .../notificationAccessibleView.ts | 26 +- .../notifications/notificationsActions.ts | 20 +- .../notifications/notificationsAlerts.ts | 14 +- .../notifications/notificationsCenter.ts | 52 +-- .../notifications/notificationsCommands.ts | 38 +- .../parts/notifications/notificationsList.ts | 36 +- .../notifications/notificationsStatus.ts | 12 +- .../notifications/notificationsTelemetry.ts | 10 +- .../notifications/notificationsToasts.ts | 46 +- .../notifications/notificationsViewer.ts | 58 +-- .../browser/parts/paneCompositeBar.ts | 52 +-- .../browser/parts/paneCompositePart.ts | 74 ++-- .../browser/parts/paneCompositePartService.ts | 28 +- .../browser/parts/panel/panelActions.ts | 34 +- .../browser/parts/panel/panelPart.ts | 54 +-- .../browser/parts/sidebar/sidebarActions.ts | 20 +- .../browser/parts/sidebar/sidebarPart.ts | 58 +-- .../parts/statusbar/statusbarActions.ts | 26 +- .../browser/parts/statusbar/statusbarItem.ts | 46 +- .../browser/parts/statusbar/statusbarModel.ts | 10 +- .../browser/parts/statusbar/statusbarPart.ts | 62 +-- .../parts/titlebar/commandCenterControl.ts | 38 +- .../browser/parts/titlebar/menubarControl.ts | 78 ++-- .../browser/parts/titlebar/titlebarActions.ts | 22 +- .../browser/parts/titlebar/titlebarPart.ts | 106 ++--- .../browser/parts/titlebar/windowTitle.ts | 52 +-- .../workbench/browser/parts/views/checkbox.ts | 22 +- .../workbench/browser/parts/views/treeView.ts | 146 +++--- .../browser/parts/views/viewFilter.ts | 46 +- .../workbench/browser/parts/views/viewPane.ts | 100 ++--- .../browser/parts/views/viewPaneContainer.ts | 76 ++-- .../browser/parts/views/viewsViewlet.ts | 28 +- src/vs/workbench/browser/quickaccess.ts | 26 +- src/vs/workbench/browser/style.ts | 16 +- src/vs/workbench/browser/web.api.ts | 32 +- src/vs/workbench/browser/web.factory.ts | 24 +- src/vs/workbench/browser/web.main.ts | 186 ++++---- src/vs/workbench/browser/window.ts | 56 +-- .../browser/workbench.contribution.ts | 20 +- src/vs/workbench/browser/workbench.ts | 96 ++-- src/vs/workbench/common/comments.ts | 4 +- src/vs/workbench/common/component.ts | 10 +- src/vs/workbench/common/composite.ts | 2 +- src/vs/workbench/common/configuration.ts | 28 +- src/vs/workbench/common/contextkeys.ts | 26 +- src/vs/workbench/common/contributions.ts | 20 +- src/vs/workbench/common/dialogs.ts | 8 +- src/vs/workbench/common/editor.ts | 50 +-- .../common/editor/binaryEditorModel.ts | 8 +- .../common/editor/diffEditorInput.ts | 24 +- .../common/editor/diffEditorModel.ts | 4 +- .../common/editor/editorGroupModel.ts | 18 +- src/vs/workbench/common/editor/editorInput.ts | 18 +- src/vs/workbench/common/editor/editorModel.ts | 4 +- .../workbench/common/editor/editorOptions.ts | 8 +- .../common/editor/filteredEditorGroupModel.ts | 10 +- .../common/editor/resourceEditorInput.ts | 22 +- .../common/editor/sideBySideEditorInput.ts | 18 +- .../common/editor/textDiffEditorModel.ts | 8 +- .../common/editor/textEditorModel.ts | 28 +- .../common/editor/textResourceEditorInput.ts | 34 +- .../common/editor/textResourceEditorModel.ts | 12 +- src/vs/workbench/common/memento.ts | 10 +- src/vs/workbench/common/notifications.ts | 18 +- src/vs/workbench/common/panecomposite.ts | 4 +- src/vs/workbench/common/resources.ts | 24 +- src/vs/workbench/common/theme.ts | 10 +- src/vs/workbench/common/views.ts | 46 +- .../browser/accessibility.contribution.ts | 32 +- .../browser/accessibilityConfiguration.ts | 24 +- .../browser/accessibilityStatus.ts | 20 +- .../accessibility/browser/accessibleView.ts | 86 ++-- .../browser/accessibleViewActions.ts | 24 +- .../browser/accessibleViewContributions.ts | 12 +- .../accessibleViewKeybindingResolver.ts | 6 +- .../browser/editorAccessibilityHelp.ts | 32 +- .../extensionAccesibilityHelp.contribution.ts | 18 +- .../unfocusedViewDimmingContribution.ts | 14 +- .../accessibilitySignal.contribution.ts | 16 +- ...accessibilitySignalDebuggerContribution.ts | 10 +- .../accessibilitySignals/browser/commands.ts | 22 +- .../editorTextPropertySignalsContribution.ts | 32 +- .../browser/openDiffEditorAnnouncement.ts | 18 +- .../browser/saveAccessibilitySignal.ts | 10 +- .../accountsEntitlements.contribution.ts | 46 +- ...manageTrustedExtensionsForAccountAction.ts | 24 +- .../browser/actions/signOutOfAccountAction.ts | 16 +- .../browser/authentication.contribution.ts | 34 +- ...ketPairColorizer2Telemetry.contribution.ts | 16 +- .../contrib/bulkEdit/browser/bulkCellEdits.ts | 26 +- .../bulkEdit/browser/bulkEditService.ts | 50 +-- .../contrib/bulkEdit/browser/bulkFileEdits.ts | 30 +- .../contrib/bulkEdit/browser/bulkTextEdits.ts | 38 +- .../contrib/bulkEdit/browser/conflicts.ts | 20 +- .../browser/preview/bulkEdit.contribution.ts | 50 +-- .../bulkEdit/browser/preview/bulkEditPane.ts | 76 ++-- .../browser/preview/bulkEditPreview.ts | 44 +- .../bulkEdit/browser/preview/bulkEditTree.ts | 54 +-- .../test/browser/bulkCellEdits.test.ts | 22 +- .../test/browser/bulkEditPreview.test.ts | 24 +- .../browser/callHierarchy.contribution.ts | 46 +- .../browser/callHierarchyPeek.ts | 62 +-- .../browser/callHierarchyTree.ts | 24 +- .../callHierarchy/common/callHierarchy.ts | 28 +- .../browser/actions/chatAccessibilityHelp.ts | 26 +- .../chat/browser/actions/chatActions.ts | 52 +-- .../contrib/chat/browser/actions/chatClear.ts | 8 +- .../chat/browser/actions/chatClearActions.ts | 32 +- .../browser/actions/chatCodeblockActions.ts | 86 ++-- .../browser/actions/chatContextActions.ts | 64 +-- .../chat/browser/actions/chatCopyActions.ts | 16 +- .../browser/actions/chatDeveloperActions.ts | 12 +- .../browser/actions/chatExecuteActions.ts | 26 +- .../browser/actions/chatFileTreeActions.ts | 18 +- .../chat/browser/actions/chatImportExport.ts | 30 +- .../chat/browser/actions/chatMoveActions.ts | 28 +- .../browser/actions/chatQuickInputActions.ts | 24 +- .../chat/browser/actions/chatTitleActions.ts | 40 +- .../contrib/chat/browser/chat.contribution.ts | 116 ++--- src/vs/workbench/contrib/chat/browser/chat.ts | 36 +- .../chat/browser/chatAccessibilityProvider.ts | 16 +- .../chat/browser/chatAccessibilityService.ts | 22 +- .../contrib/chat/browser/chatAgentHover.ts | 32 +- .../chatAttachmentsContentPart.ts | 26 +- .../chatCodeCitationContentPart.ts | 20 +- .../chatContentParts/chatCollections.ts | 2 +- .../chatCommandContentPart.ts | 20 +- .../chatConfirmationContentPart.ts | 18 +- .../chatConfirmationWidget.ts | 18 +- .../chatContentParts/chatContentParts.ts | 6 +- .../chatMarkdownContentPart.ts | 44 +- .../chatProgressContentPart.ts | 22 +- .../chatReferencesContentPart.ts | 56 +-- .../chatContentParts/chatTaskContentPart.ts | 22 +- .../chatTextEditContentPart.ts | 56 +-- .../chatContentParts/chatTreeContentPart.ts | 46 +- .../chatWarningContentPart.ts | 16 +- .../contrib/chat/browser/chatEditor.ts | 40 +- .../contrib/chat/browser/chatEditorInput.ts | 32 +- .../contrib/chat/browser/chatFollowups.ts | 16 +- .../contrib/chat/browser/chatInputPart.ts | 110 ++--- .../contrib/chat/browser/chatListRenderer.ts | 134 +++--- .../chatMarkdownDecorationsRenderer.ts | 50 +-- .../chat/browser/chatMarkdownRenderer.ts | 18 +- .../contrib/chat/browser/chatOptions.ts | 14 +- .../browser/chatParticipantContributions.ts | 46 +- .../contrib/chat/browser/chatQuick.ts | 42 +- .../browser/chatResponseAccessibleView.ts | 22 +- .../contrib/chat/browser/chatVariables.ts | 38 +- .../contrib/chat/browser/chatViewPane.ts | 50 +-- .../contrib/chat/browser/chatWidget.ts | 74 ++-- .../codeBlockContextProviderService.ts | 4 +- .../contrib/chat/browser/codeBlockPart.ts | 130 +++--- .../browser/contrib/chatContextAttachments.ts | 8 +- .../browser/contrib/chatDynamicVariables.ts | 40 +- .../browser/contrib/chatInputCompletions.ts | 48 +- .../browser/contrib/chatInputEditorContrib.ts | 30 +- .../browser/contrib/chatInputEditorHover.ts | 26 +- .../browser/contrib/editorHoverWrapper.ts | 10 +- .../contrib/chat/common/annotations.ts | 12 +- .../contrib/chat/common/chatAgents.ts | 50 +-- .../contrib/chat/common/chatColors.ts | 6 +- .../contrib/chat/common/chatContextKeys.ts | 6 +- .../contrib/chat/common/chatModel.ts | 42 +- .../contrib/chat/common/chatParserTypes.ts | 12 +- .../contrib/chat/common/chatRequestParser.ts | 16 +- .../contrib/chat/common/chatService.ts | 32 +- .../contrib/chat/common/chatServiceImpl.ts | 64 +-- .../chat/common/chatServiceTelemetry.ts | 6 +- .../contrib/chat/common/chatSlashCommands.ts | 18 +- .../contrib/chat/common/chatVariables.ts | 22 +- .../contrib/chat/common/chatViewModel.ts | 32 +- .../chat/common/chatWidgetHistoryService.ts | 12 +- .../chat/common/codeBlockModelCollection.ts | 20 +- .../contrib/chat/common/languageModelStats.ts | 16 +- .../chat/common/languageModelToolsService.ts | 22 +- .../contrib/chat/common/languageModels.ts | 24 +- .../tools/languageModelToolsContribution.ts | 22 +- .../contrib/chat/common/voiceChatService.ts | 22 +- .../actions/voiceChatActions.ts | 106 ++--- .../electron-sandbox/chat.contribution.ts | 6 +- .../test/browser/chatMarkdownRenderer.test.ts | 14 +- .../chat/test/browser/chatVariables.test.ts | 38 +- .../browser/languageModelToolsService.test.ts | 14 +- .../chat/test/browser/mockChatWidget.ts | 4 +- .../chat/test/common/annotations.test.ts | 10 +- .../chat/test/common/chatAgents.test.ts | 10 +- .../chat/test/common/chatModel.test.ts | 34 +- .../test/common/chatRequestParser.test.ts | 36 +- .../chat/test/common/chatService.test.ts | 58 +-- .../chat/test/common/chatWordCounter.test.ts | 4 +- .../chat/test/common/languageModels.test.ts | 18 +- .../chat/test/common/mockChatService.ts | 14 +- .../chat/test/common/mockChatVariables.ts | 12 +- .../common/mockLanguageModelToolsService.ts | 8 +- .../chat/test/common/voiceChatService.test.ts | 28 +- .../electron-sandbox/voiceChatActions.test.ts | 4 +- .../browser/codeActions.contribution.ts | 20 +- .../browser/codeActionsContribution.ts | 30 +- .../browser/documentationContribution.ts | 26 +- .../common/codeActionsExtensionPoint.ts | 18 +- .../common/documentationExtensionPoint.ts | 6 +- .../browser/accessibility/accessibility.ts | 22 +- .../browser/codeEditor.contribution.ts | 42 +- .../browser/dictation/editorDictation.ts | 54 +-- .../browser/diffEditorAccessibilityHelp.ts | 24 +- .../codeEditor/browser/diffEditorHelper.ts | 30 +- .../codeEditor/browser/editorFeatures.ts | 12 +- .../browser/editorLineNumberMenu.ts | 24 +- .../browser/editorSettingsMigration.ts | 6 +- .../emptyTextEditorHint.ts | 66 +-- .../browser/find/simpleFindWidget.ts | 46 +- .../inspectEditorTokens.ts | 56 +-- .../codeEditor/browser/inspectKeybindings.ts | 14 +- .../browser/largeFileOptimizations.ts | 16 +- .../codeEditor/browser/menuPreventer.ts | 10 +- .../browser/outline/documentSymbolsOutline.ts | 60 +-- .../browser/outline/documentSymbolsTree.ts | 42 +- .../quickaccess/gotoLineQuickAccess.ts | 32 +- .../quickaccess/gotoSymbolQuickAccess.ts | 62 +-- .../codeEditor/browser/saveParticipants.ts | 66 +-- .../codeEditor/browser/simpleEditorOptions.ts | 26 +- .../suggestEnabledInput.ts | 70 +-- .../browser/toggleColumnSelection.ts | 22 +- .../codeEditor/browser/toggleMinimap.ts | 12 +- .../browser/toggleMultiCursorModifier.ts | 20 +- .../browser/toggleRenderControlCharacter.ts | 12 +- .../browser/toggleRenderWhitespace.ts | 12 +- .../codeEditor/browser/toggleWordWrap.ts | 38 +- .../browser/workbenchEditorWorkerService.ts | 14 +- .../browser/workbenchReferenceSearch.ts | 18 +- .../languageConfigurationExtensionPoint.ts | 30 +- .../codeEditor.contribution.ts | 10 +- .../displayChangeRemeasureFonts.ts | 12 +- .../electron-sandbox/inputClipboardActions.ts | 8 +- .../electron-sandbox/selectionClipboard.ts | 38 +- .../sleepResumeRepaintMinimap.ts | 12 +- .../electron-sandbox/startDebugTextMate.ts | 36 +- .../test/browser/saveParticipant.test.ts | 24 +- .../codeEditor/test/node/autoindent.test.ts | 34 +- .../commands/common/commands.contribution.ts | 14 +- .../contrib/comments/browser/commentColors.ts | 12 +- .../comments/browser/commentFormActions.ts | 16 +- .../comments/browser/commentGlyphWidget.ts | 18 +- .../contrib/comments/browser/commentMenus.ts | 12 +- .../contrib/comments/browser/commentNode.ts | 94 ++-- .../contrib/comments/browser/commentReply.ts | 54 +-- .../comments/browser/commentService.ts | 38 +- .../browser/commentThreadAdditionalActions.ts | 26 +- .../comments/browser/commentThreadBody.ts | 36 +- .../comments/browser/commentThreadHeader.ts | 40 +- .../browser/commentThreadRangeDecorator.ts | 14 +- .../comments/browser/commentThreadWidget.ts | 70 +-- .../browser/commentThreadZoneWidget.ts | 46 +- .../comments/browser/comments.contribution.ts | 54 +-- .../contrib/comments/browser/comments.ts | 6 +- .../comments/browser/commentsAccessibility.ts | 22 +- .../browser/commentsAccessibleView.ts | 22 +- .../comments/browser/commentsController.ts | 88 ++-- .../browser/commentsEditorContribution.ts | 50 +-- .../comments/browser/commentsFilterOptions.ts | 4 +- .../browser/commentsInputContentProvider.ts | 26 +- .../contrib/comments/browser/commentsModel.ts | 14 +- .../comments/browser/commentsTreeViewer.ts | 80 ++-- .../contrib/comments/browser/commentsView.ts | 68 +-- .../comments/browser/commentsViewActions.ts | 28 +- .../comments/browser/reactionsAction.ts | 10 +- .../comments/browser/simpleCommentEditor.ts | 66 +-- .../contrib/comments/browser/timestamp.ts | 18 +- .../comments/common/commentContextKeys.ts | 4 +- .../contrib/comments/common/commentModel.ts | 6 +- .../test/browser/commentsView.test.ts | 34 +- .../configurationExportHelper.contribution.ts | 12 +- .../configurationExportHelper.ts | 18 +- .../browser/contextmenu.contribution.ts | 12 +- .../browser/customEditor.contribution.ts | 22 +- .../customEditor/browser/customEditorInput.ts | 58 +-- .../browser/customEditorInputFactory.ts | 32 +- .../customEditor/browser/customEditors.ts | 50 +-- .../common/contributedCustomEditors.ts | 22 +- .../customEditor/common/customEditor.ts | 20 +- .../common/customEditorModelManager.ts | 8 +- .../common/customTextEditorModel.ts | 20 +- .../customEditor/common/extensionPoint.ts | 22 +- .../contrib/debug/browser/baseDebugView.ts | 48 +- .../browser/breakpointEditorContribution.ts | 74 ++-- .../contrib/debug/browser/breakpointWidget.ts | 86 ++-- .../contrib/debug/browser/breakpointsView.ts | 106 ++--- .../browser/callStackEditorContribution.ts | 34 +- .../contrib/debug/browser/callStackView.ts | 96 ++-- .../contrib/debug/browser/callStackWidget.ts | 80 ++-- .../debug/browser/debug.contribution.ts | 120 ++--- .../debug/browser/debugANSIHandling.ts | 10 +- .../debug/browser/debugActionViewItems.ts | 48 +- .../debug/browser/debugAdapterManager.ts | 62 +-- .../contrib/debug/browser/debugColors.ts | 14 +- .../contrib/debug/browser/debugCommands.ts | 70 +-- .../browser/debugConfigurationManager.ts | 68 +-- .../debug/browser/debugConsoleQuickAccess.ts | 20 +- .../debug/browser/debugEditorActions.ts | 58 +-- .../debug/browser/debugEditorContribution.ts | 98 ++-- .../contrib/debug/browser/debugHover.ts | 74 ++-- .../contrib/debug/browser/debugIcons.ts | 6 +- .../contrib/debug/browser/debugMemory.ts | 16 +- .../contrib/debug/browser/debugProgress.ts | 12 +- .../contrib/debug/browser/debugQuickAccess.ts | 22 +- .../contrib/debug/browser/debugService.ts | 112 ++--- .../contrib/debug/browser/debugSession.ts | 86 ++-- .../debug/browser/debugSessionPicker.ts | 20 +- .../debug/browser/debugSettingMigration.ts | 4 +- .../contrib/debug/browser/debugStatus.ts | 12 +- .../contrib/debug/browser/debugTaskRunner.ts | 42 +- .../contrib/debug/browser/debugTitle.ts | 10 +- .../contrib/debug/browser/debugToolBar.ts | 76 ++-- .../contrib/debug/browser/debugViewlet.ts | 62 +-- .../contrib/debug/browser/disassemblyView.ts | 80 ++-- .../contrib/debug/browser/exceptionWidget.ts | 34 +- .../browser/extensionHostDebugService.ts | 30 +- .../contrib/debug/browser/linkDetector.ts | 40 +- .../debug/browser/loadedScriptsView.ts | 82 ++-- .../contrib/debug/browser/rawDebugSession.ts | 32 +- .../workbench/contrib/debug/browser/repl.ts | 144 +++--- .../debug/browser/replAccessibilityHelp.ts | 18 +- .../debug/browser/replAccessibleView.ts | 22 +- .../contrib/debug/browser/replFilter.ts | 12 +- .../contrib/debug/browser/replViewer.ts | 60 +-- .../browser/runAndDebugAccessibilityHelp.ts | 24 +- .../debug/browser/statusbarColorProvider.ts | 20 +- .../contrib/debug/browser/variablesView.ts | 90 ++-- .../debug/browser/watchExpressionsView.ts | 66 +-- .../contrib/debug/browser/welcomeView.ts | 48 +- .../debug/common/abstractDebugAdapter.ts | 8 +- .../contrib/debug/common/breakpoints.ts | 4 +- .../workbench/contrib/debug/common/debug.ts | 52 +-- .../common/debugAccessibilityAnnouncer.ts | 14 +- .../contrib/debug/common/debugCompoundRoot.ts | 2 +- .../debug/common/debugContentProvider.ts | 32 +- .../contrib/debug/common/debugContext.ts | 6 +- .../contrib/debug/common/debugLifecycle.ts | 14 +- .../contrib/debug/common/debugModel.ts | 52 +-- .../contrib/debug/common/debugSchemas.ts | 22 +- .../contrib/debug/common/debugSource.ts | 26 +- .../contrib/debug/common/debugStorage.ts | 18 +- .../contrib/debug/common/debugTelemetry.ts | 6 +- .../contrib/debug/common/debugUtils.ts | 28 +- .../contrib/debug/common/debugViewModel.ts | 8 +- .../contrib/debug/common/debugVisualizers.ts | 24 +- .../contrib/debug/common/debugger.ts | 36 +- .../debug/common/disassemblyViewInput.ts | 10 +- .../debug/common/loadedScriptsPicker.ts | 26 +- .../common/replAccessibilityAnnouncer.ts | 10 +- .../contrib/debug/common/replModel.ts | 16 +- .../extensionHostDebugService.ts | 6 +- .../contrib/debug/node/debugAdapter.ts | 18 +- .../contrib/debug/node/telemetryApp.ts | 6 +- .../workbench/contrib/debug/node/terminals.ts | 4 +- .../debug/test/browser/baseDebugView.test.ts | 36 +- .../debug/test/browser/breakpoints.test.ts | 44 +- .../debug/test/browser/callStack.test.ts | 38 +- .../test/browser/debugANSIHandling.test.ts | 32 +- .../browser/debugConfigurationManager.test.ts | 36 +- .../debug/test/browser/debugHover.test.ts | 16 +- .../debug/test/browser/debugMemory.test.ts | 14 +- .../debug/test/browser/debugSession.test.ts | 4 +- .../debug/test/browser/debugSource.test.ts | 12 +- .../debug/test/browser/debugUtils.test.ts | 6 +- .../debug/test/browser/debugViewModel.test.ts | 16 +- .../debug/test/browser/linkDetector.test.ts | 18 +- .../debug/test/browser/mockDebugModel.ts | 14 +- .../test/browser/rawDebugSession.test.ts | 18 +- .../contrib/debug/test/browser/repl.test.ts | 24 +- .../debug/test/browser/variablesView.test.ts | 30 +- .../contrib/debug/test/browser/watch.test.ts | 6 +- .../test/browser/watchExpressionView.test.ts | 28 +- .../test/common/abstractDebugAdapter.test.ts | 6 +- .../debug/test/common/debugModel.test.ts | 16 +- .../contrib/debug/test/common/mockDebug.ts | 30 +- .../contrib/debug/test/node/debugger.test.ts | 20 +- .../test/node/streamDebugAdapter.test.ts | 10 +- .../contrib/debug/test/node/terminals.test.ts | 4 +- ...eprecatedExtensionMigrator.contribution.ts | 26 +- .../browser/editSessions.contribution.ts | 132 +++--- .../browser/editSessionsFileSystemProvider.ts | 12 +- .../browser/editSessionsStorageService.ts | 44 +- .../editSessions/browser/editSessionsViews.ts | 40 +- .../editSessions/common/editSessions.ts | 24 +- .../common/editSessionsLogService.ts | 10 +- .../common/editSessionsStorageClient.ts | 2 +- .../editSessions/common/workspaceStateSync.ts | 32 +- .../test/browser/editSessions.test.ts | 90 ++-- .../browser/actions/expandAbbreviation.ts | 16 +- .../emmet/browser/emmet.contribution.ts | 2 +- .../contrib/emmet/browser/emmetActions.ts | 10 +- .../emmet/test/browser/emmetAction.test.ts | 10 +- .../encryption.contribution.ts | 18 +- .../abstractRuntimeExtensionsEditor.ts | 84 ++-- .../browser/browserRuntimeExtensionsEditor.ts | 10 +- .../browser/configBasedRecommendations.ts | 12 +- .../browser/deprecatedExtensionsChecker.ts | 24 +- .../browser/exeBasedRecommendations.ts | 8 +- .../extensions/browser/extensionEditor.ts | 126 +++--- ...mentWorkspaceTrustTransitionParticipant.ts | 16 +- .../browser/extensionFeaturesTab.ts | 68 +-- ...ensionRecommendationNotificationService.ts | 50 +-- .../browser/extensionRecommendations.ts | 6 +- .../extensionRecommendationsService.ts | 52 +-- .../browser/extensions.contribution.ts | 152 +++---- .../browser/extensions.web.contribution.ts | 14 +- .../extensions/browser/extensionsActions.ts | 140 +++--- .../browser/extensionsActivationProgress.ts | 16 +- .../extensionsCompletionItemsProvider.ts | 22 +- .../browser/extensionsDependencyChecker.ts | 26 +- .../extensions/browser/extensionsIcons.ts | 6 +- .../extensions/browser/extensionsList.ts | 46 +- .../browser/extensionsQuickAccess.ts | 22 +- .../extensions/browser/extensionsViewer.ts | 48 +- .../extensions/browser/extensionsViewlet.ts | 122 ++--- .../extensions/browser/extensionsViews.ts | 112 ++--- .../extensions/browser/extensionsWidgets.ts | 80 ++-- .../browser/extensionsWorkbenchService.ts | 104 ++--- .../browser/fileBasedRecommendations.ts | 50 +-- .../browser/keymapRecommendations.ts | 6 +- .../browser/languageRecommendations.ts | 6 +- .../browser/remoteRecommendations.ts | 8 +- ...upportedExtensionsMigrationContribution.ts | 12 +- .../extensions/browser/webRecommendations.ts | 10 +- .../browser/workspaceRecommendations.ts | 28 +- .../extensions/common/extensionQuery.ts | 2 +- .../contrib/extensions/common/extensions.ts | 32 +- .../common/extensionsFileTemplate.ts | 6 +- .../extensions/common/extensionsInput.ts | 24 +- .../extensions/common/extensionsUtils.ts | 24 +- .../common/reportExtensionIssueAction.ts | 8 +- .../common/runtimeExtensionsInput.ts | 14 +- .../debugExtensionHostAction.ts | 30 +- .../extensionProfileService.ts | 40 +- .../extensions.contribution.ts | 52 +-- .../electron-sandbox/extensionsActions.ts | 20 +- .../extensionsAutoProfiler.ts | 58 +-- .../electron-sandbox/extensionsSlowActions.ts | 36 +- .../electron-sandbox/remoteExtensionsInit.ts | 42 +- .../runtimeExtensionsEditor.ts | 58 +-- .../test/common/extensionQuery.test.ts | 2 +- .../test/electron-sandbox/extension.test.ts | 20 +- .../extensionRecommendationsService.test.ts | 118 ++--- .../extensionsActions.test.ts | 112 ++--- .../electron-sandbox/extensionsViews.test.ts | 92 ++-- .../extensionsWorkbenchService.test.ts | 100 ++--- .../browser/externalTerminal.contribution.ts | 48 +- .../externalTerminal.contribution.ts | 32 +- .../externalUriOpener/common/configuration.ts | 10 +- .../common/contributedOpeners.ts | 10 +- .../common/externalUriOpener.contribution.ts | 10 +- .../common/externalUriOpenerService.ts | 34 +- .../common/externalUriOpenerService.test.ts | 22 +- .../files/browser/editors/binaryFileEditor.ts | 26 +- .../browser/editors/fileEditorHandler.ts | 24 +- .../files/browser/editors/fileEditorInput.ts | 46 +- .../files/browser/editors/textFileEditor.ts | 68 +-- .../browser/editors/textFileEditorTracker.ts | 32 +- .../editors/textFileSaveErrorHandler.ts | 56 +-- .../files/browser/explorerFileContrib.ts | 10 +- .../contrib/files/browser/explorerService.ts | 48 +- .../contrib/files/browser/explorerViewlet.ts | 70 +-- .../files/browser/fileActions.contribution.ts | 48 +- .../contrib/files/browser/fileActions.ts | 114 ++--- .../contrib/files/browser/fileCommands.ts | 98 ++-- .../contrib/files/browser/fileConstants.ts | 4 +- .../contrib/files/browser/fileImportExport.ts | 66 +-- .../files/browser/files.contribution.ts | 64 +-- .../workbench/contrib/files/browser/files.ts | 30 +- .../contrib/files/browser/views/emptyView.ts | 40 +- .../views/explorerDecorationsProvider.ts | 22 +- .../files/browser/views/explorerView.ts | 106 ++--- .../files/browser/views/explorerViewer.ts | 124 +++--- .../files/browser/views/openEditorsView.ts | 106 ++--- .../contrib/files/browser/workspaceWatcher.ts | 26 +- .../files/common/dirtyFilesIndicator.ts | 16 +- .../contrib/files/common/explorerModel.ts | 38 +- .../workbench/contrib/files/common/files.ts | 38 +- .../fileActions.contribution.ts | 40 +- .../files/electron-sandbox/fileCommands.ts | 10 +- .../files/test/browser/editorAutoSave.test.ts | 40 +- .../browser/explorerFileNestingTrie.test.ts | 4 +- .../files/test/browser/explorerModel.test.ts | 18 +- .../files/test/browser/explorerView.test.ts | 24 +- .../files/test/browser/fileActions.test.ts | 4 +- .../test/browser/fileEditorInput.test.ts | 36 +- .../test/browser/fileOnDiskProvider.test.ts | 14 +- .../browser/textFileEditorTracker.test.ts | 50 +-- .../folding/browser/folding.contribution.ts | 26 +- .../format/browser/format.contribution.ts | 6 +- .../format/browser/formatActionsMultiple.ts | 62 +-- .../format/browser/formatActionsNone.ts | 28 +- .../contrib/format/browser/formatModified.ts | 32 +- .../browser/inlayHintsAccessibilty.ts | 34 +- .../browser/inlineChat.contribution.ts | 44 +- .../browser/inlineChatAccessibilityHelp.ts | 16 +- .../browser/inlineChatAccessibleView.ts | 20 +- .../inlineChat/browser/inlineChatActions.ts | 48 +- .../browser/inlineChatContentWidget.ts | 48 +- .../browser/inlineChatController.ts | 94 ++-- .../browser/inlineChatCurrentLine.ts | 32 +- .../inlineChat/browser/inlineChatNotebook.ts | 24 +- .../browser/inlineChatSavingService.ts | 4 +- .../browser/inlineChatSavingServiceImpl.ts | 54 +-- .../inlineChat/browser/inlineChatSession.ts | 44 +- .../browser/inlineChatSessionService.ts | 20 +- .../browser/inlineChatSessionServiceImpl.ts | 56 +-- .../browser/inlineChatStrategies.ts | 86 ++-- .../inlineChat/browser/inlineChatWidget.ts | 100 ++--- .../browser/inlineChatZoneWidget.ts | 44 +- .../contrib/inlineChat/browser/utils.ts | 16 +- .../contrib/inlineChat/common/inlineChat.ts | 12 +- .../inlineChat.contribution.ts | 4 +- .../electron-sandbox/inlineChatActions.ts | 36 +- .../test/browser/inlineChatController.test.ts | 122 ++--- .../test/browser/inlineChatSession.test.ts | 118 ++--- .../test/browser/inlineChatStrategies.test.ts | 8 +- .../test/browser/testWorkerService.ts | 24 +- .../browser/interactive.contribution.ts | 116 ++--- .../interactive/browser/interactiveCommon.ts | 2 +- .../browser/interactiveDocumentService.ts | 8 +- .../interactive/browser/interactiveEditor.ts | 122 ++--- .../browser/interactiveEditorInput.ts | 34 +- .../browser/interactiveHistoryService.ts | 10 +- .../browser/replInputHintContentWidget.ts | 28 +- .../issue/browser/baseIssueReporterService.ts | 44 +- .../issue/browser/issue.contribution.ts | 28 +- .../contrib/issue/browser/issueFormService.ts | 36 +- .../contrib/issue/browser/issueQuickAccess.ts | 26 +- .../issue/browser/issueReporterModel.ts | 8 +- .../issue/browser/issueReporterPage.ts | 4 +- .../issue/browser/issueReporterService.ts | 10 +- .../contrib/issue/browser/issueService.ts | 40 +- .../issue/browser/issueTroubleshoot.ts | 52 +-- .../browser/test/testReporterModel.test.ts | 8 +- .../issue/common/issue.contribution.ts | 20 +- .../workbench/contrib/issue/common/issue.ts | 8 +- .../contrib/issue/common/issueReporterUtil.ts | 2 +- .../electron-sandbox/issue.contribution.ts | 40 +- .../electron-sandbox/issueMainService.ts | 4 +- .../electron-sandbox/issueReporterMain.ts | 34 +- .../electron-sandbox/issueReporterService.ts | 44 +- .../electron-sandbox/issueReporterService2.ts | 26 +- .../issue/electron-sandbox/issueService.ts | 38 +- .../nativeIssueFormService.ts | 28 +- .../electron-sandbox/process.contribution.ts | 26 +- .../issue/electron-sandbox/processService.ts | 20 +- .../test/browser/testReporterModel.test.ts | 8 +- .../browser/keybindings.contribution.ts | 14 +- .../browser/languageDetection.contribution.ts | 44 +- .../browser/languageStatus.contribution.ts | 62 +-- .../browser/limitIndicator.contribution.ts | 26 +- .../contrib/list/browser/list.contribution.ts | 8 +- .../list/browser/listResizeColumnAction.ts | 12 +- .../browser/tableColumnResizeQuickPick.ts | 10 +- .../browser/localHistory.contribution.ts | 6 +- .../localHistory/browser/localHistory.ts | 10 +- .../browser/localHistoryCommands.ts | 64 +-- .../browser/localHistoryFileSystemProvider.ts | 12 +- .../browser/localHistoryTimeline.ts | 42 +- .../localHistory.contribution.ts | 2 +- .../electron-sandbox/localHistoryCommands.ts | 22 +- .../browser/localization.contribution.ts | 8 +- .../common/localization.contribution.ts | 20 +- .../common/localizationsActions.ts | 18 +- .../localization.contribution.ts | 36 +- .../electron-sandbox/minimalTranslations.ts | 2 +- .../contrib/logs/browser/logs.contribution.ts | 18 +- .../contrib/logs/common/defaultLogLevels.ts | 22 +- .../contrib/logs/common/logs.contribution.ts | 46 +- .../contrib/logs/common/logsActions.ts | 30 +- .../contrib/logs/common/logsDataCleaner.ts | 12 +- .../electron-sandbox/logs.contribution.ts | 10 +- .../logs/electron-sandbox/logsActions.ts | 14 +- .../common/mappedEdits.contribution.ts | 14 +- .../browser/markdownDocumentRenderer.ts | 20 +- .../browser/markdownSettingRenderer.ts | 24 +- .../browser/markdownSettingRenderer.test.ts | 18 +- .../markers/browser/markers.contribution.ts | 66 +-- .../contrib/markers/browser/markers.ts | 8 +- .../markers/browser/markersFileDecorations.ts | 24 +- .../markers/browser/markersFilterOptions.ts | 14 +- .../contrib/markers/browser/markersModel.ts | 22 +- .../contrib/markers/browser/markersTable.ts | 56 +-- .../markers/browser/markersTreeViewer.ts | 98 ++-- .../contrib/markers/browser/markersView.ts | 106 ++--- .../markers/browser/markersViewActions.ts | 26 +- .../contrib/markers/browser/messages.ts | 10 +- .../contrib/markers/common/markers.ts | 2 +- .../markers/test/browser/markersModel.test.ts | 10 +- .../mergeEditor/browser/commands/commands.ts | 38 +- .../browser/commands/devCommands.ts | 34 +- .../browser/mergeEditor.contribution.ts | 28 +- .../mergeEditor/browser/mergeEditorInput.ts | 40 +- .../browser/mergeEditorInputModel.ts | 48 +- .../browser/mergeEditorSerializer.ts | 12 +- .../mergeMarkers/mergeMarkersController.ts | 16 +- .../mergeEditor/browser/model/diffComputer.ts | 20 +- .../mergeEditor/browser/model/editing.ts | 8 +- .../mergeEditor/browser/model/lineRange.ts | 10 +- .../mergeEditor/browser/model/mapping.ts | 22 +- .../browser/model/mergeEditorModel.ts | 34 +- .../browser/model/modifiedBaseRange.ts | 22 +- .../mergeEditor/browser/model/rangeUtils.ts | 6 +- .../browser/model/textModelDiffs.ts | 22 +- .../contrib/mergeEditor/browser/telemetry.ts | 4 +- .../contrib/mergeEditor/browser/utils.ts | 14 +- .../mergeEditor/browser/view/colors.ts | 4 +- .../browser/view/conflictActions.ts | 22 +- .../mergeEditor/browser/view/editorGutter.ts | 10 +- .../view/editors/baseCodeEditorView.ts | 28 +- .../browser/view/editors/codeEditorView.ts | 40 +- .../view/editors/inputCodeEditorView.ts | 48 +- .../view/editors/resultCodeEditorView.ts | 42 +- .../browser/view/fixedZoneWidget.ts | 8 +- .../mergeEditor/browser/view/lineAlignment.ts | 18 +- .../mergeEditor/browser/view/mergeEditor.ts | 100 ++--- .../browser/view/scrollSynchronizer.ts | 22 +- .../mergeEditor/browser/view/viewModel.ts | 34 +- .../mergeEditor/browser/view/viewZones.ts | 24 +- .../contrib/mergeEditor/common/mergeEditor.ts | 4 +- .../electron-sandbox/devCommands.ts | 36 +- .../mergeEditor.contribution.ts | 4 +- .../mergeEditor/test/browser/mapping.test.ts | 10 +- .../mergeEditor/test/browser/model.test.ts | 26 +- .../multiDiffEditor/browser/actions.ts | 30 +- .../browser/icons.contribution.ts | 6 +- .../browser/multiDiffEditor.contribution.ts | 28 +- .../browser/multiDiffEditor.ts | 50 +-- .../browser/multiDiffEditorInput.ts | 58 +-- .../browser/multiDiffSourceResolverService.ts | 12 +- .../browser/scmMultiDiffSourceResolver.ts | 24 +- .../contrib/cellCommands/cellCommands.ts | 38 +- .../cellDiagnosticEditorContrib.ts | 26 +- .../cellDiagnostics/cellDiagnostics.ts | 6 +- .../cellDiagnostics/cellDiagnosticsActions.ts | 24 +- .../diagnosticCellStatusBarContrib.ts | 24 +- .../contributedStatusBarItemController.ts | 16 +- .../executionStatusBarItemController.ts | 32 +- .../notebookVisibleCellObserver.ts | 12 +- .../cellStatusBar/statusBarProviders.ts | 36 +- .../contrib/clipboard/cellOutputClipboard.ts | 8 +- .../contrib/clipboard/notebookClipboard.ts | 52 +-- .../contrib/debug/notebookBreakpoints.ts | 26 +- .../contrib/debug/notebookCellPausing.ts | 22 +- .../contrib/debug/notebookDebugDecorations.ts | 24 +- .../contrib/editorHint/emptyCellEditorHint.ts | 32 +- .../editorStatusBar/editorStatusBar.ts | 38 +- .../execute/executionEditorProgress.ts | 14 +- .../browser/contrib/find/findFilters.ts | 6 +- .../contrib/find/findMatchDecorationModel.ts | 14 +- .../browser/contrib/find/findModel.ts | 30 +- .../browser/contrib/find/notebookFind.ts | 46 +- .../contrib/find/notebookFindReplaceWidget.ts | 86 ++-- .../contrib/find/notebookFindWidget.ts | 48 +- .../browser/contrib/format/formatting.ts | 60 +-- .../gettingStarted/notebookGettingStarted.ts | 34 +- .../notebookKernelDetection.ts | 14 +- .../browser/contrib/layout/layoutActions.ts | 12 +- .../browser/contrib/marker/markerProvider.ts | 24 +- .../multicursor/notebookMulticursor.ts | 78 ++-- .../browser/contrib/navigation/arrow.ts | 40 +- .../notebookVariableCommands.ts | 18 +- .../notebookVariableContextKeys.ts | 2 +- .../notebookVariables/notebookVariables.ts | 38 +- .../notebookVariablesDataSource.ts | 10 +- .../notebookVariablesTree.ts | 22 +- .../notebookVariablesView.ts | 62 +-- .../contrib/outline/notebookOutline.ts | 102 ++--- .../contrib/profile/notebookProfile.ts | 10 +- .../saveParticipants/saveParticipants.ts | 72 +-- .../browser/contrib/troubleshoot/layout.ts | 22 +- .../contrib/undoRedo/notebookUndoRedo.ts | 14 +- .../contrib/viewportWarmup/viewportWarmup.ts | 18 +- .../notebook/browser/controller/apiActions.ts | 12 +- .../browser/controller/cellOperations.ts | 30 +- .../browser/controller/cellOutputActions.ts | 30 +- .../controller/chat/cellChatActions.ts | 40 +- .../chat/notebook.chat.contribution.ts | 12 +- .../controller/chat/notebookChatContext.ts | 6 +- .../controller/chat/notebookChatController.ts | 78 ++-- .../browser/controller/coreActions.ts | 38 +- .../browser/controller/editActions.ts | 74 ++-- .../browser/controller/executeActions.ts | 54 +-- .../browser/controller/foldingController.ts | 36 +- .../browser/controller/insertCellActions.ts | 30 +- .../browser/controller/layoutActions.ts | 38 +- .../controller/notebookIndentationActions.ts | 30 +- .../browser/controller/sectionActions.ts | 22 +- .../browser/diff/diffCellEditorOptions.ts | 4 +- .../notebook/browser/diff/diffComponents.ts | 88 ++-- .../browser/diff/diffElementOutputs.ts | 30 +- .../browser/diff/diffElementViewModel.ts | 36 +- .../browser/diff/diffNestedCellViewModel.ts | 20 +- .../notebook/browser/diff/eventDispatcher.ts | 8 +- .../browser/diff/notebookDiffActions.ts | 50 +-- .../browser/diff/notebookDiffEditor.ts | 86 ++-- .../browser/diff/notebookDiffEditorBrowser.ts | 30 +- .../notebook/browser/diff/notebookDiffList.ts | 56 +-- .../browser/diff/notebookDiffOverviewRuler.ts | 20 +- .../browser/diff/notebookDiffViewModel.ts | 36 +- .../browser/diff/notebookMultiDiffEditor.ts | 72 +-- .../diff/notebookMultiDiffEditorInput.ts | 20 +- .../notebook/browser/notebook.contribution.ts | 230 +++++----- .../browser/notebookAccessibilityHelp.ts | 20 +- .../browser/notebookAccessibilityProvider.ts | 24 +- .../browser/notebookAccessibleView.ts | 16 +- .../notebook/browser/notebookBrowser.ts | 58 +-- .../notebook/browser/notebookEditor.ts | 92 ++-- .../browser/notebookEditorExtensions.ts | 4 +- .../notebook/browser/notebookEditorWidget.ts | 200 ++++----- .../browser/notebookExtensionPoint.ts | 18 +- .../contrib/notebook/browser/notebookIcons.ts | 6 +- .../notebook/browser/notebookOptions.ts | 26 +- .../notebook/browser/notebookViewEvents.ts | 6 +- .../notebookCellStatusBarServiceImpl.ts | 14 +- .../browser/services/notebookEditorService.ts | 16 +- .../services/notebookEditorServiceImpl.ts | 36 +- .../services/notebookExecutionServiceImpl.ts | 26 +- .../notebookExecutionStateServiceImpl.ts | 30 +- .../notebookKernelHistoryServiceImpl.ts | 18 +- .../services/notebookKernelServiceImpl.ts | 28 +- .../services/notebookKeymapServiceImpl.ts | 30 +- .../services/notebookLoggingServiceImpl.ts | 8 +- .../notebookRendererMessagingServiceImpl.ts | 8 +- .../browser/services/notebookServiceImpl.ts | 84 ++-- .../services/notebookWorkerServiceImpl.ts | 18 +- .../contrib/notebook/browser/view/cellPart.ts | 12 +- .../browser/view/cellParts/cellActionView.ts | 32 +- .../browser/view/cellParts/cellComments.ts | 26 +- .../browser/view/cellParts/cellContextKeys.ts | 26 +- .../browser/view/cellParts/cellDecorations.ts | 6 +- .../browser/view/cellParts/cellDnd.ts | 22 +- .../view/cellParts/cellDragRenderer.ts | 24 +- .../view/cellParts/cellEditorOptions.ts | 38 +- .../browser/view/cellParts/cellExecution.ts | 20 +- .../browser/view/cellParts/cellFocus.ts | 8 +- .../view/cellParts/cellFocusIndicator.ts | 16 +- .../browser/view/cellParts/cellOutput.ts | 66 +-- .../browser/view/cellParts/cellProgressBar.ts | 14 +- .../browser/view/cellParts/cellStatusPart.ts | 58 +-- .../view/cellParts/cellToolbarStickyScroll.ts | 6 +- .../browser/view/cellParts/cellToolbars.ts | 42 +- .../view/cellParts/chat/cellChatPart.ts | 4 +- .../browser/view/cellParts/codeCell.ts | 60 +-- .../view/cellParts/codeCellExecutionIcon.ts | 18 +- .../view/cellParts/codeCellRunToolbar.ts | 38 +- .../view/cellParts/collapsedCellInput.ts | 6 +- .../view/cellParts/collapsedCellOutput.ts | 14 +- .../browser/view/cellParts/foldedCellHint.ts | 26 +- .../browser/view/cellParts/markupCell.ts | 54 +-- .../browser/view/notebookCellAnchor.ts | 20 +- .../browser/view/notebookCellEditorPool.ts | 24 +- .../notebook/browser/view/notebookCellList.ts | 64 +-- .../browser/view/notebookCellListView.ts | 8 +- .../browser/view/notebookRenderingCommon.ts | 34 +- .../view/renderers/backLayerWebView.ts | 108 ++--- .../browser/view/renderers/cellRenderer.ts | 96 ++-- .../browser/view/renderers/webviewMessages.ts | 6 +- .../browser/view/renderers/webviewPreloads.ts | 8 +- .../view/renderers/webviewThemeMapping.ts | 2 +- .../browser/viewModel/OutlineEntry.ts | 16 +- .../browser/viewModel/baseCellViewModel.ts | 46 +- .../notebook/browser/viewModel/cellEdit.ts | 18 +- .../browser/viewModel/cellEditorOptions.ts | 14 +- .../browser/viewModel/cellOutputViewModel.ts | 14 +- .../viewModel/cellSelectionCollection.ts | 6 +- .../browser/viewModel/codeCellViewModel.ts | 42 +- .../browser/viewModel/eventDispatcher.ts | 6 +- .../browser/viewModel/foldingModel.ts | 22 +- .../browser/viewModel/markupCellViewModel.ts | 28 +- .../viewModel/notebookOutlineDataSource.ts | 28 +- .../notebookOutlineDataSourceFactory.ts | 8 +- .../viewModel/notebookOutlineEntryFactory.ts | 22 +- .../viewModel/notebookViewModelImpl.ts | 62 +-- .../notebook/browser/viewModel/viewContext.ts | 6 +- .../viewParts/notebookEditorStickyScroll.ts | 42 +- .../viewParts/notebookEditorToolbar.ts | 54 +-- .../notebookEditorWidgetContextKeys.ts | 16 +- .../viewParts/notebookHorizontalTracker.ts | 12 +- .../notebookKernelQuickPickStrategy.ts | 66 +-- .../browser/viewParts/notebookKernelView.ts | 34 +- .../viewParts/notebookOverviewRuler.ts | 10 +- .../viewParts/notebookTopCellToolbar.ts | 20 +- .../browser/viewParts/notebookViewZones.ts | 14 +- .../contrib/notebook/common/model/cellEdit.ts | 8 +- .../model/notebookCellOutputTextModel.ts | 8 +- .../common/model/notebookCellTextModel.ts | 32 +- .../common/model/notebookTextModel.ts | 42 +- .../common/notebookCellStatusBarService.ts | 12 +- .../contrib/notebook/common/notebookCommon.ts | 66 +-- .../notebook/common/notebookContextKeys.ts | 4 +- .../common/notebookDiffEditorInput.ts | 18 +- .../notebook/common/notebookEditorInput.ts | 56 +-- .../notebook/common/notebookEditorModel.ts | 50 +-- .../notebookEditorModelResolverService.ts | 12 +- .../notebookEditorModelResolverServiceImpl.ts | 40 +- .../common/notebookExecutionService.ts | 12 +- .../common/notebookExecutionStateService.ts | 14 +- .../notebook/common/notebookKernelService.ts | 20 +- .../notebook/common/notebookKeymapService.ts | 2 +- .../notebook/common/notebookLoggingService.ts | 2 +- .../notebook/common/notebookOutputRenderer.ts | 12 +- .../notebook/common/notebookProvider.ts | 12 +- .../notebookRendererMessagingService.ts | 6 +- .../notebook/common/notebookService.ts | 30 +- .../services/notebookSimpleWorker.esm.ts | 4 +- .../common/services/notebookSimpleWorker.ts | 22 +- .../common/services/notebookWorkerService.ts | 6 +- .../NotebookEditorWidgetService.test.ts | 32 +- .../test/browser/cellDecorations.test.ts | 8 +- .../notebook/test/browser/cellDnd.test.ts | 10 +- .../test/browser/cellOperations.test.ts | 20 +- .../notebook/test/browser/cellOutput.test.ts | 28 +- ...contributedStatusBarItemController.test.ts | 18 +- .../contrib/executionStatusBarItem.test.ts | 4 +- .../test/browser/contrib/find.test.ts | 28 +- .../browser/contrib/layoutActions.test.ts | 4 +- .../contrib/notebookCellDiagnostics.test.ts | 36 +- .../browser/contrib/notebookClipboard.test.ts | 22 +- .../browser/contrib/notebookOutline.test.ts | 34 +- .../notebookOutlineViewProviders.test.ts | 32 +- .../browser/contrib/notebookSymbols.test.ts | 18 +- .../browser/contrib/notebookUndoRedo.test.ts | 6 +- .../browser/contrib/outputCopyTests.test.ts | 16 +- .../test/browser/notebookBrowser.test.ts | 8 +- .../test/browser/notebookCellAnchor.test.ts | 20 +- .../test/browser/notebookCellList.test.ts | 14 +- .../test/browser/notebookCommon.test.ts | 18 +- .../test/browser/notebookDiff.test.ts | 32 +- .../test/browser/notebookEditor.test.ts | 18 +- .../test/browser/notebookEditorModel.test.ts | 38 +- .../browser/notebookExecutionService.test.ts | 48 +- .../notebookExecutionStateService.test.ts | 48 +- .../test/browser/notebookFolding.test.ts | 14 +- .../browser/notebookKernelHistory.test.ts | 38 +- .../browser/notebookKernelService.test.ts | 34 +- .../notebookRendererMessagingService.test.ts | 8 +- .../test/browser/notebookSelection.test.ts | 18 +- .../test/browser/notebookServiceImpl.test.ts | 34 +- .../test/browser/notebookStickyScroll.test.ts | 34 +- .../test/browser/notebookTextModel.test.ts | 20 +- .../notebookVariablesDataSource.test.ts | 16 +- .../test/browser/notebookViewModel.test.ts | 56 +-- .../test/browser/notebookViewZones.test.ts | 18 +- .../browser/notebookWorkbenchToolbar.test.ts | 6 +- .../test/browser/testNotebookEditor.ts | 128 +++--- .../outline/browser/outline.contribution.ts | 24 +- .../contrib/outline/browser/outline.ts | 4 +- .../contrib/outline/browser/outlineActions.ts | 14 +- .../contrib/outline/browser/outlinePane.ts | 68 +-- .../outline/browser/outlineViewState.ts | 6 +- .../output/browser/output.contribution.ts | 58 +-- .../output/browser/outputLinkProvider.ts | 24 +- .../contrib/output/browser/outputServices.ts | 42 +- .../contrib/output/browser/outputView.ts | 66 +-- .../output/common/outputChannelModel.ts | 40 +- .../common/outputChannelModelService.ts | 18 +- .../output/common/outputLinkComputer.esm.ts | 4 +- .../output/common/outputLinkComputer.ts | 20 +- .../test/browser/outputLinkProvider.test.ts | 10 +- .../browser/inputLatencyContrib.ts | 14 +- .../browser/performance.contribution.ts | 26 +- .../browser/performance.web.contribution.ts | 8 +- .../performance/browser/perfviewEditor.ts | 56 +-- .../performance/browser/startupTimings.ts | 32 +- .../performance.contribution.ts | 18 +- .../electron-sandbox/rendererAutoProfiler.ts | 26 +- .../electron-sandbox/startupProfiler.ts | 32 +- .../electron-sandbox/startupTimings.ts | 36 +- .../preferences/browser/keybindingWidgets.ts | 46 +- .../preferences/browser/keybindingsEditor.ts | 120 ++--- .../browser/keybindingsEditorContribution.ts | 46 +- .../browser/keyboardLayoutPicker.ts | 32 +- .../browser/preferences.contribution.ts | 88 ++-- .../preferences/browser/preferencesActions.ts | 30 +- .../preferences/browser/preferencesEditor.ts | 16 +- .../preferences/browser/preferencesIcons.ts | 6 +- .../browser/preferencesRenderers.ts | 84 ++-- .../preferences/browser/preferencesSearch.ts | 36 +- .../preferences/browser/preferencesWidgets.ts | 68 +-- .../preferences/browser/settingsEditor2.ts | 130 +++--- .../settingsEditorSettingIndicators.ts | 40 +- .../preferences/browser/settingsLayout.ts | 4 +- .../preferences/browser/settingsSearchMenu.ts | 18 +- .../preferences/browser/settingsTree.ts | 138 +++--- .../preferences/browser/settingsTreeModels.ts | 38 +- .../preferences/browser/settingsWidgets.ts | 58 +-- .../contrib/preferences/browser/tocTree.ts | 40 +- .../contrib/preferences/common/preferences.ts | 16 +- .../common/preferencesContribution.ts | 36 +- .../common/settingsEditorColorRegistry.ts | 8 +- .../common/settingsFilesystemProvider.ts | 22 +- .../common/smartSnippetInserter.ts | 8 +- .../keybindingsEditorContribution.test.ts | 4 +- .../test/browser/settingsTreeModels.test.ts | 4 +- .../test/common/smartSnippetInserter.test.ts | 8 +- .../browser/commandsQuickAccess.ts | 72 +-- .../browser/quickAccess.contribution.ts | 24 +- .../quickaccess/browser/viewQuickAccess.ts | 38 +- .../browser/relauncher.contribution.ts | 34 +- .../remote/browser/explorerViewItems.ts | 26 +- .../remote/browser/remote.contribution.ts | 18 +- .../contrib/remote/browser/remote.ts | 104 ++--- .../remote/browser/remoteConnectionHealth.ts | 30 +- .../contrib/remote/browser/remoteExplorer.ts | 70 +-- .../contrib/remote/browser/remoteIcons.ts | 6 +- .../contrib/remote/browser/remoteIndicator.ts | 100 ++--- .../browser/remoteStartEntry.contribution.ts | 8 +- .../remote/browser/remoteStartEntry.ts | 24 +- .../contrib/remote/browser/showCandidate.ts | 10 +- .../contrib/remote/browser/tunnelFactory.ts | 22 +- .../contrib/remote/browser/tunnelView.ts | 110 ++--- .../contrib/remote/browser/urlFinder.ts | 10 +- .../remote/common/remote.contribution.ts | 48 +- .../electron-sandbox/remote.contribution.ts | 54 +-- .../remoteTunnel.contribution.ts | 64 +-- .../replNotebook/browser/repl.contribution.ts | 86 ++-- .../replNotebook/browser/replEditor.ts | 120 ++--- .../replNotebook/browser/replEditorInput.ts | 38 +- .../contrib/sash/browser/sash.contribution.ts | 16 +- src/vs/workbench/contrib/sash/browser/sash.ts | 14 +- .../workbench/contrib/scm/browser/activity.ts | 44 +- .../contrib/scm/browser/dirtyDiffSwitcher.ts | 18 +- .../contrib/scm/browser/dirtydiffDecorator.ts | 110 ++--- src/vs/workbench/contrib/scm/browser/menus.ts | 26 +- .../contrib/scm/browser/scm.contribution.ts | 70 +-- .../contrib/scm/browser/scmHistory.ts | 20 +- .../contrib/scm/browser/scmHistoryViewPane.ts | 106 ++--- .../scm/browser/scmRepositoriesViewPane.ts | 48 +- .../scm/browser/scmRepositoryRenderer.ts | 48 +- .../contrib/scm/browser/scmViewPane.ts | 226 +++++----- .../scm/browser/scmViewPaneContainer.ts | 28 +- .../contrib/scm/browser/scmViewService.ts | 30 +- src/vs/workbench/contrib/scm/browser/util.ts | 34 +- .../contrib/scm/browser/workingSet.ts | 20 +- .../workbench/contrib/scm/common/history.ts | 12 +- .../workbench/contrib/scm/common/quickDiff.ts | 10 +- .../contrib/scm/common/quickDiffService.ts | 14 +- src/vs/workbench/contrib/scm/common/scm.ts | 26 +- .../contrib/scm/common/scmService.ts | 28 +- .../scm/test/browser/scmHistory.test.ts | 8 +- .../browser/scrollLocking.contribution.ts | 4 +- .../scrollLocking/browser/scrollLocking.ts | 24 +- .../search/browser/anythingQuickAccess.ts | 108 ++--- .../notebookSearchContributions.ts | 6 +- .../notebookSearch/notebookSearchService.ts | 42 +- .../notebookSearch/searchNotebookHelpers.ts | 12 +- .../search/browser/patternInputWidget.ts | 34 +- .../quickTextSearch/textSearchQuickAccess.ts | 62 +-- .../contrib/search/browser/replace.ts | 6 +- .../search/browser/replaceContributions.ts | 8 +- .../contrib/search/browser/replaceService.ts | 52 +-- .../search/browser/search.contribution.ts | 74 ++-- .../search/browser/searchActionsBase.ts | 16 +- .../search/browser/searchActionsCopy.ts | 24 +- .../search/browser/searchActionsFind.ts | 64 +-- .../search/browser/searchActionsNav.ts | 44 +- .../browser/searchActionsRemoveReplace.ts | 40 +- .../search/browser/searchActionsSymbol.ts | 14 +- .../browser/searchActionsTextQuickAccess.ts | 24 +- .../search/browser/searchActionsTopBar.ts | 32 +- .../contrib/search/browser/searchFindInput.ts | 28 +- .../contrib/search/browser/searchIcons.ts | 6 +- .../contrib/search/browser/searchMessage.ts | 28 +- .../contrib/search/browser/searchModel.ts | 84 ++-- .../search/browser/searchResultsView.ts | 58 +-- .../contrib/search/browser/searchView.ts | 160 +++---- .../contrib/search/browser/searchWidget.ts | 84 ++-- .../search/browser/symbolsQuickAccess.ts | 42 +- .../contrib/search/common/cacheState.ts | 6 +- .../contrib/search/common/cellSearchModel.ts | 10 +- .../contrib/search/common/constants.ts | 2 +- .../contrib/search/common/notebookSearch.ts | 8 +- .../workbench/contrib/search/common/search.ts | 32 +- .../search/common/searchHistoryService.ts | 8 +- .../search/common/searchNotebookHelpers.ts | 8 +- .../search/test/browser/mockSearchTree.ts | 8 +- .../search/test/browser/searchActions.test.ts | 30 +- .../search/test/browser/searchModel.test.ts | 74 ++-- .../browser/searchNotebookHelpers.test.ts | 28 +- .../search/test/browser/searchResult.test.ts | 64 +-- .../search/test/browser/searchTestCommon.ts | 38 +- .../search/test/browser/searchViewlet.test.ts | 38 +- .../search/test/common/cacheState.test.ts | 10 +- .../search/test/common/extractRange.test.ts | 4 +- .../contrib/searchEditor/browser/constants.ts | 2 +- .../browser/searchEditor.contribution.ts | 68 +-- .../searchEditor/browser/searchEditor.ts | 122 ++--- .../browser/searchEditorActions.ts | 46 +- .../searchEditor/browser/searchEditorInput.ts | 64 +-- .../searchEditor/browser/searchEditorModel.ts | 28 +- .../browser/searchEditorSerialization.ts | 22 +- .../share/browser/share.contribution.ts | 60 +-- .../contrib/share/browser/shareService.ts | 24 +- .../workbench/contrib/share/common/share.ts | 14 +- .../commands/abstractSnippetsActions.ts | 6 +- .../browser/commands/configureSnippets.ts | 38 +- .../browser/commands/fileTemplateSnippets.ts | 24 +- .../browser/commands/insertSnippet.ts | 24 +- .../browser/commands/surroundWithSnippet.ts | 26 +- .../browser/snippetCodeActionProvider.ts | 30 +- .../browser/snippetCompletionProvider.ts | 34 +- .../contrib/snippets/browser/snippetPicker.ts | 18 +- .../snippets/browser/snippets.contribution.ts | 38 +- .../contrib/snippets/browser/snippets.ts | 4 +- .../contrib/snippets/browser/snippetsFile.ts | 28 +- .../snippets/browser/snippetsService.ts | 56 +-- .../contrib/snippets/browser/tabCompletion.ts | 40 +- .../snippets/test/browser/snippetFile.test.ts | 10 +- .../test/browser/snippetsRegistry.test.ts | 6 +- .../test/browser/snippetsRewrite.test.ts | 6 +- .../test/browser/snippetsService.test.ts | 36 +- .../speech/browser/speech.contribution.ts | 6 +- .../browser/speechAccessibilitySignal.ts | 8 +- .../contrib/speech/browser/speechService.ts | 28 +- .../contrib/speech/common/speechService.ts | 16 +- .../speech/test/common/speechService.test.ts | 4 +- .../contrib/splash/browser/partsSplash.ts | 38 +- .../splash/browser/splash.contribution.ts | 10 +- .../contrib/splash/browser/splash.ts | 4 +- .../electron-sandbox/splash.contribution.ts | 12 +- .../browser/languageSurveys.contribution.ts | 36 +- .../surveys/browser/nps.contribution.ts | 24 +- .../tags/browser/workspaceTagsService.ts | 8 +- .../contrib/tags/common/workspaceTags.ts | 8 +- .../electron-sandbox/tags.contribution.ts | 8 +- .../tags/electron-sandbox/workspaceTags.ts | 30 +- .../electron-sandbox/workspaceTagsService.ts | 24 +- .../tags/test/node/workspaceTags.test.ts | 4 +- .../tasks/browser/abstractTaskService.ts | 160 +++---- .../tasks/browser/runAutomaticTasks.ts | 28 +- .../tasks/browser/task.contribution.ts | 74 ++-- .../contrib/tasks/browser/taskQuickPick.ts | 40 +- .../contrib/tasks/browser/taskService.ts | 14 +- .../tasks/browser/taskTerminalStatus.ts | 26 +- .../contrib/tasks/browser/tasksQuickAccess.ts | 32 +- .../tasks/browser/terminalTaskSystem.ts | 94 ++-- .../contrib/tasks/common/jsonSchemaCommon.ts | 6 +- .../contrib/tasks/common/jsonSchema_v1.ts | 10 +- .../contrib/tasks/common/jsonSchema_v2.ts | 18 +- .../contrib/tasks/common/problemCollectors.ts | 24 +- .../contrib/tasks/common/problemMatcher.ts | 42 +- .../contrib/tasks/common/taskConfiguration.ts | 34 +- .../tasks/common/taskDefinitionRegistry.ts | 24 +- .../contrib/tasks/common/taskService.ts | 22 +- .../contrib/tasks/common/taskSystem.ts | 16 +- .../contrib/tasks/common/taskTemplates.ts | 4 +- .../workbench/contrib/tasks/common/tasks.ts | 28 +- .../tasks/electron-sandbox/taskService.ts | 90 ++-- .../test/browser/taskTerminalStatus.test.ts | 26 +- .../tasks/test/common/problemMatcher.test.ts | 4 +- .../test/common/taskConfiguration.test.ts | 34 +- .../browser/telemetry.contribution.ts | 62 +-- .../terminal/browser/baseTerminalBackend.ts | 20 +- .../terminal/browser/detachedTerminal.ts | 32 +- .../browser/environmentVariableInfo.ts | 20 +- .../contrib/terminal/browser/remotePty.ts | 10 +- .../terminal/browser/remoteTerminalBackend.ts | 54 +-- .../terminal/browser/terminal.contribution.ts | 104 ++--- .../contrib/terminal/browser/terminal.ts | 54 +-- .../browser/terminal.web.contribution.ts | 12 +- .../terminal/browser/terminalActions.ts | 124 +++--- .../terminal/browser/terminalCommands.ts | 4 +- .../browser/terminalConfigurationService.ts | 14 +- .../terminal/browser/terminalContextMenu.ts | 20 +- .../browser/terminalContribExports.ts | 4 +- .../terminal/browser/terminalEditor.ts | 50 +-- .../terminal/browser/terminalEditorInput.ts | 40 +- .../browser/terminalEditorSerializer.ts | 10 +- .../terminal/browser/terminalEditorService.ts | 32 +- .../terminal/browser/terminalEvents.ts | 8 +- .../terminal/browser/terminalExtensions.ts | 10 +- .../contrib/terminal/browser/terminalGroup.ts | 26 +- .../terminal/browser/terminalGroupService.ts | 36 +- .../contrib/terminal/browser/terminalIcon.ts | 26 +- .../terminal/browser/terminalIconPicker.ts | 22 +- .../contrib/terminal/browser/terminalIcons.ts | 6 +- .../terminal/browser/terminalInstance.ts | 180 ++++---- .../browser/terminalInstanceService.ts | 26 +- .../browser/terminalMainContribution.ts | 24 +- .../contrib/terminal/browser/terminalMenus.ts | 28 +- .../browser/terminalProcessExtHostProxy.ts | 10 +- .../browser/terminalProcessManager.ts | 78 ++-- .../browser/terminalProfileQuickpick.ts | 30 +- .../browser/terminalProfileResolverService.ts | 40 +- .../browser/terminalProfileService.ts | 40 +- .../terminal/browser/terminalQuickAccess.ts | 30 +- .../browser/terminalResizeDebouncer.ts | 8 +- .../browser/terminalRunRecentQuickPick.ts | 50 +-- .../terminal/browser/terminalService.ts | 108 ++--- .../terminal/browser/terminalStatusList.ts | 22 +- .../terminal/browser/terminalTabbedView.ts | 38 +- .../terminal/browser/terminalTabsList.ts | 100 ++--- .../terminal/browser/terminalTestHelpers.ts | 2 +- .../terminal/browser/terminalTooltip.ts | 12 +- .../contrib/terminal/browser/terminalUri.ts | 6 +- .../contrib/terminal/browser/terminalView.ts | 92 ++-- .../terminalWslRecommendationContribution.ts | 22 +- .../browser/widgets/terminalHoverWidget.ts | 18 +- .../terminal/browser/widgets/widgetManager.ts | 4 +- .../terminal/browser/widgets/widgets.ts | 2 +- .../terminal/browser/xterm/decorationAddon.ts | 44 +- .../browser/xterm/decorationStyles.ts | 22 +- .../browser/xterm/lineDataEventAddon.ts | 6 +- .../browser/xterm/markNavigationAddon.ts | 22 +- .../terminal/browser/xterm/xtermTerminal.ts | 62 +-- .../contrib/terminal/common/basePty.ts | 12 +- .../environmentVariable.contribution.ts | 6 +- .../terminal/common/environmentVariable.ts | 8 +- .../common/environmentVariableService.ts | 20 +- .../contrib/terminal/common/history.ts | 26 +- .../common/remote/remoteTerminalChannel.ts | 42 +- .../terminal/common/remote/terminal.ts | 8 +- .../contrib/terminal/common/terminal.ts | 36 +- .../terminal/common/terminalClipboard.ts | 10 +- .../terminal/common/terminalColorRegistry.ts | 8 +- .../terminal/common/terminalConfiguration.ts | 32 +- .../terminal/common/terminalContextKey.ts | 8 +- .../terminal/common/terminalEnvironment.ts | 22 +- .../terminalExtensionPoints.contribution.ts | 4 +- .../common/terminalExtensionPoints.ts | 10 +- .../terminal/common/terminalStrings.ts | 2 +- .../terminal/electron-sandbox/localPty.ts | 4 +- .../electron-sandbox/localTerminalBackend.ts | 70 +-- .../electron-sandbox/terminal.contribution.ts | 20 +- .../terminalNativeContribution.ts | 22 +- .../terminalProfileResolverService.ts | 20 +- .../electron-sandbox/terminalRemote.ts | 16 +- .../contrib/terminal/terminal.all.ts | 34 +- .../commandDetectionCapability.test.ts | 12 +- .../partialCommandDetectionCapability.test.ts | 8 +- .../terminalCapabilityStore.test.ts | 8 +- .../test/browser/terminalActions.test.ts | 8 +- .../terminalConfigurationService.test.ts | 20 +- .../test/browser/terminalInstance.test.ts | 46 +- .../browser/terminalInstanceService.test.ts | 12 +- .../browser/terminalProcessManager.test.ts | 20 +- .../terminalProfileService.integrationTest.ts | 46 +- .../test/browser/terminalService.test.ts | 22 +- .../test/browser/terminalStatusList.test.ts | 16 +- .../terminal/test/browser/terminalUri.test.ts | 4 +- .../browser/xterm/decorationAddon.test.ts | 16 +- .../browser/xterm/lineDataEventAddon.test.ts | 10 +- .../xterm/shellIntegrationAddon.test.ts | 12 +- .../test/browser/xterm/xtermTerminal.test.ts | 34 +- .../environmentVariableCollection.test.ts | 12 +- .../common/environmentVariableService.test.ts | 22 +- .../common/environmentVariableShared.test.ts | 6 +- .../terminal/test/common/history.test.ts | 32 +- .../test/common/terminalClipboard.test.ts | 16 +- .../test/common/terminalColorRegistry.test.ts | 14 +- .../test/common/terminalDataBuffering.test.ts | 6 +- .../test/common/terminalEnvironment.test.ts | 12 +- .../test/node/terminalProfiles.test.ts | 12 +- .../browser/bufferContentTracker.ts | 8 +- .../terminal.accessibility.contribution.ts | 62 +-- .../browser/terminalAccessibilityHelp.ts | 30 +- .../terminalAccessibleBufferProvider.ts | 24 +- .../browser/textAreaSyncAddon.ts | 14 +- .../terminalAccessibilityConfiguration.ts | 6 +- .../test/browser/bufferContentTracker.test.ts | 54 +-- .../browser/terminal.chat.contribution.ts | 16 +- .../terminal.initialHint.contribution.ts | 58 +-- .../chat/browser/terminalChat.ts | 6 +- .../browser/terminalChatAccessibilityHelp.ts | 18 +- .../browser/terminalChatAccessibleView.ts | 14 +- .../chat/browser/terminalChatActions.ts | 24 +- .../chat/browser/terminalChatController.ts | 42 +- .../chat/browser/terminalChatEnabler.ts | 8 +- .../chat/browser/terminalChatWidget.ts | 26 +- .../terminalInitialHintConfiguration.ts | 6 +- .../test/browser/terminalInitialHint.test.ts | 20 +- .../terminal.commandGuide.contribution.ts | 26 +- .../terminalCommandGuideConfiguration.ts | 6 +- .../terminal.developer.contribution.ts | 52 +-- ...erminal.environmentChanges.contribution.ts | 22 +- .../browser/terminal.find.contribution.ts | 36 +- .../find/browser/terminalFindWidget.ts | 30 +- .../find/browser/textInputContextMenu.ts | 14 +- .../terminalContrib/links/browser/links.ts | 20 +- .../browser/terminal.links.contribution.ts | 46 +- .../browser/terminalExternalLinkDetector.ts | 6 +- .../links/browser/terminalLink.ts | 22 +- .../browser/terminalLinkDetectorAdapter.ts | 14 +- .../links/browser/terminalLinkHelpers.ts | 10 +- .../links/browser/terminalLinkManager.ts | 58 +-- .../links/browser/terminalLinkOpeners.ts | 42 +- .../links/browser/terminalLinkParsing.ts | 4 +- .../browser/terminalLinkProviderService.ts | 8 +- .../links/browser/terminalLinkQuickpick.ts | 32 +- .../links/browser/terminalLinkResolver.ts | 20 +- .../browser/terminalLocalLinkDetector.ts | 20 +- .../browser/terminalMultiLineLinkDetector.ts | 14 +- .../links/browser/terminalUriLinkDetector.ts | 18 +- .../links/browser/terminalWordLinkDetector.ts | 20 +- .../links/test/browser/linkTestUtils.ts | 4 +- .../test/browser/terminalLinkHelpers.test.ts | 4 +- .../test/browser/terminalLinkManager.test.ts | 40 +- .../test/browser/terminalLinkOpeners.test.ts | 48 +- .../test/browser/terminalLinkParsing.test.ts | 6 +- .../browser/terminalLocalLinkDetector.test.ts | 36 +- .../terminalMultiLineLinkDetector.test.ts | 34 +- .../browser/terminalUriLinkDetector.test.ts | 30 +- .../browser/terminalWordLinkDetector.test.ts | 20 +- .../quickFix/browser/quickFix.ts | 16 +- .../quickFix/browser/quickFixAddon.ts | 56 +-- .../browser/terminal.quickFix.contribution.ts | 34 +- .../browser/terminalQuickFixBuiltinActions.ts | 6 +- .../browser/terminalQuickFixService.ts | 16 +- .../test/browser/quickFixAddon.test.ts | 48 +- .../terminal.stickyScroll.contribution.ts | 20 +- .../terminalStickyScrollColorRegistry.ts | 4 +- .../terminalStickyScrollContribution.ts | 28 +- .../browser/terminalStickyScrollOverlay.ts | 46 +- .../terminalStickyScrollConfiguration.ts | 8 +- .../browser/terminal.suggest.contribution.ts | 48 +- .../suggest/browser/terminalSuggestAddon.ts | 50 +-- .../common/terminalSuggestConfiguration.ts | 8 +- .../terminalSuggestAddon.integrationTest.ts | 52 +-- .../terminal.typeAhead.contribution.ts | 18 +- .../browser/terminalTypeAheadAddon.ts | 22 +- .../common/terminalTypeAheadConfiguration.ts | 6 +- .../test/browser/terminalTypeAhead.test.ts | 16 +- .../browser/terminal.zoom.contribution.ts | 32 +- .../zoom/common/terminal.zoom.ts | 8 +- .../browser/codeCoverageDecorations.ts | 94 ++-- .../browser/codeCoverageDisplayUtils.ts | 22 +- .../browser/explorerProjections/index.ts | 22 +- .../explorerProjections/listProjection.ts | 26 +- .../testItemContextOverlay.ts | 8 +- .../explorerProjections/testingObjectTree.ts | 10 +- .../explorerProjections/testingViewState.ts | 2 +- .../explorerProjections/treeProjection.ts | 26 +- .../contrib/testing/browser/icons.ts | 14 +- .../testing/browser/testCoverageBars.ts | 36 +- .../testing/browser/testCoverageView.ts | 100 ++--- .../testing/browser/testExplorerActions.ts | 114 ++--- .../testing/browser/testMessageColorizer.ts | 16 +- .../testResultsView/testMessageStack.ts | 12 +- .../testResultsView/testResultsOutput.ts | 72 +-- .../testResultsView/testResultsSubject.ts | 14 +- .../testResultsView/testResultsTree.ts | 92 ++-- .../testResultsView/testResultsViewContent.ts | 76 ++-- .../testing/browser/testing.contribution.ts | 90 ++-- .../testing/browser/testingConfigurationUi.ts | 24 +- .../testing/browser/testingDecorations.ts | 104 ++--- .../testing/browser/testingExplorerFilter.ts | 40 +- .../testing/browser/testingExplorerView.ts | 156 +++---- .../testing/browser/testingOutputPeek.ts | 136 +++--- .../browser/testingProgressUiService.ts | 26 +- .../browser/testingViewPaneContainer.ts | 26 +- .../contrib/testing/browser/theme.ts | 10 +- .../contrib/testing/common/configuration.ts | 8 +- .../contrib/testing/common/constants.ts | 6 +- .../testing/common/getComputedState.ts | 6 +- .../common/mainThreadTestCollection.ts | 12 +- .../contrib/testing/common/observableUtils.ts | 4 +- .../contrib/testing/common/observableValue.ts | 6 +- .../contrib/testing/common/storedValue.ts | 6 +- .../contrib/testing/common/testCoverage.ts | 20 +- .../testing/common/testCoverageService.ts | 32 +- .../contrib/testing/common/testExclusions.ts | 14 +- .../testing/common/testExplorerFilterState.ts | 16 +- .../testing/common/testItemCollection.ts | 14 +- .../testing/common/testProfileService.ts | 24 +- .../contrib/testing/common/testResult.ts | 32 +- .../testing/common/testResultService.ts | 28 +- .../testing/common/testResultStorage.ts | 28 +- .../contrib/testing/common/testService.ts | 36 +- .../contrib/testing/common/testServiceImpl.ts | 64 +-- .../contrib/testing/common/testTypes.ts | 12 +- .../testing/common/testingContentProvider.ts | 26 +- .../testing/common/testingContextKeys.ts | 8 +- .../common/testingContinuousRunService.ts | 30 +- .../testing/common/testingDecorations.ts | 16 +- .../testing/common/testingPeekOpener.ts | 14 +- .../contrib/testing/common/testingStates.ts | 4 +- .../contrib/testing/common/testingUri.ts | 4 +- .../browser/codeCoverageDecorations.test.ts | 14 +- .../nameProjection.test.ts | 16 +- .../treeProjection.test.ts | 18 +- .../testing/test/browser/testObjectTree.ts | 20 +- .../testing/test/common/testCoverage.test.ts | 12 +- .../common/testExplorerFilterState.test.ts | 8 +- .../test/common/testProfileService.test.ts | 12 +- .../test/common/testResultService.test.ts | 34 +- .../test/common/testResultStorage.test.ts | 22 +- .../testing/test/common/testService.test.ts | 8 +- .../contrib/testing/test/common/testStubs.ts | 10 +- .../testing/test/common/testingUri.test.ts | 4 +- .../themes/browser/themes.contribution.ts | 92 ++-- .../browser/themes.test.contribution.ts | 32 +- .../test/node/colorRegistry.releaseTest.ts | 28 +- .../test/node/colorRegistryExport.test.ts | 8 +- .../timeline/browser/timeline.contribution.ts | 36 +- .../contrib/timeline/browser/timelinePane.ts | 108 ++--- .../contrib/timeline/common/timeline.ts | 20 +- .../timeline/common/timelineService.ts | 18 +- .../browser/typeHierarchy.contribution.ts | 42 +- .../browser/typeHierarchyPeek.ts | 62 +-- .../browser/typeHierarchyTree.ts | 24 +- .../typeHierarchy/common/typeHierarchy.ts | 28 +- .../update/browser/releaseNotesEditor.ts | 64 +-- .../update/browser/update.contribution.ts | 40 +- .../contrib/update/browser/update.ts | 54 +-- .../url/browser/externalUriResolver.ts | 8 +- .../url/browser/trustedDomainService.ts | 16 +- .../contrib/url/browser/trustedDomains.ts | 18 +- .../trustedDomainsFileSystemProvider.ts | 22 +- .../url/browser/trustedDomainsValidator.ts | 36 +- .../contrib/url/browser/url.contribution.ts | 38 +- .../workbench/contrib/url/common/urlGlob.ts | 2 +- .../test/browser/mockTrustedDomainService.ts | 4 +- .../url/test/browser/trustedDomains.test.ts | 6 +- .../browser/userDataProfile.contribution.ts | 6 +- .../browser/userDataProfile.ts | 58 +-- .../browser/userDataProfileActions.ts | 12 +- .../browser/userDataProfilesEditor.ts | 114 ++--- .../browser/userDataProfilesEditorModel.ts | 72 +-- .../userDataProfile/common/userDataProfile.ts | 6 +- .../browser/userDataSync.contribution.ts | 30 +- .../userDataSync/browser/userDataSync.ts | 94 ++-- .../browser/userDataSyncConflictsView.ts | 50 +-- .../browser/userDataSyncTrigger.ts | 28 +- .../userDataSync/browser/userDataSyncViews.ts | 60 +-- .../userDataSync.contribution.ts | 28 +- .../contrib/webview/browser/overlayWebview.ts | 24 +- .../webview/browser/resourceLoading.ts | 18 +- .../contrib/webview/browser/themeing.ts | 18 +- .../webview/browser/webview.contribution.ts | 18 +- .../contrib/webview/browser/webview.ts | 30 +- .../browser/webview.web.contribution.ts | 6 +- .../contrib/webview/browser/webviewElement.ts | 70 +-- .../webview/browser/webviewFindWidget.ts | 14 +- .../contrib/webview/browser/webviewService.ts | 14 +- .../browser/webviewWindowDragMonitor.ts | 8 +- .../contrib/webview/common/webview.ts | 6 +- .../electron-sandbox/webview.contribution.ts | 10 +- .../electron-sandbox/webviewCommands.ts | 12 +- .../electron-sandbox/webviewElement.ts | 46 +- .../electron-sandbox/webviewService.ts | 6 +- .../windowIgnoreMenuShortcutsManager.ts | 14 +- .../webviewPanel/browser/webviewCommands.ts | 24 +- .../webviewPanel/browser/webviewEditor.ts | 44 +- .../browser/webviewEditorInput.ts | 18 +- .../browser/webviewEditorInputSerializer.ts | 16 +- .../browser/webviewIconManager.ts | 10 +- .../browser/webviewPanel.contribution.ts | 34 +- .../browser/webviewWorkbenchService.ts | 36 +- .../browser/webviewView.contribution.ts | 4 +- .../webviewView/browser/webviewViewPane.ts | 54 +-- .../webviewView/browser/webviewViewService.ts | 14 +- .../browser/welcomeBanner.contribution.ts | 16 +- .../browser/welcomeDialog.contribution.ts | 38 +- .../welcomeDialog/browser/welcomeWidget.ts | 50 +-- .../browser/gettingStarted.contribution.ts | 58 +-- .../browser/gettingStarted.ts | 132 +++--- .../browser/gettingStartedColors.ts | 4 +- .../browser/gettingStartedDetailsRenderer.ts | 38 +- .../browser/gettingStartedExtensionPoint.ts | 6 +- .../browser/gettingStartedIcons.ts | 4 +- .../browser/gettingStartedInput.ts | 14 +- .../browser/gettingStartedList.ts | 12 +- .../browser/gettingStartedService.ts | 62 +-- .../browser/startupPage.ts | 50 +-- .../common/gettingStartedContent.ts | 18 +- .../common/media/notebookProfile.ts | 4 +- .../common/media/theme_picker.ts | 6 +- .../gettingStartedMarkdownRenderer.test.ts | 16 +- .../common/newFile.contribution.ts | 32 +- .../common/viewsWelcome.contribution.ts | 14 +- .../common/viewsWelcomeContribution.ts | 18 +- .../common/viewsWelcomeExtensionPoint.ts | 4 +- .../browser/editor/editorWalkThrough.ts | 22 +- .../editor/vs_code_editor_walkthrough.ts | 6 +- .../browser/walkThrough.contribution.ts | 26 +- .../browser/walkThroughActions.ts | 12 +- .../browser/walkThroughInput.ts | 24 +- .../browser/walkThroughPart.ts | 68 +-- .../common/walkThroughContentProvider.ts | 44 +- .../common/walkThroughUtils.ts | 6 +- .../browser/workspace.contribution.ts | 94 ++-- .../workspace/browser/workspaceTrustEditor.ts | 114 ++--- .../contrib/workspace/common/workspace.ts | 4 +- .../browser/workspaces.contribution.ts | 38 +- .../actions/developerActions.ts | 28 +- .../actions/installActions.ts | 20 +- .../electron-sandbox/actions/windowActions.ts | 50 +-- .../electron-sandbox/desktop.contribution.ts | 50 +-- .../electron-sandbox/desktop.main.ts | 116 ++--- .../parts/dialogs/dialog.contribution.ts | 32 +- .../parts/dialogs/dialogHandler.ts | 20 +- .../parts/titlebar/menubarControl.ts | 46 +- .../parts/titlebar/titlebarPart.ts | 48 +- src/vs/workbench/electron-sandbox/window.ts | 156 +++---- .../accessibleViewInformationService.ts | 8 +- .../electron-sandbox/accessibilityService.ts | 24 +- .../actions/common/menusExtensionPoint.ts | 44 +- .../activity/browser/activityService.ts | 16 +- .../services/activity/common/activity.ts | 10 +- .../common/aiEmbeddingVectorService.ts | 14 +- .../common/aiRelatedInformation.ts | 6 +- .../common/aiRelatedInformationService.ts | 14 +- .../aiRelatedInformationService.test.ts | 10 +- .../assignment/common/assignmentService.ts | 30 +- .../test/common/nullAssignmentService.ts | 2 +- .../browser/authenticationAccessService.ts | 14 +- .../authenticationExtensionsService.ts | 26 +- .../browser/authenticationService.ts | 24 +- .../browser/authenticationUsageService.ts | 6 +- .../authentication/common/authentication.ts | 4 +- .../browser/authenticationService.test.ts | 14 +- .../browser/auxiliaryWindowService.ts | 44 +- .../auxiliaryWindowService.ts | 42 +- .../services/banner/browser/bannerService.ts | 10 +- .../electron-sandbox/checksumService.ts | 4 +- .../clipboard/browser/clipboardService.ts | 24 +- .../electron-sandbox/clipboardService.ts | 12 +- .../commands/common/commandService.ts | 16 +- .../test/common/commandService.test.ts | 12 +- .../configuration/browser/configuration.ts | 50 +-- .../browser/configurationService.ts | 88 ++-- .../configuration/common/configuration.ts | 14 +- .../common/configurationCache.ts | 14 +- .../common/configurationEditing.ts | 52 +-- .../common/configurationModels.ts | 20 +- .../configuration/common/jsonEditing.ts | 6 +- .../common/jsonEditingService.ts | 32 +- .../test/browser/configuration.test.ts | 24 +- .../test/browser/configurationEditing.test.ts | 84 ++-- .../test/browser/configurationService.test.ts | 94 ++-- .../test/common/configurationModels.test.ts | 20 +- .../configuration/test/common/testServices.ts | 4 +- .../baseConfigurationResolverService.ts | 42 +- .../browser/configurationResolverService.ts | 24 +- .../common/configurationResolver.ts | 12 +- .../common/configurationResolverSchema.ts | 4 +- .../common/configurationResolverUtils.ts | 4 +- .../common/variableResolver.ts | 26 +- .../configurationResolverService.ts | 28 +- .../configurationResolverService.test.ts | 46 +- .../electron-sandbox/contextmenuService.ts | 48 +- .../decorations/browser/decorationsService.ts | 40 +- .../decorations/common/decorations.ts | 14 +- .../test/browser/decorationsService.test.ts | 22 +- .../browser/abstractFileDialogService.ts | 58 +-- .../dialogs/browser/fileDialogService.ts | 34 +- .../dialogs/browser/simpleFileDialog.ts | 66 +-- .../services/dialogs/common/dialogService.ts | 14 +- .../electron-sandbox/fileDialogService.ts | 48 +- .../fileDialogService.test.ts | 60 +-- .../services/driver/browser/driver.ts | 28 +- .../driver/electron-sandbox/driver.ts | 14 +- .../editor/browser/codeEditorService.ts | 24 +- .../editor/browser/editorPaneService.ts | 6 +- .../editor/browser/editorResolverService.ts | 50 +-- .../services/editor/browser/editorService.ts | 64 +-- .../editor/common/customEditorLabelService.ts | 22 +- .../editor/common/editorGroupColumn.ts | 8 +- .../editor/common/editorGroupFinder.ts | 14 +- .../editor/common/editorGroupsService.ts | 28 +- .../editor/common/editorPaneService.ts | 6 +- .../editor/common/editorResolverService.ts | 34 +- .../services/editor/common/editorService.ts | 20 +- .../browser/customEditorLabelService.test.ts | 14 +- .../test/browser/editorGroupsService.test.ts | 36 +- .../browser/editorResolverService.test.ts | 20 +- .../editor/test/browser/editorService.test.ts | 50 +-- .../test/browser/editorsObserver.test.ts | 32 +- .../encryption/browser/encryptionService.ts | 4 +- .../electron-sandbox/encryptionService.ts | 4 +- .../environment/browser/environmentService.ts | 32 +- .../environment/common/environmentService.ts | 8 +- .../electron-sandbox/environmentService.ts | 22 +- .../shellEnvironmentService.ts | 8 +- .../builtinExtensionsScannerService.ts | 26 +- .../browser/extensionBisect.ts | 42 +- .../browser/extensionEnablementService.ts | 50 +-- .../extensionsProfileScannerService.ts | 16 +- .../browser/webExtensionsScannerService.ts | 80 ++-- .../common/extensionFeatures.ts | 22 +- .../extensionFeaturesManagemetService.ts | 32 +- .../common/extensionManagement.ts | 14 +- .../extensionManagementChannelClient.ts | 22 +- .../extensionManagementServerService.ts | 24 +- .../common/extensionManagementService.ts | 64 +-- .../remoteExtensionManagementService.ts | 18 +- .../common/webExtensionManagementService.ts | 38 +- .../extensionManagementServerService.ts | 26 +- .../extensionManagementService.ts | 44 +- .../electron-sandbox/extensionTipsService.ts | 18 +- .../nativeExtensionManagementService.ts | 30 +- .../remoteExtensionManagementService.ts | 44 +- .../extensionEnablementService.test.ts | 72 +-- .../extensionIgnoredRecommendationsService.ts | 14 +- .../common/extensionRecommendations.ts | 8 +- .../common/workspaceExtensionsConfig.ts | 32 +- .../extensions/browser/extensionService.ts | 76 ++-- .../extensions/browser/extensionUrlHandler.ts | 48 +- .../browser/extensionsScannerService.ts | 22 +- .../browser/webWorkerExtensionHost.ts | 58 +-- .../browser/webWorkerFileSystemProvider.ts | 10 +- .../common/abstractExtensionService.ts | 100 ++--- .../extensions/common/extHostCustomers.ts | 12 +- .../common/extensionDescriptionRegistry.ts | 10 +- .../extensions/common/extensionDevOptions.ts | 4 +- .../extensions/common/extensionHostEnv.ts | 2 +- .../extensions/common/extensionHostKind.ts | 4 +- .../extensions/common/extensionHostManager.ts | 54 +-- .../common/extensionHostManagers.ts | 18 +- .../common/extensionHostProtocol.ts | 10 +- .../extensions/common/extensionHostProxy.ts | 12 +- .../extensionManifestPropertiesService.ts | 32 +- .../common/extensionRunningLocation.ts | 2 +- .../common/extensionRunningLocationTracker.ts | 22 +- .../common/extensionStorageMigration.ts | 22 +- .../services/extensions/common/extensions.ts | 28 +- .../common/extensionsProposedApi.ts | 26 +- .../extensions/common/extensionsRegistry.ts | 28 +- .../extensions/common/extensionsUtil.ts | 10 +- .../common/lazyCreateExtensionHostManager.ts | 32 +- .../services/extensions/common/lazyPromise.ts | 2 +- .../extensions/common/proxyIdentifier.ts | 4 +- .../extensions/common/remoteConsoleUtil.ts | 4 +- .../extensions/common/remoteExtensionHost.ts | 48 +- .../services/extensions/common/rpcProtocol.ts | 26 +- .../extensions/common/workspaceContains.ts | 22 +- .../cachedExtensionScanner.ts | 30 +- .../electron-sandbox/extensionHostProfiler.ts | 14 +- .../electron-sandbox/extensionHostStarter.ts | 4 +- .../extensionsScannerService.ts | 24 +- .../localProcessExtensionHost.ts | 70 +-- .../nativeExtensionService.ts | 110 ++--- .../test/browser/extensionService.test.ts | 88 ++-- .../browser/extensionStorageMigration.test.ts | 38 +- .../extensionDescriptionRegistry.test.ts | 8 +- ...extensionManifestPropertiesService.test.ts | 24 +- .../test/common/rpcProtocol.test.ts | 16 +- .../extensions/worker/polyfillNestedWorker.ts | 2 +- .../webWorkerExtensionHostIframe.esm.html | 4 +- .../worker/webWorkerExtensionHostIframe.html | 4 +- .../files/browser/elevatedFileService.ts | 10 +- .../files/common/elevatedFileService.ts | 8 +- .../diskFileSystemProvider.ts | 30 +- .../electron-sandbox/elevatedFileService.ts | 18 +- .../files/electron-sandbox/watcherClient.ts | 10 +- .../common/filesConfigurationService.ts | 46 +- .../history/browser/historyService.ts | 62 +-- .../services/history/common/history.ts | 10 +- .../test/browser/historyService.test.ts | 50 +-- .../host/browser/browserHostService.ts | 76 ++-- .../workbench/services/host/browser/host.ts | 6 +- .../electron-sandbox/nativeHostService.ts | 30 +- .../integrity/browser/integrityService.ts | 4 +- .../services/integrity/common/integrity.ts | 4 +- .../electron-sandbox/integrityService.ts | 26 +- .../keybinding/browser/keybindingService.ts | 92 ++-- .../browser/keyboardLayoutService.ts | 58 +-- .../browser/keyboardLayouts/_.contribution.ts | 2 +- .../browser/keyboardLayouts/cz.win.ts | 2 +- .../browser/keyboardLayouts/de-swiss.win.ts | 2 +- .../browser/keyboardLayouts/de.darwin.ts | 2 +- .../browser/keyboardLayouts/de.linux.ts | 2 +- .../browser/keyboardLayouts/de.win.ts | 2 +- .../browser/keyboardLayouts/dk.win.ts | 2 +- .../browser/keyboardLayouts/dvorak.darwin.ts | 2 +- .../browser/keyboardLayouts/en-belgian.win.ts | 2 +- .../browser/keyboardLayouts/en-ext.darwin.ts | 2 +- .../browser/keyboardLayouts/en-in.win.ts | 2 +- .../browser/keyboardLayouts/en-intl.darwin.ts | 2 +- .../browser/keyboardLayouts/en-intl.win.ts | 2 +- .../browser/keyboardLayouts/en-uk.darwin.ts | 2 +- .../browser/keyboardLayouts/en-uk.win.ts | 2 +- .../browser/keyboardLayouts/en.darwin.ts | 2 +- .../browser/keyboardLayouts/en.linux.ts | 2 +- .../browser/keyboardLayouts/en.win.ts | 2 +- .../browser/keyboardLayouts/es-latin.win.ts | 2 +- .../browser/keyboardLayouts/es.darwin.ts | 2 +- .../browser/keyboardLayouts/es.linux.ts | 2 +- .../browser/keyboardLayouts/es.win.ts | 2 +- .../browser/keyboardLayouts/fr.darwin.ts | 2 +- .../browser/keyboardLayouts/fr.linux.ts | 2 +- .../browser/keyboardLayouts/fr.win.ts | 2 +- .../browser/keyboardLayouts/hu.win.ts | 2 +- .../browser/keyboardLayouts/it.darwin.ts | 2 +- .../browser/keyboardLayouts/it.win.ts | 2 +- .../keyboardLayouts/jp-roman.darwin.ts | 2 +- .../browser/keyboardLayouts/jp.darwin.ts | 2 +- .../browser/keyboardLayouts/ko.darwin.ts | 2 +- .../layout.contribution.darwin.ts | 34 +- .../layout.contribution.linux.ts | 12 +- .../layout.contribution.win.ts | 46 +- .../browser/keyboardLayouts/no.win.ts | 2 +- .../browser/keyboardLayouts/pl.darwin.ts | 2 +- .../browser/keyboardLayouts/pl.win.ts | 2 +- .../browser/keyboardLayouts/pt-br.win.ts | 2 +- .../browser/keyboardLayouts/pt.darwin.ts | 2 +- .../browser/keyboardLayouts/pt.win.ts | 2 +- .../browser/keyboardLayouts/ru.darwin.ts | 2 +- .../browser/keyboardLayouts/ru.linux.ts | 2 +- .../browser/keyboardLayouts/ru.win.ts | 2 +- .../browser/keyboardLayouts/sv.darwin.ts | 2 +- .../browser/keyboardLayouts/sv.win.ts | 2 +- .../browser/keyboardLayouts/thai.win.ts | 2 +- .../browser/keyboardLayouts/tr.win.ts | 2 +- .../browser/keyboardLayouts/zh-hans.darwin.ts | 2 +- .../keybinding/browser/unboundCommands.ts | 8 +- .../common/fallbackKeyboardMapper.ts | 10 +- .../keybinding/common/keybindingEditing.ts | 40 +- .../keybinding/common/keybindingIO.ts | 8 +- .../services/keybinding/common/keymapInfo.ts | 4 +- .../common/macLinuxKeyboardMapper.ts | 16 +- .../common/windowsKeyboardMapper.ts | 20 +- .../electron-sandbox/nativeKeyboardLayout.ts | 26 +- .../nativeKeyboardLayoutService.ts | 16 +- .../browser/browserKeyboardMapper.test.ts | 28 +- .../test/browser/keybindingEditing.test.ts | 56 +-- .../test/browser/keybindingIO.test.ts | 14 +- .../test/node/fallbackKeyboardMapper.test.ts | 12 +- .../test/node/keyboardMapperTestUtils.ts | 12 +- .../test/node/macLinuxKeyboardMapper.test.ts | 18 +- .../test/node/windowsKeyboardMapper.test.ts | 14 +- .../services/label/common/labelService.ts | 48 +- .../services/label/test/browser/label.test.ts | 28 +- .../label/test/common/mockLabelService.ts | 12 +- .../language/common/languageService.ts | 42 +- .../languageDetectionSimpleWorker.esm.ts | 4 +- .../browser/languageDetectionSimpleWorker.ts | 10 +- .../languageDetectionWorker.protocol.ts | 2 +- .../languageDetectionWorkerServiceImpl.ts | 44 +- .../common/languageDetectionWorkerService.ts | 4 +- .../common/languageStatusService.ts | 24 +- .../services/layout/browser/layoutService.ts | 24 +- .../lifecycle/browser/lifecycleService.ts | 22 +- .../services/lifecycle/common/lifecycle.ts | 6 +- .../lifecycle/common/lifecycleService.ts | 14 +- .../electron-sandbox/lifecycleService.ts | 22 +- .../electron-sandbox/lifecycleService.test.ts | 14 +- .../localization/browser/localeService.ts | 24 +- .../services/localization/common/locale.ts | 4 +- .../electron-sandbox/languagePackService.ts | 4 +- .../electron-sandbox/localeService.ts | 38 +- .../log/electron-sandbox/logService.ts | 14 +- .../electron-sandbox/menubarService.ts | 4 +- .../services/model/common/modelService.ts | 18 +- .../common/notebookDocumentService.ts | 12 +- .../common/notificationService.ts | 16 +- .../services/outline/browser/outline.ts | 22 +- .../outline/browser/outlineService.ts | 14 +- .../output/common/delayedLogChannel.ts | 4 +- .../services/output/common/output.ts | 10 +- .../panecomposite/browser/panecomposite.ts | 12 +- .../services/path/browser/pathService.ts | 16 +- .../services/path/common/pathService.ts | 22 +- .../path/electron-sandbox/pathService.ts | 10 +- .../browser/keybindingsEditorInput.ts | 18 +- .../browser/keybindingsEditorModel.ts | 36 +- .../preferences/browser/preferencesService.ts | 90 ++-- .../preferences/common/preferences.ts | 34 +- .../common/preferencesEditorInput.ts | 20 +- .../preferences/common/preferencesModels.ts | 40 +- .../common/preferencesValidation.ts | 10 +- .../browser/keybindingsEditorModel.test.ts | 34 +- .../test/browser/preferencesService.test.ts | 26 +- .../test/common/preferencesValidation.test.ts | 6 +- .../progress/browser/progressIndicator.ts | 12 +- .../progress/browser/progressService.ts | 50 +-- .../test/browser/progressIndicator.test.ts | 6 +- .../quickinput/browser/quickInputService.ts | 22 +- .../browser/browserRemoteResourceHandler.ts | 12 +- .../remote/browser/remoteAgentService.ts | 28 +- .../common/abstractRemoteAgentService.ts | 34 +- .../common/remoteAgentEnvironmentChannel.ts | 20 +- .../remote/common/remoteAgentService.ts | 16 +- .../remote/common/remoteExplorerService.ts | 28 +- .../remote/common/remoteExtensionsScanner.ts | 28 +- .../common/remoteFileSystemProviderClient.ts | 18 +- .../services/remote/common/tunnelModel.ts | 40 +- .../electron-sandbox/remoteAgentService.ts | 32 +- .../request/browser/requestService.ts | 18 +- .../electron-sandbox/requestService.ts | 12 +- .../services/search/browser/searchService.ts | 48 +- .../search/common/fileSearchManager.ts | 24 +- .../services/search/common/getFileResults.ts | 4 +- .../services/search/common/ignoreFile.ts | 2 +- .../common/localFileSearchWorkerTypes.ts | 6 +- .../services/search/common/queryBuilder.ts | 42 +- .../services/search/common/replace.ts | 8 +- .../services/search/common/search.ts | 34 +- .../search/common/searchExtConversionTypes.ts | 12 +- .../services/search/common/searchExtTypes.ts | 6 +- .../search/common/searchExtTypesInternal.ts | 2 +- .../services/search/common/searchHelpers.ts | 6 +- .../services/search/common/searchService.ts | 40 +- .../search/common/textSearchManager.ts | 20 +- .../search/electron-sandbox/searchService.ts | 6 +- .../services/search/node/fileSearch.ts | 30 +- .../services/search/node/rawSearchService.ts | 28 +- .../services/search/node/ripgrepFileSearch.ts | 16 +- .../search/node/ripgrepSearchProvider.ts | 14 +- .../search/node/ripgrepSearchUtils.ts | 6 +- .../search/node/ripgrepTextSearchEngine.ts | 24 +- .../services/search/node/textSearchAdapter.ts | 10 +- .../services/search/node/textSearchManager.ts | 10 +- .../search/test/browser/queryBuilder.test.ts | 36 +- .../search/test/common/ignoreFile.test.ts | 4 +- .../search/test/common/queryBuilder.test.ts | 14 +- .../search/test/common/replace.test.ts | 4 +- .../search/test/common/search.test.ts | 4 +- .../search/test/common/searchHelpers.test.ts | 10 +- .../test/node/fileSearch.integrationTest.ts | 12 +- .../node/rawSearchService.integrationTest.ts | 18 +- .../test/node/ripgrepFileSearch.test.ts | 6 +- .../node/ripgrepTextSearchEngineUtils.test.ts | 14 +- .../test/node/search.integrationTest.ts | 16 +- .../test/node/textSearch.integrationTest.ts | 16 +- .../test/node/textSearchManager.test.ts | 14 +- .../search/worker/localFileSearch.esm.ts | 4 +- .../services/search/worker/localFileSearch.ts | 26 +- .../secrets/browser/secretStorageService.ts | 14 +- .../electron-sandbox/secretStorageService.ts | 28 +- .../electron-sandbox/sharedProcessService.ts | 18 +- .../services/statusbar/browser/statusbar.ts | 14 +- .../storage/browser/storageService.ts | 30 +- .../electron-sandbox/storageService.ts | 12 +- .../test/browser/storageService.test.ts | 32 +- .../suggest/browser/simpleCompletionItem.ts | 6 +- .../suggest/browser/simpleCompletionModel.ts | 10 +- .../suggest/browser/simpleSuggestWidget.ts | 32 +- .../browser/simpleSuggestWidgetRenderer.ts | 18 +- .../telemetry/browser/telemetryService.ts | 30 +- .../browser/workbenchCommonProperties.ts | 14 +- .../common/workbenchCommonProperties.ts | 10 +- .../electron-sandbox/telemetryService.ts | 28 +- .../test/browser/commonProperties.test.ts | 6 +- .../test/node/commonProperties.test.ts | 8 +- .../common/embedderTerminalService.ts | 10 +- .../textMate/browser/arrayOperation.ts | 2 +- .../textMateWorkerTokenizerController.ts | 32 +- .../threadedBackgroundTokenizerFactory.ts | 40 +- .../textMateTokenizationWorker.worker.esm.ts | 4 +- .../textMateTokenizationWorker.worker.ts | 18 +- .../worker/textMateWorkerHost.ts | 6 +- .../worker/textMateWorkerTokenizer.ts | 32 +- ...extMateTokenizationFeature.contribution.ts | 8 +- .../browser/textMateTokenizationFeature.ts | 2 +- .../textMateTokenizationFeatureImpl.ts | 70 +-- .../textMateTokenizationSupport.ts | 12 +- .../tokenizationSupportWithLineLimit.ts | 12 +- .../textMate/common/TMGrammarFactory.ts | 6 +- .../services/textMate/common/TMGrammars.ts | 6 +- .../textMate/common/TMScopeRegistry.ts | 6 +- .../test/browser/arrayOperation.test.ts | 4 +- .../browser/browserTextFileService.ts | 40 +- .../textfile/browser/textFileService.ts | 82 ++-- .../services/textfile/common/encoding.ts | 12 +- .../textfile/common/textEditorService.ts | 40 +- .../textfile/common/textFileEditorModel.ts | 62 +-- .../common/textFileEditorModelManager.ts | 44 +- .../common/textFileSaveParticipant.ts | 14 +- .../services/textfile/common/textfiles.ts | 32 +- .../electron-sandbox/nativeTextFileService.ts | 46 +- .../browser/browserTextFileService.io.test.ts | 40 +- .../test/browser/textEditorService.test.ts | 38 +- .../textFileEditorModel.integrationTest.ts | 20 +- .../test/browser/textFileEditorModel.test.ts | 32 +- .../textFileEditorModelManager.test.ts | 22 +- .../test/browser/textFileService.test.ts | 12 +- .../textfile/test/common/fixtures/files.ts | 6 +- .../test/common/textFileService.io.test.ts | 20 +- .../nativeTextFileService.io.test.ts | 40 +- .../nativeTextFileService.test.ts | 32 +- .../node/encoding/encoding.integrationTest.ts | 4 +- .../test/node/encoding/encoding.test.ts | 14 +- .../common/textModelResolverService.ts | 32 +- .../browser/textModelResolverService.test.ts | 30 +- .../common/textResourcePropertiesService.ts | 20 +- .../browser/browserHostColorSchemeService.ts | 12 +- .../themes/browser/fileIconThemeData.ts | 24 +- .../themes/browser/productIconThemeData.ts | 28 +- .../themes/browser/workbenchThemeService.ts | 78 ++-- .../themes/common/colorExtensionPoint.ts | 20 +- .../services/themes/common/colorThemeData.ts | 42 +- .../themes/common/colorThemeSchema.ts | 12 +- .../themes/common/fileIconThemeSchema.ts | 10 +- .../themes/common/hostColorSchemeService.ts | 4 +- .../themes/common/iconExtensionPoint.ts | 16 +- .../themes/common/productIconThemeSchema.ts | 10 +- .../themes/common/themeCompatibility.ts | 8 +- .../themes/common/themeConfiguration.ts | 28 +- .../themes/common/themeExtensionPoints.ts | 26 +- .../tokenClassificationExtensionPoint.ts | 6 +- .../themes/common/workbenchThemeService.ts | 16 +- .../nativeHostColorSchemeService.ts | 18 +- .../electron-sandbox/themes.contribution.ts | 12 +- .../test/node/tokenStyleResolving.test.ts | 34 +- .../services/timer/browser/timerService.ts | 36 +- .../timer/electron-sandbox/timerService.ts | 32 +- .../services/title/browser/titleService.ts | 6 +- .../title/electron-sandbox/titleService.ts | 6 +- ...eSitterTokenizationFeature.contribution.ts | 10 +- .../browser/treeSitterTokenizationFeature.ts | 32 +- .../services/tunnel/browser/tunnelService.ts | 14 +- .../tunnel/electron-sandbox/tunnelService.ts | 28 +- .../common/untitledTextEditorHandler.ts | 34 +- .../common/untitledTextEditorInput.ts | 36 +- .../common/untitledTextEditorModel.ts | 50 +-- .../common/untitledTextEditorService.ts | 20 +- .../untitledTextEditor.integrationTest.ts | 12 +- .../test/browser/untitledTextEditor.test.ts | 38 +- .../services/update/browser/updateService.ts | 12 +- .../update/electron-sandbox/updateService.ts | 6 +- .../services/url/browser/urlService.ts | 18 +- .../url/electron-sandbox/urlService.ts | 24 +- .../browser/domActivityTracker.ts | 10 +- .../browser/userActivityBrowser.ts | 4 +- .../common/userActivityRegistry.ts | 4 +- .../common/userActivityService.ts | 12 +- .../test/browser/domActivityTracker.test.ts | 6 +- .../test/common/userActivityService.test.ts | 6 +- .../services/userData/browser/userDataInit.ts | 14 +- .../browser/extensionsResource.ts | 32 +- .../browser/globalStateResource.ts | 24 +- .../userDataProfile/browser/iconSelectBox.ts | 10 +- .../browser/keybindingsResource.ts | 22 +- .../browser/settingsResource.ts | 28 +- .../browser/snippetsResource.ts | 24 +- .../userDataProfile/browser/tasksResource.ts | 20 +- .../userDataProfileImportExportService.ts | 72 +-- .../browser/userDataProfileInit.ts | 40 +- .../browser/userDataProfileManagement.ts | 34 +- .../browser/userDataProfileStorageService.ts | 20 +- .../common/remoteUserDataProfiles.ts | 24 +- .../userDataProfile/common/userDataProfile.ts | 26 +- .../common/userDataProfileIcons.ts | 6 +- .../common/userDataProfileService.ts | 14 +- .../browser/userDataSyncEnablementService.ts | 8 +- .../userDataSync/browser/userDataSyncInit.ts | 64 +-- .../browser/userDataSyncWorkbenchService.ts | 78 ++-- .../webUserDataSyncEnablementService.ts | 6 +- .../userDataSync/common/userDataSync.ts | 24 +- .../userDataSync/common/userDataSyncUtil.ts | 16 +- .../userDataAutoSyncService.ts | 10 +- .../electron-sandbox/userDataSyncService.ts | 12 +- .../utilityProcessWorkerWorkbenchService.ts | 20 +- .../views/browser/viewDescriptorService.ts | 38 +- .../services/views/browser/viewsService.ts | 62 +-- .../views/common/viewContainerModel.ts | 40 +- .../services/views/common/viewsService.ts | 10 +- .../test/browser/viewContainerModel.test.ts | 32 +- .../browser/viewDescriptorService.test.ts | 28 +- .../browser/workingCopyBackupService.ts | 20 +- .../browser/workingCopyBackupTracker.ts | 20 +- .../browser/workingCopyHistoryService.ts | 20 +- .../common/abstractFileWorkingCopyManager.ts | 18 +- .../workingCopy/common/fileWorkingCopy.ts | 12 +- .../common/fileWorkingCopyManager.ts | 72 +-- .../workingCopy/common/resourceWorkingCopy.ts | 16 +- .../common/storedFileWorkingCopy.ts | 54 +-- .../common/storedFileWorkingCopyManager.ts | 56 +-- .../storedFileWorkingCopySaveParticipant.ts | 16 +- .../common/untitledFileWorkingCopy.ts | 26 +- .../common/untitledFileWorkingCopyManager.ts | 24 +- .../workingCopy/common/workingCopy.ts | 10 +- .../workingCopy/common/workingCopyBackup.ts | 8 +- .../common/workingCopyBackupService.ts | 34 +- .../common/workingCopyBackupTracker.ts | 28 +- .../common/workingCopyEditorService.ts | 16 +- .../workingCopyFileOperationParticipant.ts | 14 +- .../common/workingCopyFileService.ts | 36 +- .../workingCopy/common/workingCopyHistory.ts | 10 +- .../common/workingCopyHistoryService.ts | 54 +-- .../common/workingCopyHistoryTracker.ts | 42 +- .../workingCopy/common/workingCopyService.ts | 14 +- .../workingCopyBackupService.ts | 22 +- .../workingCopyBackupTracker.ts | 44 +- .../workingCopyHistoryService.ts | 6 +- .../browser/fileWorkingCopyManager.test.ts | 24 +- .../test/browser/resourceWorkingCopy.test.ts | 24 +- .../browser/storedFileWorkingCopy.test.ts | 34 +- .../storedFileWorkingCopyManager.test.ts | 28 +- .../browser/untitledFileWorkingCopy.test.ts | 26 +- .../untitledFileWorkingCopyManager.test.ts | 22 +- .../untitledScratchpadWorkingCopy.test.ts | 24 +- .../browser/workingCopyBackupTracker.test.ts | 50 +-- .../browser/workingCopyEditorService.test.ts | 18 +- .../browser/workingCopyFileService.test.ts | 26 +- .../test/common/workingCopyService.test.ts | 12 +- .../workingCopyBackupService.test.ts | 60 +-- .../workingCopyBackupTracker.test.ts | 82 ++-- .../workingCopyHistoryService.test.ts | 42 +- .../workingCopyHistoryTracker.test.ts | 48 +- .../abstractWorkspaceEditingService.ts | 54 +-- .../browser/workspaceEditingService.ts | 40 +- .../browser/workspaceTrustEditorInput.ts | 16 +- .../services/workspaces/browser/workspaces.ts | 6 +- .../workspaces/browser/workspacesService.ts | 32 +- .../workspaces/common/canonicalUriService.ts | 10 +- .../common/editSessionIdentityService.ts | 16 +- .../workspaces/common/workspaceEditing.ts | 8 +- .../common/workspaceIdentityService.ts | 18 +- .../workspaces/common/workspaceTrust.ts | 42 +- .../workspaceEditingService.ts | 62 +-- .../electron-sandbox/workspacesService.ts | 10 +- .../test/browser/workspaces.test.ts | 6 +- .../test/common/workspaceTrust.test.ts | 38 +- .../workbench/test/browser/codeeditor.test.ts | 44 +- .../test/browser/contributions.test.ts | 28 +- src/vs/workbench/test/browser/part.test.ts | 20 +- .../parts/editor/breadcrumbModel.test.ts | 20 +- .../parts/editor/diffEditorInput.test.ts | 14 +- .../test/browser/parts/editor/editor.test.ts | 36 +- .../editor/editorCommandsContext.test.ts | 26 +- .../parts/editor/editorDiffModel.test.ts | 18 +- .../parts/editor/editorGroupModel.test.ts | 42 +- .../browser/parts/editor/editorInput.test.ts | 28 +- .../browser/parts/editor/editorModel.test.ts | 66 +-- .../browser/parts/editor/editorPane.test.ts | 48 +- .../editor/filteredEditorGroupModel.test.ts | 40 +- .../parts/editor/resourceEditorInput.test.ts | 30 +- .../editor/sideBySideEditorInput.test.ts | 14 +- .../parts/editor/textEditorPane.test.ts | 24 +- .../editor/textResourceEditorInput.test.ts | 18 +- .../parts/statusbar/statusbarModel.test.ts | 10 +- .../test/browser/quickAccess.test.ts | 32 +- src/vs/workbench/test/browser/viewlet.test.ts | 10 +- src/vs/workbench/test/browser/webview.test.ts | 4 +- src/vs/workbench/test/browser/window.test.ts | 14 +- .../test/browser/workbenchTestServices.ts | 356 +++++++-------- src/vs/workbench/test/common/memento.test.ts | 10 +- .../test/common/notifications.test.ts | 18 +- .../workbench/test/common/resources.test.ts | 14 +- src/vs/workbench/test/common/utils.ts | 2 +- .../test/common/workbenchTestServices.ts | 56 +-- .../electron-sandbox/resolveExternal.test.ts | 16 +- .../electron-sandbox/workbenchTestServices.ts | 92 ++-- src/vs/workbench/workbench.common.main.ts | 418 +++++++++--------- src/vs/workbench/workbench.desktop.main.ts | 174 ++++---- src/vs/workbench/workbench.web.main.ts | 172 +++---- .../browser/{index.esm.js => index.amd.js} | 58 +-- test/unit/browser/index.js | 54 ++- .../{renderer.esm.html => renderer.amd.html} | 140 ++---- test/unit/browser/renderer.html | 140 ++++-- .../electron/{index.esm.js => index.amd.js} | 12 +- test/unit/electron/index.js | 14 +- test/unit/electron/renderer.amd.html | 35 ++ .../{renderer.esm.js => renderer.amd.js} | 250 ++++++++--- test/unit/electron/renderer.esm.html | 136 ------ test/unit/electron/renderer.html | 105 ++++- test/unit/electron/renderer.js | 249 +++-------- test/unit/node/{index.js => index.amd.js} | 3 +- 3921 files changed, 50112 insertions(+), 50068 deletions(-) rename build/lib/{esm.js => amd.js} (59%) rename build/lib/{esm.ts => amd.ts} (58%) rename scripts/{test-esm.bat => test-amd.bat} (91%) rename scripts/{test-esm.sh => test-amd.sh} (89%) rename scripts/{test-integration-esm.bat => test-integration-amd.bat} (98%) rename scripts/{test-integration-esm.sh => test-integration-amd.sh} (98%) create mode 100644 src/package.json rename test/unit/browser/{index.esm.js => index.amd.js} (89%) rename test/unit/browser/{renderer.esm.html => renderer.amd.html} (57%) rename test/unit/electron/{index.esm.js => index.amd.js} (95%) create mode 100644 test/unit/electron/renderer.amd.html rename test/unit/electron/{renderer.esm.js => renderer.amd.js} (56%) delete mode 100644 test/unit/electron/renderer.esm.html rename test/unit/node/{index.js => index.amd.js} (99%) diff --git a/.eslintplugin/code-import-patterns.ts b/.eslintplugin/code-import-patterns.ts index 1f08bb4a4e8ff..932f71d158194 100644 --- a/.eslintplugin/code-import-patterns.ts +++ b/.eslintplugin/code-import-patterns.ts @@ -44,7 +44,9 @@ export = new class implements eslint.Rule.RuleModule { readonly meta: eslint.Rule.RuleMetaData = { messages: { badImport: 'Imports violates \'{{restrictions}}\' restrictions. See https://github.com/microsoft/vscode/wiki/Source-Code-Organization', - badFilename: 'Missing definition in `code-import-patterns` for this file. Define rules at https://github.com/microsoft/vscode/blob/main/.eslintrc.json' + badFilename: 'Missing definition in `code-import-patterns` for this file. Define rules at https://github.com/microsoft/vscode/blob/main/.eslintrc.json', + badAbsolute: 'Imports have to be relative to support ESM', + badExtension: 'Imports have to end with `.js` or `.css` to support ESM', }, docs: { url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization' @@ -181,8 +183,8 @@ export = new class implements eslint.Rule.RuleModule { if (targetIsVS) { // Always add "vs/nls" and "vs/amdX" - restrictions.push('vs/nls'); - restrictions.push('vs/amdX'); // TODO@jrieken remove after ESM is real + restrictions.push('vs/nls.js'); + restrictions.push('vs/amdX.js'); // TODO@jrieken remove after ESM is real } if (targetIsVS && option.layer) { @@ -212,6 +214,25 @@ export = new class implements eslint.Rule.RuleModule { } private _checkImport(context: eslint.Rule.RuleContext, config: ImportPatternsConfig, node: TSESTree.Node, importPath: string) { + const targetIsVS = /^src\/vs\//.test(getRelativeFilename(context)); + if (targetIsVS) { + + // ESM: check for import ending with ".js" or ".css" + if (importPath[0] === '.' && !importPath.endsWith('.js') && !importPath.endsWith('.css')) { + context.report({ + loc: node.loc, + messageId: 'badExtension', + }); + } + + // check for import being relative + if (importPath.startsWith('vs/')) { + context.report({ + loc: node.loc, + messageId: 'badAbsolute', + }); + } + } // resolve relative paths if (importPath[0] === '.') { diff --git a/.eslintrc.json b/.eslintrc.json index 1deaf02985b34..93564f5c0b199 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -656,6 +656,7 @@ "http", "https", "minimist", + "node:module", "native-keymap", "native-watchdog", "net", @@ -692,6 +693,7 @@ "when": "test", "allow": [ "vs/css.build", + "vs/css.build.js", "assert", "sinon", "sinon-test" @@ -937,6 +939,10 @@ "when": "hasBrowser", "pattern": "vs/workbench/workbench.web.main" }, + { + "when": "hasBrowser", + "pattern": "vs/workbench/workbench.web.main.js" + }, { "when": "hasBrowser", "pattern": "vs/workbench/~" @@ -977,11 +983,13 @@ "vs/editor/~", "vs/editor/contrib/*/~", "vs/editor/editor.all", + "vs/editor/editor.all.js", "vs/workbench/~", "vs/workbench/api/~", "vs/workbench/services/*/~", "vs/workbench/contrib/*/~", - "vs/workbench/contrib/terminal/terminal.all" + "vs/workbench/contrib/terminal/terminal.all", + "vs/workbench/contrib/terminal/terminal.all.js" ] }, { @@ -994,11 +1002,13 @@ "vs/editor/~", "vs/editor/contrib/*/~", "vs/editor/editor.all", + "vs/editor/editor.all.js", "vs/workbench/~", "vs/workbench/api/~", "vs/workbench/services/*/~", "vs/workbench/contrib/*/~", - "vs/workbench/workbench.common.main" + "vs/workbench/workbench.common.main", + "vs/workbench/workbench.common.main.js" ] }, { @@ -1011,11 +1021,13 @@ "vs/editor/~", "vs/editor/contrib/*/~", "vs/editor/editor.all", + "vs/editor/editor.all.js", "vs/workbench/~", "vs/workbench/api/~", "vs/workbench/services/*/~", "vs/workbench/contrib/*/~", - "vs/workbench/workbench.common.main" + "vs/workbench/workbench.common.main", + "vs/workbench/workbench.common.main.js" ] }, { @@ -1025,7 +1037,7 @@ ] }, { - "target": "src/vs/{loader.d.ts,css.ts,css.build.ts,monaco.d.ts,nls.messages.ts,nls.ts}", + "target": "src/vs/{loader.d.ts,css.ts,css.build.ts,monaco.d.ts,nls.ts,nls.messages.ts}", "restrictions": [] }, { diff --git a/.github/workflows/monaco-editor.yml b/.github/workflows/monaco-editor.yml index 8c8ae7b743d9e..706e51ffdd05a 100644 --- a/.github/workflows/monaco-editor.yml +++ b/.github/workflows/monaco-editor.yml @@ -65,34 +65,34 @@ jobs: - name: Run Monaco Editor Checks run: yarn monaco-compile-check - - name: Editor Distro & ESM - run: yarn gulp editor-esm + # - name: Editor Distro & ESM + # run: yarn gulp editor-esm - - name: Editor ESM sources check - working-directory: ./test/monaco - run: yarn run esm-check + # - name: Editor ESM sources check + # working-directory: ./test/monaco + # run: yarn run esm-check - - name: Typings validation prep - run: | - mkdir typings-test + # - 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: 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: Package Editor with Webpack - working-directory: ./test/monaco - run: yarn run bundle-webpack + # - name: Package Editor with Webpack + # working-directory: ./test/monaco + # run: yarn run bundle-webpack - - name: Compile Editor Tests - working-directory: ./test/monaco - run: yarn run compile + # - name: Compile Editor Tests + # working-directory: ./test/monaco + # run: yarn run compile - - name: Run Editor Tests - timeout-minutes: 5 - working-directory: ./test/monaco - run: yarn test + # - name: Run Editor Tests + # timeout-minutes: 5 + # working-directory: ./test/monaco + # run: yarn test diff --git a/.vscode/settings.json b/.vscode/settings.json index fb911e84a8ffc..6ddb8c1b9dc1e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -76,7 +76,7 @@ "npm.exclude": "**/extensions/**", "npm.packageManager": "yarn", "emmet.excludeLanguages": [], - "typescript.preferences.importModuleSpecifier": "non-relative", + "typescript.preferences.importModuleSpecifier": "relative", "typescript.preferences.quoteStyle": "single", "json.schemas": [ { diff --git a/build/azure-pipelines/darwin/product-build-darwin-test.yml b/build/azure-pipelines/darwin/product-build-darwin-test.yml index c5f9dfb003675..bc1cb00ecff85 100644 --- a/build/azure-pipelines/darwin/product-build-darwin-test.yml +++ b/build/azure-pipelines/darwin/product-build-darwin-test.yml @@ -7,7 +7,7 @@ parameters: type: boolean - name: VSCODE_RUN_SMOKE_TESTS type: boolean - - name: VSCODE_BUILD_ESM + - name: VSCODE_BUILD_AMD type: boolean default: false @@ -20,19 +20,19 @@ steps: - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}: - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: - - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}: - - script: ./scripts/test-esm.sh --tfs "Unit Tests" - displayName: Run unit tests (Electron) [ESM] + - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}: + - script: ./scripts/test-amd.sh --tfs "Unit Tests" + displayName: Run unit tests (Electron) [AMD] timeoutInMinutes: 15 - - script: yarn test-node-esm - displayName: Run unit tests (node.js) [ESM] + - script: yarn test-node-amd + displayName: Run unit tests (node.js) [AMD] timeoutInMinutes: 15 - - script: yarn test-browser-esm-no-install --sequential --browser chromium --browser webkit --tfs "Browser Unit Tests" + - script: yarn test-browser-amd-no-install --sequential --browser chromium --browser webkit --tfs "Browser Unit Tests" env: DEBUG: "*browser*" - displayName: Run unit tests (Browser, Chromium & Webkit) [ESM] + displayName: Run unit tests (Browser, Chromium & Webkit) [AMD] timeoutInMinutes: 30 - - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}: + - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}: - script: ./scripts/test.sh --tfs "Unit Tests" displayName: Run unit tests (Electron) timeoutInMinutes: 15 @@ -46,19 +46,19 @@ steps: timeoutInMinutes: 30 - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}: - - script: ./scripts/test-esm.sh --build --tfs "Unit Tests" - displayName: Run unit tests (Electron) [ESM] + - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}: + - script: ./scripts/test-amd.sh --build --tfs "Unit Tests" + displayName: Run unit tests (Electron) [AMD] timeoutInMinutes: 15 - - script: yarn test-node-esm --build - displayName: Run unit tests (node.js) [ESM] + - script: yarn test-node-amd --build + displayName: Run unit tests (node.js) [AMD] timeoutInMinutes: 15 - - script: yarn test-browser-esm-no-install --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests" + - script: yarn test-browser-amd-no-install --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests" env: DEBUG: "*browser*" - displayName: Run unit tests (Browser, Chromium & Webkit) [ESM] + displayName: Run unit tests (Browser, Chromium & Webkit) [AMD] timeoutInMinutes: 30 - - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}: + - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}: - script: ./scripts/test.sh --build --tfs "Unit Tests" displayName: Run unit tests (Electron) timeoutInMinutes: 15 @@ -94,17 +94,17 @@ steps: displayName: Build integration tests - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: - - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}: - - script: ./scripts/test-integration-esm.sh --tfs "Integration Tests" - displayName: Run integration tests (Electron) [ESM] + - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}: + - script: ./scripts/test-integration-amd.sh --tfs "Integration Tests" + displayName: Run integration tests (Electron) [AMD] timeoutInMinutes: 20 - - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}: + - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}: - script: ./scripts/test-integration --tfs "Integration Tests" displayName: Run integration tests (Electron) timeoutInMinutes: 20 - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}: + - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}: - script: | # Figure out the full absolute path of the product we just built # including the remote server and configure the integration tests @@ -113,12 +113,12 @@ steps: APP_ROOT="$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)" APP_NAME="`ls $APP_ROOT | head -n 1`" INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \ - ./scripts/test-integration-esm.sh --build --tfs "Integration Tests" + ./scripts/test-integration-amd.sh --build --tfs "Integration Tests" env: VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH) - displayName: Run integration tests (Electron) [ESM] + displayName: Run integration tests (Electron) [AMD] timeoutInMinutes: 20 - - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}: + - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}: - script: | # Figure out the full absolute path of the product we just built # including the remote server and configure the integration tests diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml index ccb6b5b35e780..7f0026848e413 100644 --- a/build/azure-pipelines/darwin/product-build-darwin.yml +++ b/build/azure-pipelines/darwin/product-build-darwin.yml @@ -9,7 +9,7 @@ parameters: type: boolean - name: VSCODE_RUN_SMOKE_TESTS type: boolean - - name: VSCODE_BUILD_ESM + - name: VSCODE_BUILD_AMD type: boolean default: false @@ -177,7 +177,7 @@ steps: VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }} VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }} VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }} - VSCODE_BUILD_ESM: ${{ parameters.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ parameters.VSCODE_BUILD_AMD }} - ${{ elseif and(ne(parameters.VSCODE_CIBUILD, true), ne(parameters.VSCODE_QUALITY, 'oss')) }}: - task: DownloadPipelineArtifact@2 diff --git a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml index b3b505c136910..471ad903de006 100644 --- a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml +++ b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml @@ -5,7 +5,7 @@ parameters: type: boolean - name: VSCODE_ARCH type: string - - name: VSCODE_BUILD_ESM + - name: VSCODE_BUILD_AMD type: boolean default: false @@ -204,7 +204,7 @@ steps: VSCODE_RUN_UNIT_TESTS: false VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }} VSCODE_RUN_SMOKE_TESTS: false - VSCODE_BUILD_ESM: ${{ parameters.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ parameters.VSCODE_BUILD_AMD }} ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: PUBLISH_TASK_NAME: 1ES.PublishPipelineArtifact@1 diff --git a/build/azure-pipelines/linux/product-build-linux-test.yml b/build/azure-pipelines/linux/product-build-linux-test.yml index 0b358a8191419..8bdc0deca71d6 100644 --- a/build/azure-pipelines/linux/product-build-linux-test.yml +++ b/build/azure-pipelines/linux/product-build-linux-test.yml @@ -10,7 +10,7 @@ parameters: - name: PUBLISH_TASK_NAME type: string default: PublishPipelineArtifact@0 - - name: VSCODE_BUILD_ESM + - name: VSCODE_BUILD_AMD type: boolean default: false @@ -36,21 +36,21 @@ steps: - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}: - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: - - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}: - - script: ./scripts/test-esm.sh --tfs "Unit Tests" + - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}: + - script: ./scripts/test-amd.sh --tfs "Unit Tests" env: DISPLAY: ":10" - displayName: Run unit tests (Electron) [ESM] + displayName: Run unit tests (Electron) [AMD] timeoutInMinutes: 15 - - script: yarn test-node-esm - displayName: Run unit tests (node.js) [ESM] + - script: yarn test-node-amd + displayName: Run unit tests (node.js) [AMD] timeoutInMinutes: 15 - - script: yarn test-browser-esm-no-install --browser chromium --tfs "Browser Unit Tests" + - script: yarn test-browser-amd-no-install --browser chromium --tfs "Browser Unit Tests" env: DEBUG: "*browser*" - displayName: Run unit tests (Browser, Chromium) [ESM] + displayName: Run unit tests (Browser, Chromium) [AMD] timeoutInMinutes: 15 - - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}: + - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}: - script: ./scripts/test.sh --tfs "Unit Tests" env: DISPLAY: ":10" @@ -67,19 +67,19 @@ steps: - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}: - - script: ./scripts/test-esm.sh --build --tfs "Unit Tests" - displayName: Run unit tests (Electron) [ESM] + - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}: + - script: ./scripts/test-amd.sh --build --tfs "Unit Tests" + displayName: Run unit tests (Electron) [AMD] timeoutInMinutes: 15 - - script: yarn test-node-esm --build - displayName: Run unit tests (node.js) [ESM] + - script: yarn test-node-amd --build + displayName: Run unit tests (node.js) [AMD] timeoutInMinutes: 15 - - script: yarn test-browser-esm-no-install --build --browser chromium --tfs "Browser Unit Tests" + - script: yarn test-browser-amd-no-install --build --browser chromium --tfs "Browser Unit Tests" env: DEBUG: "*browser*" - displayName: Run unit tests (Browser, Chromium) [ESM] + displayName: Run unit tests (Browser, Chromium) [AMD] timeoutInMinutes: 15 - - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}: + - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}: - script: ./scripts/test.sh --build --tfs "Unit Tests" displayName: Run unit tests (Electron) timeoutInMinutes: 15 @@ -116,13 +116,13 @@ steps: - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}: - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: - - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}: - - script: ./scripts/test-integration-esm.sh --tfs "Integration Tests" + - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}: + - script: ./scripts/test-integration-amd.sh --tfs "Integration Tests" env: DISPLAY: ":10" - displayName: Run integration tests (Electron) [ESM] + displayName: Run integration tests (Electron) [AMD] timeoutInMinutes: 20 - - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}: + - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}: - script: ./scripts/test-integration.sh --tfs "Integration Tests" env: DISPLAY: ":10" @@ -138,7 +138,7 @@ steps: timeoutInMinutes: 20 - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}: + - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}: - script: | # Figure out the full absolute path of the product we just built # including the remote server and configure the integration tests @@ -148,12 +148,12 @@ steps: APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName") INTEGRATION_TEST_APP_NAME="$APP_NAME" \ INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \ - ./scripts/test-integration-esm.sh --build --tfs "Integration Tests" + ./scripts/test-integration-amd.sh --build --tfs "Integration Tests" env: VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH) - displayName: Run integration tests (Electron) [ESM] + displayName: Run integration tests (Electron) [AMD] timeoutInMinutes: 20 - - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}: + - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}: - script: | # Figure out the full absolute path of the product we just built # including the remote server and configure the integration tests diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml index 2aa304e4fba26..6753980ba3bc4 100644 --- a/build/azure-pipelines/linux/product-build-linux.yml +++ b/build/azure-pipelines/linux/product-build-linux.yml @@ -11,7 +11,7 @@ parameters: type: boolean - name: VSCODE_ARCH type: string - - name: VSCODE_BUILD_ESM + - name: VSCODE_BUILD_AMD type: boolean default: false @@ -270,7 +270,7 @@ steps: VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }} VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }} VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }} - VSCODE_BUILD_ESM: ${{ parameters.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ parameters.VSCODE_BUILD_AMD }} ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: PUBLISH_TASK_NAME: 1ES.PublishPipelineArtifact@1 diff --git a/build/azure-pipelines/product-build-pr.yml b/build/azure-pipelines/product-build-pr.yml index 7dce4d2026586..c190ee7a0a86f 100644 --- a/build/azure-pipelines/product-build-pr.yml +++ b/build/azure-pipelines/product-build-pr.yml @@ -21,6 +21,8 @@ variables: value: oss - name: VSCODE_STEP_ON_IT value: false + - name: VSCODE_BUILD_AMD + value: false jobs: - ${{ if ne(variables['VSCODE_CIBUILD'], true) }}: @@ -48,6 +50,7 @@ jobs: parameters: VSCODE_ARCH: x64 VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: true VSCODE_RUN_INTEGRATION_TESTS: false @@ -66,6 +69,7 @@ jobs: parameters: VSCODE_ARCH: x64 VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: false VSCODE_RUN_INTEGRATION_TESTS: true @@ -84,6 +88,7 @@ jobs: parameters: VSCODE_ARCH: x64 VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: false VSCODE_RUN_INTEGRATION_TESTS: false @@ -107,6 +112,7 @@ jobs: - template: win32/product-build-win32.yml@self parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_ARCH: x64 VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: true @@ -124,6 +130,7 @@ jobs: - template: win32/product-build-win32.yml@self parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_ARCH: x64 VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: false diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml index b0e495b7b7396..955d271c1d8e0 100644 --- a/build/azure-pipelines/product-build.yml +++ b/build/azure-pipelines/product-build.yml @@ -100,8 +100,8 @@ parameters: displayName: "Skip tests" type: boolean default: false - - name: VSCODE_BUILD_ESM # TODO@bpasero TODO@esm remove me once ESM is shipped - displayName: "️❗ Build as ESM (!FOR TESTING ONLY!) ️❗" + - name: VSCODE_BUILD_AMD # TODO@bpasero TODO@esm remove me once AMD is removed + displayName: "️❗ Build as AMD (!FOR EMERGENCY ONLY!) ️❗" type: boolean default: false @@ -114,8 +114,8 @@ variables: value: ${{ parameters.CARGO_REGISTRY }} - name: VSCODE_QUALITY value: ${{ parameters.VSCODE_QUALITY }} - - name: VSCODE_BUILD_ESM - value: ${{ parameters.VSCODE_BUILD_ESM }} + - name: VSCODE_BUILD_AMD + value: ${{ parameters.VSCODE_BUILD_AMD }} - name: VSCODE_BUILD_STAGE_WINDOWS value: ${{ or(eq(parameters.VSCODE_BUILD_WIN32, true), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }} - name: VSCODE_BUILD_STAGE_LINUX @@ -224,7 +224,7 @@ extends: - template: build/azure-pipelines/product-compile.yml@self parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} - ${{ if 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_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}: - stage: CompileCLI @@ -362,7 +362,7 @@ extends: - template: build/azure-pipelines/win32/product-build-win32.yml@self parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_ARCH: x64 VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: true @@ -377,7 +377,7 @@ extends: - template: build/azure-pipelines/win32/product-build-win32.yml@self parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_ARCH: x64 VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: false @@ -392,7 +392,7 @@ extends: - template: build/azure-pipelines/win32/product-build-win32.yml@self parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_ARCH: x64 VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: false @@ -408,7 +408,7 @@ extends: - template: build/azure-pipelines/win32/product-build-win32.yml@self parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_ARCH: x64 VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} @@ -432,7 +432,7 @@ extends: - template: build/azure-pipelines/win32/product-build-win32.yml@self parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_ARCH: arm64 VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: false @@ -461,7 +461,7 @@ extends: parameters: VSCODE_ARCH: x64 VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: true VSCODE_RUN_INTEGRATION_TESTS: false @@ -477,7 +477,7 @@ extends: parameters: VSCODE_ARCH: x64 VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: false VSCODE_RUN_INTEGRATION_TESTS: true @@ -493,7 +493,7 @@ extends: parameters: VSCODE_ARCH: x64 VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: false VSCODE_RUN_INTEGRATION_TESTS: false @@ -511,7 +511,7 @@ extends: parameters: VSCODE_ARCH: x64 VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} @@ -537,7 +537,7 @@ extends: parameters: VSCODE_ARCH: armhf VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: false VSCODE_RUN_INTEGRATION_TESTS: false @@ -553,7 +553,7 @@ extends: parameters: VSCODE_ARCH: arm64 VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: false VSCODE_RUN_INTEGRATION_TESTS: false @@ -578,7 +578,7 @@ extends: parameters: VSCODE_ARCH: x64 VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF_LEGACY_SERVER, true) }}: @@ -591,7 +591,7 @@ extends: parameters: VSCODE_ARCH: armhf VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_RUN_INTEGRATION_TESTS: false - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64_LEGACY_SERVER, true) }}: @@ -604,7 +604,7 @@ extends: parameters: VSCODE_ARCH: arm64 VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_RUN_INTEGRATION_TESTS: false - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_ALPINE'], true)) }}: @@ -657,7 +657,7 @@ extends: - template: build/azure-pipelines/darwin/product-build-darwin.yml@self parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: true VSCODE_RUN_INTEGRATION_TESTS: false @@ -671,7 +671,7 @@ extends: - template: build/azure-pipelines/darwin/product-build-darwin.yml@self parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: false VSCODE_RUN_INTEGRATION_TESTS: true @@ -685,7 +685,7 @@ extends: - template: build/azure-pipelines/darwin/product-build-darwin.yml@self parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: false VSCODE_RUN_INTEGRATION_TESTS: false @@ -700,7 +700,7 @@ extends: - template: build/azure-pipelines/darwin/product-build-darwin.yml@self parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: false VSCODE_RUN_INTEGRATION_TESTS: false @@ -715,7 +715,7 @@ extends: - template: build/azure-pipelines/darwin/product-build-darwin.yml@self parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} @@ -747,7 +747,7 @@ extends: - template: build/azure-pipelines/darwin/product-build-darwin.yml@self parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }} VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: false VSCODE_RUN_INTEGRATION_TESTS: false diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml index 46b5dde2492f0..4069c9956eb0a 100644 --- a/build/azure-pipelines/product-compile.yml +++ b/build/azure-pipelines/product-compile.yml @@ -1,7 +1,7 @@ parameters: - name: VSCODE_QUALITY type: string - - name: VSCODE_BUILD_ESM + - name: VSCODE_BUILD_AMD type: boolean default: false @@ -101,9 +101,9 @@ steps: - script: node build/azure-pipelines/distro/mixin-quality displayName: Mixin distro quality - - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}: - - script: node migrate.mjs --disable-watch - displayName: Migrate to ESM + - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}: + - script: node migrate.mjs --disable-watch --enable-esm-to-amd + displayName: Migrate ESM -> AMD - template: common/install-builtin-extensions.yml@self diff --git a/build/azure-pipelines/win32/product-build-win32-test.yml b/build/azure-pipelines/win32/product-build-win32-test.yml index fb3f3f4d73bc3..c1a9c7062436c 100644 --- a/build/azure-pipelines/win32/product-build-win32-test.yml +++ b/build/azure-pipelines/win32/product-build-win32-test.yml @@ -12,7 +12,7 @@ parameters: - name: PUBLISH_TASK_NAME type: string default: PublishPipelineArtifact@0 - - name: VSCODE_BUILD_ESM + - name: VSCODE_BUILD_AMD type: boolean default: false @@ -25,17 +25,17 @@ steps: - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}: - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: - - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}: - - powershell: .\scripts\test-esm.bat --tfs "Unit Tests" - displayName: Run unit tests (Electron) [ESM] + - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}: + - powershell: .\scripts\test-amd.bat --tfs "Unit Tests" + displayName: Run unit tests (Electron) [AMD] timeoutInMinutes: 15 - - powershell: yarn test-node-esm - displayName: Run unit tests (node.js) [ESM] + - powershell: yarn test-node-amd + displayName: Run unit tests (node.js) [AMD] timeoutInMinutes: 15 - - powershell: node test/unit/browser/index.esm.js --sequential --browser chromium --tfs "Browser Unit Tests" - displayName: Run unit tests (Browser, Chromium) [ESM] + - powershell: node test/unit/browser/index.amd.js --sequential --browser chromium --tfs "Browser Unit Tests" + displayName: Run unit tests (Browser, Chromium) [AMD] timeoutInMinutes: 20 - - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}: + - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}: - powershell: .\scripts\test.bat --tfs "Unit Tests" displayName: Run unit tests (Electron) timeoutInMinutes: 15 @@ -47,17 +47,17 @@ steps: timeoutInMinutes: 20 - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}: - - powershell: .\scripts\test-esm.bat --build --tfs "Unit Tests" - displayName: Run unit tests (Electron) [ESM] + - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}: + - powershell: .\scripts\test-amd.bat --build --tfs "Unit Tests" + displayName: Run unit tests (Electron) [AMD] timeoutInMinutes: 15 - - script: yarn test-node-esm --build - displayName: Run unit tests (node.js) [ESM] + - script: yarn test-node-amd --build + displayName: Run unit tests (node.js) [AMD] timeoutInMinutes: 15 - - powershell: yarn test-browser-esm-no-install --sequential --build --browser chromium --tfs "Browser Unit Tests" - displayName: Run unit tests (Browser, Chromium) [ESM] + - powershell: yarn test-browser-amd-no-install --sequential --build --browser chromium --tfs "Browser Unit Tests" + displayName: Run unit tests (Browser, Chromium) [AMD] timeoutInMinutes: 20 - - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}: + - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}: - powershell: .\scripts\test.bat --build --tfs "Unit Tests" displayName: Run unit tests (Electron) timeoutInMinutes: 15 @@ -98,17 +98,17 @@ steps: condition: succeededOrFailed() - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: - - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}: - - powershell: .\scripts\test-integration-esm.bat --tfs "Integration Tests" - displayName: Run integration tests (Electron) [ESM] + - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}: + - powershell: .\scripts\test-integration-amd.bat --tfs "Integration Tests" + displayName: Run integration tests (Electron) [AMD] timeoutInMinutes: 20 - - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}: + - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}: - powershell: .\scripts\test-integration.bat --tfs "Integration Tests" displayName: Run integration tests (Electron) timeoutInMinutes: 20 - - powershell: .\scripts\test-web-integration.bat --browser firefox - displayName: Run integration tests (Browser, Firefox) + - powershell: .\scripts\test-web-integration.bat --browser chromium + displayName: Run integration tests (Browser, Chromium) timeoutInMinutes: 20 - powershell: .\scripts\test-remote-integration.bat @@ -116,7 +116,7 @@ steps: timeoutInMinutes: 20 - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}: + - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}: - powershell: | # Figure out the full absolute path of the product we just built # including the remote server and configure the integration tests @@ -128,10 +128,10 @@ steps: $AppNameShort = $AppProductJson.nameShort $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe" $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-server-win32-$(VSCODE_ARCH)" - exec { .\scripts\test-integration-esm.bat --build --tfs "Integration Tests" } - displayName: Run integration tests (Electron) [ESM] + exec { .\scripts\test-integration-amd.bat --build --tfs "Integration Tests" } + displayName: Run integration tests (Electron) [AMD] timeoutInMinutes: 20 - - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}: + - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}: - powershell: | # Figure out the full absolute path of the product we just built # including the remote server and configure the integration tests diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml index a67e0ccf4e32d..248533654a66d 100644 --- a/build/azure-pipelines/win32/product-build-win32.yml +++ b/build/azure-pipelines/win32/product-build-win32.yml @@ -11,7 +11,7 @@ parameters: type: boolean - name: VSCODE_RUN_SMOKE_TESTS type: boolean - - name: VSCODE_BUILD_ESM + - name: VSCODE_BUILD_AMD type: boolean default: false @@ -182,7 +182,7 @@ steps: VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }} VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }} VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }} - VSCODE_BUILD_ESM: ${{ parameters.VSCODE_BUILD_ESM }} + VSCODE_BUILD_AMD: ${{ parameters.VSCODE_BUILD_AMD }} ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: PUBLISH_TASK_NAME: 1ES.PublishPipelineArtifact@1 diff --git a/build/buildfile.js b/build/buildfile.js index 74ac8436ccf1e..2ecda819e8296 100644 --- a/build/buildfile.js +++ b/build/buildfile.js @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -const { isESM } = require('./lib/esm'); +const { isAMD } = require('./lib/amd'); /** * @param {string} name @@ -71,7 +71,7 @@ exports.workerOutputLinks = createEditorWorkerModuleDescription('vs/workbench/co exports.workerBackgroundTokenization = createEditorWorkerModuleDescription('vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker'); exports.workbenchDesktop = function () { - return isESM() ? [ + return !isAMD() ? [ createModuleDescription('vs/workbench/contrib/debug/node/telemetryApp'), createModuleDescription('vs/platform/files/node/watcher/watcherMain'), createModuleDescription('vs/platform/terminal/node/ptyHostMain'), @@ -90,7 +90,7 @@ exports.workbenchDesktop = function () { }; exports.workbenchWeb = function () { - return isESM() ? [ + return !isAMD() ? [ createModuleDescription('vs/workbench/workbench.web.main') ] : [ ...createEditorWorkerModuleDescription('vs/workbench/contrib/output/common/outputLinkComputer'), diff --git a/build/darwin/create-universal-app.js b/build/darwin/create-universal-app.js index fe825b1369a73..1395536dbbc27 100644 --- a/build/darwin/create-universal-app.js +++ b/build/darwin/create-universal-app.js @@ -9,7 +9,7 @@ const fs = require("fs"); const minimatch = require("minimatch"); const vscode_universal_bundler_1 = require("vscode-universal-bundler"); const cross_spawn_promise_1 = require("@malept/cross-spawn-promise"); -const esm_1 = require("../lib/esm"); +const amd_1 = require("../lib/amd"); const root = path.dirname(path.dirname(__dirname)); async function main(buildDir) { const arch = process.env['VSCODE_ARCH']; @@ -27,7 +27,7 @@ async function main(buildDir) { '**/CodeResources', '**/Credits.rtf', ]; - const canAsar = !(0, esm_1.isESM)('ASAR disabled in universal build'); // TODO@esm ASAR disabled in ESM + const canAsar = (0, amd_1.isAMD)(); // TODO@esm ASAR disabled in ESM await (0, vscode_universal_bundler_1.makeUniversalApp)({ x64AppPath, arm64AppPath, diff --git a/build/darwin/create-universal-app.ts b/build/darwin/create-universal-app.ts index 6ece5868c86da..1f0d228fc9e95 100644 --- a/build/darwin/create-universal-app.ts +++ b/build/darwin/create-universal-app.ts @@ -8,7 +8,7 @@ import * as fs from 'fs'; import * as minimatch from 'minimatch'; import { makeUniversalApp } from 'vscode-universal-bundler'; import { spawn } from '@malept/cross-spawn-promise'; -import { isESM } from '../lib/esm'; +import { isAMD } from '../lib/amd'; const root = path.dirname(path.dirname(__dirname)); @@ -32,7 +32,7 @@ async function main(buildDir?: string) { '**/Credits.rtf', ]; - const canAsar = !isESM('ASAR disabled in universal build'); // TODO@esm ASAR disabled in ESM + const canAsar = isAMD(); // TODO@esm ASAR disabled in ESM await makeUniversalApp({ x64AppPath, diff --git a/build/gulpfile.compile.js b/build/gulpfile.compile.js index c6d7bbded9387..a8d8fb094b2da 100644 --- a/build/gulpfile.compile.js +++ b/build/gulpfile.compile.js @@ -9,12 +9,12 @@ const gulp = require('gulp'); const util = require('./lib/util'); const date = require('./lib/date'); -const esm = require('./lib/esm'); +const amd = require('./lib/amd'); const task = require('./lib/task'); const compilation = require('./lib/compilation'); const optimize = require('./lib/optimize'); -const isESMBuild = typeof process.env.VSCODE_BUILD_ESM === 'string' && process.env.VSCODE_BUILD_ESM.toLowerCase() === 'true'; +const isAMDBuild = typeof process.env.VSCODE_BUILD_AMD === 'string' && process.env.VSCODE_BUILD_AMD.toLowerCase() === 'true'; /** * @param {boolean} disableMangle @@ -24,9 +24,9 @@ function makeCompileBuildTask(disableMangle) { util.rimraf('out-build'), util.buildWebNodePaths('out-build'), date.writeISODate('out-build'), - esm.setESM(isESMBuild), + amd.setAMD(isAMDBuild), compilation.compileApiProposalNamesTask, - compilation.compileTask(isESMBuild ? 'src2' : 'src', 'out-build', true, { disableMangle }), + compilation.compileTask(isAMDBuild ? 'src2' : 'src', 'out-build', true, { disableMangle }), optimize.optimizeLoaderTask('out-build', 'out-build', true) ); } diff --git a/build/gulpfile.js b/build/gulpfile.js index 785719d3e14c9..5f7b71a40f22a 100644 --- a/build/gulpfile.js +++ b/build/gulpfile.js @@ -34,15 +34,15 @@ gulp.task(compileClientTask); const watchClientTask = task.define('watch-client', task.series(util.rimraf('out'), util.buildWebNodePaths('out'), task.parallel(watchTask('out', false), watchApiProposalNamesTask))); gulp.task(watchClientTask); -const watchClientESMTask = task.define('watch-client-esm', task.series(util.rimraf('out'), util.buildWebNodePaths('out'), task.parallel(watchTask('out', false, 'src2'), watchApiProposalNamesTask))); -gulp.task(watchClientESMTask); +const watchClientAMDTask = task.define('watch-client-amd', task.series(util.rimraf('out'), util.buildWebNodePaths('out'), task.parallel(watchTask('out', false, 'src2'), watchApiProposalNamesTask))); +gulp.task(watchClientAMDTask); // All const _compileTask = task.define('compile', task.parallel(monacoTypecheckTask, compileClientTask, compileExtensionsTask, compileExtensionMediaTask)); gulp.task(_compileTask); gulp.task(task.define('watch', task.parallel(/* monacoTypecheckWatchTask, */ watchClientTask, watchExtensionsTask))); -gulp.task(task.define('watch-esm', task.parallel(/* monacoTypecheckWatchTask, */ watchClientESMTask, watchExtensionsTask))); +gulp.task(task.define('watch-amd', task.parallel(/* monacoTypecheckWatchTask, */ watchClientAMDTask, watchExtensionsTask))); // Default gulp.task('default', _compileTask); diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js index e12a33e670fa5..409d89ed8d94a 100644 --- a/build/gulpfile.reh.js +++ b/build/gulpfile.reh.js @@ -31,7 +31,7 @@ const { compileExtensionsBuildTask, compileExtensionMediaBuildTask } = require(' const { vscodeWebResourceIncludes, createVSCodeWebFileContentMapper } = require('./gulpfile.vscode.web'); const cp = require('child_process'); const log = require('fancy-log'); -const { isESM } = require('./lib/esm'); +const { isAMD } = require('./lib/amd'); const buildfile = require('./buildfile'); const REPO_ROOT = path.dirname(__dirname); @@ -88,7 +88,7 @@ const serverResources = [ ...serverResourceExcludes ]; -const serverWithWebResourceIncludes = isESM() ? [ +const serverWithWebResourceIncludes = !isAMD() ? [ ...serverResourceIncludes, 'out-build/vs/code/browser/workbench/*.html', ...vscodeWebResourceIncludes @@ -131,7 +131,7 @@ const serverEntryPoints = [ } ]; -const webEntryPoints = isESM() ? [ +const webEntryPoints = !isAMD() ? [ buildfile.base, buildfile.workerExtensionHost, buildfile.workerNotebook, @@ -343,7 +343,7 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa let packageJsonContents; const packageJsonStream = gulp.src(['remote/package.json'], { base: 'remote' }) - .pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined, ...(isESM(`Setting 'type: module' in top level package.json`) ? { type: 'module' } : {}) })) // TODO@esm this should be configured in the top level package.json + .pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined, ...(!isAMD() ? { type: 'module' } : {}) })) // TODO@esm this should be configured in the top level package.json .pipe(es.through(function (file) { packageJsonContents = file.contents.toString(); this.emit('data', file); diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index 7841bb9088724..0e55b86ab99a8 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -33,12 +33,12 @@ const minimist = require('minimist'); const { compileBuildTask } = require('./gulpfile.compile'); const { compileExtensionsBuildTask, compileExtensionMediaBuildTask } = require('./gulpfile.extensions'); const { promisify } = require('util'); -const { isESM } = require('./lib/esm'); +const { isAMD } = require('./lib/amd'); const glob = promisify(require('glob')); const rcedit = promisify(require('rcedit')); // Build -const vscodeEntryPoints = isESM() ? [ +const vscodeEntryPoints = !isAMD() ? [ buildfile.base, buildfile.workerExtensionHost, buildfile.workerNotebook, @@ -61,7 +61,7 @@ const vscodeEntryPoints = isESM() ? [ buildfile.code ].flat(); -const vscodeResourceIncludes = isESM() ? [ +const vscodeResourceIncludes = !isAMD() ? [ // NLS 'out-build/nls.messages.json', @@ -163,7 +163,7 @@ const vscodeResources = [ // be inlined into the target window file in this order // and they depend on each other in this way. const windowBootstrapFiles = []; -if (!isESM('Skipping loader.js in window bootstrap files')) { +if (isAMD()) { windowBootstrapFiles.push('out-build/vs/loader.js'); } windowBootstrapFiles.push('out-build/bootstrap-window.js'); @@ -296,7 +296,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op 'vs/workbench/workbench.desktop.main.js', 'vs/workbench/workbench.desktop.main.css', 'vs/workbench/api/node/extensionHostProcess.js', - isESM() ? 'vs/code/electron-sandbox/workbench/workbench.esm.html' : 'vs/code/electron-sandbox/workbench/workbench.html', + !isAMD() ? 'vs/code/electron-sandbox/workbench/workbench.esm.html' : 'vs/code/electron-sandbox/workbench/workbench.html', 'vs/code/electron-sandbox/workbench/workbench.js' ]); @@ -325,13 +325,8 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op version += '-' + quality; } - if (isESM() && typeof quality === 'string' && quality !== 'exploration') { - // TODO@esm remove this safeguard - throw new Error('Refuse to build ESM on quality other than exploration'); - } - const name = product.nameShort; - const packageJsonUpdates = { name, version, ...(isESM(`Setting 'type: module' and 'main: out/main.js' in top level package.json`) ? { type: 'module', main: 'out/main.js' } : {}) }; // TODO@esm this should be configured in the top level package.json + const packageJsonUpdates = { name, version, ...(!isAMD() ? { type: 'module', main: 'out/main.js' } : {}) }; // TODO@esm this should be configured in the top level package.json // for linux url handling if (platform === 'linux') { @@ -374,7 +369,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op .pipe(util.rewriteSourceMappingURL(sourceMappingURLBase)) .pipe(jsFilter.restore); - if (!isESM('ASAR disabled in VS Code builds')) { // TODO@esm: ASAR disabled in ESM + if (isAMD()) { // TODO@esm: ASAR disabled in ESM deps = deps.pipe(createAsar(path.join(process.cwd(), 'node_modules'), [ '**/*.node', '**/@vscode/ripgrep/bin/*', diff --git a/build/gulpfile.vscode.web.js b/build/gulpfile.vscode.web.js index b6a26fc484542..085ed1e2b347c 100644 --- a/build/gulpfile.vscode.web.js +++ b/build/gulpfile.vscode.web.js @@ -21,7 +21,7 @@ const vfs = require('vinyl-fs'); const packageJson = require('../package.json'); const { compileBuildTask } = require('./gulpfile.compile'); const extensions = require('./lib/extensions'); -const { isESM } = require('./lib/esm'); +const { isAMD } = require('./lib/amd'); const REPO_ROOT = path.dirname(__dirname); const BUILD_ROOT = path.dirname(REPO_ROOT); @@ -31,7 +31,7 @@ const commit = getVersion(REPO_ROOT); const quality = product.quality; const version = (quality && quality !== 'stable') ? `${packageJson.version}-${quality}` : packageJson.version; -const vscodeWebResourceIncludes = isESM() ? [ +const vscodeWebResourceIncludes = !isAMD() ? [ // NLS 'out-build/nls.messages.js', @@ -96,7 +96,7 @@ const vscodeWebResources = [ const buildfile = require('./buildfile'); -const vscodeWebEntryPoints = isESM() ? [ +const vscodeWebEntryPoints = !isAMD() ? [ buildfile.base, buildfile.workerExtensionHost, buildfile.workerNotebook, diff --git a/build/lib/esm.js b/build/lib/amd.js similarity index 59% rename from build/lib/esm.js rename to build/lib/amd.js index db2683445a2be..8d4e428f830cf 100644 --- a/build/lib/esm.js +++ b/build/lib/amd.js @@ -4,33 +4,33 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ Object.defineProperty(exports, "__esModule", { value: true }); -exports.setESM = setESM; -exports.isESM = isESM; +exports.setAMD = setAMD; +exports.isAMD = isAMD; const path = require("path"); const fs = require("fs"); // TODO@esm remove this const outDirectory = path.join(__dirname, '..', '..', 'out-build'); -const esmMarkerFile = path.join(outDirectory, 'esm'); -function setESM(enabled) { +const amdMarkerFile = path.join(outDirectory, 'amd'); +function setAMD(enabled) { const result = () => new Promise((resolve, _) => { if (enabled) { fs.mkdirSync(outDirectory, { recursive: true }); - fs.writeFileSync(esmMarkerFile, 'true', 'utf8'); - console.warn(`Setting build to ESM: true`); + fs.writeFileSync(amdMarkerFile, 'true', 'utf8'); + console.warn(`Setting build to AMD: true`); } else { - console.warn(`Setting build to ESM: false`); + console.warn(`Setting build to AMD: false`); } resolve(); }); - result.taskName = 'set-esm'; + result.taskName = 'set-amd'; return result; } -function isESM(logWarning) { +function isAMD(logWarning) { try { - const res = (typeof process.env.VSCODE_BUILD_ESM === 'string' && process.env.VSCODE_BUILD_ESM.toLowerCase() === 'true') || (fs.readFileSync(esmMarkerFile, 'utf8') === 'true'); + const res = (typeof process.env.VSCODE_BUILD_AMD === 'string' && process.env.VSCODE_BUILD_AMD.toLowerCase() === 'true') || (fs.readFileSync(amdMarkerFile, 'utf8') === 'true'); if (res && logWarning) { - console.warn(`[esm] ${logWarning}`); + console.warn(`[amd] ${logWarning}`); } return res; } @@ -38,4 +38,4 @@ function isESM(logWarning) { return false; } } -//# sourceMappingURL=esm.js.map \ No newline at end of file +//# sourceMappingURL=amd.js.map \ No newline at end of file diff --git a/build/lib/esm.ts b/build/lib/amd.ts similarity index 58% rename from build/lib/esm.ts rename to build/lib/amd.ts index 2fc5215e28487..5373024c6a059 100644 --- a/build/lib/esm.ts +++ b/build/lib/amd.ts @@ -9,29 +9,29 @@ import * as fs from 'fs'; // TODO@esm remove this const outDirectory = path.join(__dirname, '..', '..', 'out-build'); -const esmMarkerFile = path.join(outDirectory, 'esm'); +const amdMarkerFile = path.join(outDirectory, 'amd'); -export function setESM(enabled: boolean) { +export function setAMD(enabled: boolean) { const result = () => new Promise((resolve, _) => { if (enabled) { fs.mkdirSync(outDirectory, { recursive: true }); - fs.writeFileSync(esmMarkerFile, 'true', 'utf8'); - console.warn(`Setting build to ESM: true`); + fs.writeFileSync(amdMarkerFile, 'true', 'utf8'); + console.warn(`Setting build to AMD: true`); } else { - console.warn(`Setting build to ESM: false`); + console.warn(`Setting build to AMD: false`); } resolve(); }); - result.taskName = 'set-esm'; + result.taskName = 'set-amd'; return result; } -export function isESM(logWarning?: string): boolean { +export function isAMD(logWarning?: string): boolean { try { - const res = (typeof process.env.VSCODE_BUILD_ESM === 'string' && process.env.VSCODE_BUILD_ESM.toLowerCase() === 'true') || (fs.readFileSync(esmMarkerFile, 'utf8') === 'true'); + const res = (typeof process.env.VSCODE_BUILD_AMD === 'string' && process.env.VSCODE_BUILD_AMD.toLowerCase() === 'true') || (fs.readFileSync(amdMarkerFile, 'utf8') === 'true'); if (res && logWarning) { - console.warn(`[esm] ${logWarning}`); + console.warn(`[amd] ${logWarning}`); } return res; } catch (error) { diff --git a/build/lib/layersChecker.js b/build/lib/layersChecker.js index 7c7fd3bc5fd4b..d734195421ffa 100644 --- a/build/lib/layersChecker.js +++ b/build/lib/layersChecker.js @@ -72,6 +72,7 @@ const CORE_TYPES = [ '__global', 'PerformanceMark', 'PerformanceObserver', + 'ImportMeta' ]; // Types that are defined in a common layer but are known to be only // available in native environments should not be allowed in browser diff --git a/build/lib/layersChecker.ts b/build/lib/layersChecker.ts index 60939fe275021..02d501d6478fa 100644 --- a/build/lib/layersChecker.ts +++ b/build/lib/layersChecker.ts @@ -73,6 +73,7 @@ const CORE_TYPES = [ '__global', 'PerformanceMark', 'PerformanceObserver', + 'ImportMeta' ]; // Types that are defined in a common layer but are known to be only diff --git a/build/lib/mangle/index.js b/build/lib/mangle/index.js index f72d299930b88..f429712f10076 100644 --- a/build/lib/mangle/index.js +++ b/build/lib/mangle/index.js @@ -14,7 +14,7 @@ const ts = require("typescript"); const url_1 = require("url"); const workerpool = require("workerpool"); const staticLanguageServiceHost_1 = require("./staticLanguageServiceHost"); -const esm_1 = require("../esm"); +const amd_1 = require("../amd"); const buildfile = require('../../buildfile'); class ShortIdent { prefix; @@ -264,7 +264,7 @@ const skippedExportMangledFiles = function () { // Module passed around as type 'pfs', // entry points - ...(0, esm_1.isESM)() ? [ + ...!(0, amd_1.isAMD)() ? [ buildfile.entrypoint('vs/server/node/server.main'), buildfile.base, buildfile.workerExtensionHost, diff --git a/build/lib/mangle/index.ts b/build/lib/mangle/index.ts index 7b6c6d2084360..ecede4cc10801 100644 --- a/build/lib/mangle/index.ts +++ b/build/lib/mangle/index.ts @@ -12,7 +12,7 @@ import * as ts from 'typescript'; import { pathToFileURL } from 'url'; import * as workerpool from 'workerpool'; import { StaticLanguageServiceHost } from './staticLanguageServiceHost'; -import { isESM } from '../esm'; +import { isAMD } from '../amd'; const buildfile = require('../../buildfile'); class ShortIdent { @@ -280,7 +280,7 @@ function isNameTakenInFile(node: ts.Node, name: string): boolean { return false; } -const skippedExportMangledFiles = function () { // using a function() to ensure late isESM() check +const skippedExportMangledFiles = function () { // using a function() to ensure late isAMD() check return [ // Build 'css.build', @@ -300,7 +300,7 @@ const skippedExportMangledFiles = function () { // using a function() to ensure 'pfs', // entry points - ...isESM() ? [ + ...!isAMD() ? [ buildfile.entrypoint('vs/server/node/server.main'), buildfile.base, buildfile.workerExtensionHost, diff --git a/build/lib/nls.js b/build/lib/nls.js index 3fc4ba3ed618e..03d9cd62b3d4a 100644 --- a/build/lib/nls.js +++ b/build/lib/nls.js @@ -11,7 +11,7 @@ const File = require("vinyl"); const sm = require("source-map"); const path = require("path"); const sort = require("gulp-sort"); -const esm_1 = require("./esm"); +const amd_1 = require("./amd"); var CollectStepResult; (function (CollectStepResult) { CollectStepResult[CollectStepResult["Yes"] = 0] = "Yes"; @@ -171,7 +171,7 @@ var _nls; .map(n => n) .filter(d => d.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference) .filter(d => { - if ((0, esm_1.isESM)()) { + if (!(0, amd_1.isAMD)()) { return d.moduleReference.expression.getText().endsWith(`/nls.js'`); } return d.moduleReference.expression.getText() === '\'vs/nls\''; @@ -182,7 +182,7 @@ var _nls; .map(n => n) .filter(d => d.moduleSpecifier.kind === ts.SyntaxKind.StringLiteral) .filter(d => { - if ((0, esm_1.isESM)()) { + if (!(0, amd_1.isAMD)()) { return d.moduleSpecifier.getText().endsWith(`/nls.js'`); } return d.moduleSpecifier.getText() === '\'vs/nls\''; diff --git a/build/lib/nls.ts b/build/lib/nls.ts index 0a60f74a7701d..d7ee2e61a926f 100644 --- a/build/lib/nls.ts +++ b/build/lib/nls.ts @@ -10,7 +10,7 @@ import * as File from 'vinyl'; import * as sm from 'source-map'; import * as path from 'path'; import * as sort from 'gulp-sort'; -import { isESM } from './esm'; +import { isAMD } from './amd'; declare class FileSourceMap extends File { public sourceMap: sm.RawSourceMap; @@ -233,7 +233,7 @@ module _nls { .map(n => n) .filter(d => d.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference) .filter(d => { - if (isESM()) { + if (!isAMD()) { return (d.moduleReference).expression.getText().endsWith(`/nls.js'`); } return (d.moduleReference).expression.getText() === '\'vs/nls\''; @@ -245,7 +245,7 @@ module _nls { .map(n => n) .filter(d => d.moduleSpecifier.kind === ts.SyntaxKind.StringLiteral) .filter(d => { - if (isESM()) { + if (!isAMD()) { return d.moduleSpecifier.getText().endsWith(`/nls.js'`); } return d.moduleSpecifier.getText() === '\'vs/nls\''; diff --git a/build/lib/optimize.js b/build/lib/optimize.js index fdf738576c2d9..51cd2f25c594d 100644 --- a/build/lib/optimize.js +++ b/build/lib/optimize.js @@ -25,7 +25,7 @@ const util = require("./util"); const postcss_1 = require("./postcss"); const esbuild = require("esbuild"); const sourcemaps = require("gulp-sourcemaps"); -const esm_1 = require("./esm"); +const amd_1 = require("./amd"); const REPO_ROOT_PATH = path.join(__dirname, '../..'); function log(prefix, message) { fancyLog(ansiColors.cyan('[' + prefix + ']'), message); @@ -344,7 +344,7 @@ function optimizeLoaderTask(src, out, bundleLoader, bundledFileHeader = '', exte function optimizeTask(opts) { return function () { const optimizers = []; - if ((0, esm_1.isESM)('Running optimizer in ESM mode')) { + if (!(0, amd_1.isAMD)()) { optimizers.push(optimizeESMTask(opts.amd, opts.commonJS)); } else { diff --git a/build/lib/optimize.ts b/build/lib/optimize.ts index c750321345645..e57122731f815 100644 --- a/build/lib/optimize.ts +++ b/build/lib/optimize.ts @@ -20,7 +20,7 @@ import * as util from './util'; import { gulpPostcss } from './postcss'; import * as esbuild from 'esbuild'; import * as sourcemaps from 'gulp-sourcemaps'; -import { isESM } from './esm'; +import { isAMD } from './amd'; const REPO_ROOT_PATH = path.join(__dirname, '../..'); @@ -504,7 +504,7 @@ export interface IOptimizeTaskOpts { export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStream { return function () { const optimizers: NodeJS.ReadWriteStream[] = []; - if (isESM('Running optimizer in ESM mode')) { + if (!isAMD()) { optimizers.push(optimizeESMTask(opts.amd, opts.commonJS)); } else { optimizers.push(optimizeAMDTask(opts.amd)); diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js index 21c4236aadcc2..5d4bb828382e1 100644 --- a/build/linux/dependencies-generator.js +++ b/build/linux/dependencies-generator.js @@ -15,7 +15,7 @@ const dep_lists_2 = require("./rpm/dep-lists"); const types_1 = require("./debian/types"); const types_2 = require("./rpm/types"); const product = require("../../product.json"); -const esm_1 = require("../lib/esm"); +const amd_1 = require("../lib/amd"); // A flag that can easily be toggled. // Make sure to compile the build directory after toggling the value. // If false, we warn about new dependencies if they show up @@ -44,7 +44,7 @@ async function getDependencies(packageType, buildDir, applicationName, arch) { throw new Error('Invalid RPM arch string ' + arch); } // Get the files for which we want to find dependencies. - const canAsar = !(0, esm_1.isESM)('ASAR disabled in Linux builds'); // TODO@esm ASAR disabled in ESM + const canAsar = (0, amd_1.isAMD)(); // TODO@esm ASAR disabled in ESM const nativeModulesPath = path.join(buildDir, 'resources', 'app', canAsar ? 'node_modules.asar.unpacked' : 'node_modules'); const findResult = (0, child_process_1.spawnSync)('find', [nativeModulesPath, '-name', '*.node']); if (findResult.status) { diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts index 45eeab4d7aafe..d390818dc54a7 100644 --- a/build/linux/dependencies-generator.ts +++ b/build/linux/dependencies-generator.ts @@ -15,7 +15,7 @@ import { referenceGeneratedDepsByArch as rpmGeneratedDeps } from './rpm/dep-list import { DebianArchString, isDebianArchString } from './debian/types'; import { isRpmArchString, RpmArchString } from './rpm/types'; import product = require('../../product.json'); -import { isESM } from '../lib/esm'; +import { isAMD } from '../lib/amd'; // A flag that can easily be toggled. // Make sure to compile the build directory after toggling the value. @@ -48,7 +48,7 @@ export async function getDependencies(packageType: 'deb' | 'rpm', buildDir: stri } // Get the files for which we want to find dependencies. - const canAsar = !isESM('ASAR disabled in Linux builds'); // TODO@esm ASAR disabled in ESM + const canAsar = isAMD(); // TODO@esm ASAR disabled in ESM const nativeModulesPath = path.join(buildDir, 'resources', 'app', canAsar ? 'node_modules.asar.unpacked' : 'node_modules'); const findResult = spawnSync('find', [nativeModulesPath, '-name', '*.node']); if (findResult.status) { diff --git a/migrate.mjs b/migrate.mjs index 95b0e3d6434c1..27c641e0a012d 100644 --- a/migrate.mjs +++ b/migrate.mjs @@ -59,9 +59,9 @@ function migrate() { } console.log(`~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`); - console.log(`COMPLETED ${amdToEsm ? 'AMD->ESM' : 'ESM->AMD'} MIGRATION of ${enableInPlace ? 'src in-place' : 'src to src2'}. You can now launch yarn watch-esm or yarn watch-client-esm`); - if (amdToEsm) { - console.log(`Make sure to set the environment variable VSCODE_BUILD_ESM to a string of value 'true' if you want to build VS Code`); + console.log(`COMPLETED ${amdToEsm ? 'AMD->ESM' : 'ESM->AMD'} MIGRATION of ${enableInPlace ? 'src in-place' : 'src to src2'}. You can now launch yarn watch-amd or yarn watch-client-amd`); + if (esmToAmd) { + console.log(`Make sure to set the environment variable VSCODE_BUILD_AMD to a string of value 'true' if you want to build VS Code as AMD`); } if (watchSrc) { diff --git a/package.json b/package.json index 2ff61bb3740ee..79056b9148d59 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "code-oss-dev", - "version": "1.93.0", + "version": "1.94.0", "distro": "2560b0e8d341a0b6734d28ef71b08e1920ff2501", "author": { "name": "Microsoft Corporation" @@ -11,17 +11,17 @@ "scripts": { "test": "echo Please run any of the test scripts from the scripts folder.", "test-browser": "npx playwright install && node test/unit/browser/index.js", - "test-browser-esm": "npx playwright install && node test/unit/browser/index.esm.js", + "test-browser-amd": "npx playwright install && node test/unit/browser/index.amd.js", "test-browser-no-install": "node test/unit/browser/index.js", - "test-browser-esm-no-install": "node test/unit/browser/index.esm.js", - "test-node": "mocha test/unit/node/index.js --delay --ui=tdd --timeout=5000 --exit", - "test-node-esm": "mocha test/unit/node/index.mjs --delay --ui=tdd --timeout=5000 --exit", + "test-browser-amd-no-install": "node test/unit/browser/index.amd.js", + "test-node": "mocha test/unit/node/index.mjs --delay --ui=tdd --timeout=5000 --exit", + "test-node-amd": "mocha test/unit/node/index.amd.js --delay --ui=tdd --timeout=5000 --exit", "test-extension": "vscode-test", "preinstall": "node build/npm/preinstall.js", "postinstall": "node build/npm/postinstall.js", "compile": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js compile", "watch": "npm-run-all -lp watch-client watch-extensions", - "watch-esm": "npm-run-all -lp watch-client-esm watch-extensions", + "watch-amd": "npm-run-all -lp watch-client-amd watch-extensions", "watchd": "deemon yarn watch", "watch-webd": "deemon yarn watch-web", "kill-watchd": "deemon --kill yarn watch", @@ -29,7 +29,7 @@ "restart-watchd": "deemon --restart yarn watch", "restart-watch-webd": "deemon --restart yarn watch-web", "watch-client": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js watch-client", - "watch-client-esm": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js watch-client-esm", + "watch-client-amd": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js watch-client-amd", "watch-clientd": "deemon yarn watch-client", "kill-watch-clientd": "deemon --kill yarn watch-client", "watch-extensions": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js watch-extensions watch-extension-media", diff --git a/scripts/code-web.js b/scripts/code-web.js index 42fa65aaa4c0e..f2dc1ff046bdb 100644 --- a/scripts/code-web.js +++ b/scripts/code-web.js @@ -74,7 +74,7 @@ async function main() { openSystemBrowser = true; } - if (fs.existsSync(path.join(APP_ROOT, 'src2')) || fs.existsSync(path.join(APP_ROOT, 'out-build', 'esm'))) { + if (!fs.existsSync(path.join(APP_ROOT, 'src2')) && !fs.existsSync(path.join(APP_ROOT, 'out-build', 'amd'))) { serverArgs.push('--esm'); } diff --git a/scripts/test-esm.bat b/scripts/test-amd.bat similarity index 91% rename from scripts/test-esm.bat rename to scripts/test-amd.bat index faeff79007b4c..4ecd8a43400be 100644 --- a/scripts/test-esm.bat +++ b/scripts/test-amd.bat @@ -17,7 +17,7 @@ if %errorlevel% neq 0 node .\node_modules\gulp\bin\gulp.js electron :: Run tests set ELECTRON_ENABLE_LOGGING=1 -%CODE% .\test\unit\electron\index.esm.js --crash-reporter-directory=%~dp0\..\.build\crashes %* +%CODE% .\test\unit\electron\index.amd.js --crash-reporter-directory=%~dp0\..\.build\crashes %* popd diff --git a/scripts/test-esm.sh b/scripts/test-amd.sh similarity index 89% rename from scripts/test-esm.sh rename to scripts/test-amd.sh index ddb619017a6f5..535bbb7c56e7c 100755 --- a/scripts/test-esm.sh +++ b/scripts/test-amd.sh @@ -34,10 +34,10 @@ if [[ "$OSTYPE" == "darwin"* ]]; then cd $ROOT ; ulimit -n 4096 ; \ ELECTRON_ENABLE_LOGGING=1 \ "$CODE" \ - test/unit/electron/index.esm.js --crash-reporter-directory=$VSCODECRASHDIR "$@" + test/unit/electron/index.amd.js --crash-reporter-directory=$VSCODECRASHDIR "$@" else cd $ROOT ; \ ELECTRON_ENABLE_LOGGING=1 \ "$CODE" \ - test/unit/electron/index.esm.js --crash-reporter-directory=$VSCODECRASHDIR $LINUX_EXTRA_ARGS "$@" + test/unit/electron/index.amd.js --crash-reporter-directory=$VSCODECRASHDIR $LINUX_EXTRA_ARGS "$@" fi diff --git a/scripts/test-integration-esm.bat b/scripts/test-integration-amd.bat similarity index 98% rename from scripts/test-integration-esm.bat rename to scripts/test-integration-amd.bat index 0d12b225179ef..60d5c50077ed1 100644 --- a/scripts/test-integration-esm.bat +++ b/scripts/test-integration-amd.bat @@ -29,7 +29,7 @@ echo Storing log files into '%VSCODELOGSDIR%'. echo. echo ### node.js integration tests -call .\scripts\test-esm.bat --runGlob **\*.integrationTest.js %* +call .\scripts\test-amd.bat --runGlob **\*.integrationTest.js %* if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/scripts/test-integration-esm.sh b/scripts/test-integration-amd.sh similarity index 98% rename from scripts/test-integration-esm.sh rename to scripts/test-integration-amd.sh index dde3bc0520d3c..9b0ce9bbccc43 100755 --- a/scripts/test-integration-esm.sh +++ b/scripts/test-integration-amd.sh @@ -39,7 +39,7 @@ echo "Storing log files into '$VSCODELOGSDIR'." echo echo "### node.js integration tests" echo -./scripts/test-esm.sh --runGlob **/*.integrationTest.js "$@" +./scripts/test-amd.sh --runGlob **/*.integrationTest.js "$@" # Tests in the extension host diff --git a/src/bootstrap-amd.js b/src/bootstrap-amd.js index 344557c1011fb..a59427a5482ae 100644 --- a/src/bootstrap-amd.js +++ b/src/bootstrap-amd.js @@ -12,37 +12,37 @@ */ // ESM-uncomment-begin -// import * as path from 'path'; -// import * as fs from 'fs'; -// import { fileURLToPath } from 'url'; -// import { createRequire, register } from 'node:module'; -// import { product, pkg } from './bootstrap-meta.js'; -// import './bootstrap-node.js'; -// import * as performance from './vs/base/common/performance.js'; -// -// const require = createRequire(import.meta.url); -// /** @type any */ -// const module = { exports: {} }; -// const __dirname = path.dirname(fileURLToPath(import.meta.url)); -// -// // Install a hook to module resolution to map 'fs' to 'original-fs' -// if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) { -// const jsCode = ` -// export async function resolve(specifier, context, nextResolve) { -// if (specifier === 'fs') { -// return { -// format: 'builtin', -// shortCircuit: true, -// url: 'node:original-fs' -// }; -// } - -// // Defer to the next hook in the chain, which would be the -// // Node.js default resolve if this is the last user-specified loader. -// return nextResolve(specifier, context); -// }`; -// register(`data:text/javascript;base64,${Buffer.from(jsCode).toString('base64')}`, import.meta.url); -// } +import * as path from 'path'; +import * as fs from 'fs'; +import { fileURLToPath } from 'url'; +import { createRequire, register } from 'node:module'; +import { product, pkg } from './bootstrap-meta.js'; +import './bootstrap-node.js'; +import * as performance from './vs/base/common/performance.js'; + +const require = createRequire(import.meta.url); +/** @type any */ +const module = { exports: {} }; +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + +// Install a hook to module resolution to map 'fs' to 'original-fs' +if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) { + const jsCode = ` + export async function resolve(specifier, context, nextResolve) { + if (specifier === 'fs') { + return { + format: 'builtin', + shortCircuit: true, + url: 'node:original-fs' + }; + } + + // Defer to the next hook in the chain, which would be the + // Node.js default resolve if this is the last user-specified loader. + return nextResolve(specifier, context); + }`; + register(`data:text/javascript;base64,${Buffer.from(jsCode).toString('base64')}`, import.meta.url); +} // ESM-uncomment-end // Store the node.js require function in a variable @@ -56,10 +56,10 @@ globalThis._VSCODE_NODE_MODULES = new Proxy(Object.create(null), { get: (_target // VSCODE_GLOBALS: package/product.json /** @type Partial */ // ESM-comment-begin -globalThis._VSCODE_PRODUCT_JSON = require('./bootstrap-meta').product; +// globalThis._VSCODE_PRODUCT_JSON = require('./bootstrap-meta').product; // ESM-comment-end // ESM-uncomment-begin -// globalThis._VSCODE_PRODUCT_JSON = { ...product }; +globalThis._VSCODE_PRODUCT_JSON = { ...product }; // ESM-uncomment-end if (process.env['VSCODE_DEV']) { // Patch product overrides when running out of sources @@ -70,19 +70,19 @@ if (process.env['VSCODE_DEV']) { } catch (error) { /* ignore */ } } // ESM-comment-begin -globalThis._VSCODE_PACKAGE_JSON = require('./bootstrap-meta').pkg; +// globalThis._VSCODE_PACKAGE_JSON = require('./bootstrap-meta').pkg; // ESM-comment-end // ESM-uncomment-begin -// globalThis._VSCODE_PACKAGE_JSON = { ...pkg }; +globalThis._VSCODE_PACKAGE_JSON = { ...pkg }; // ESM-uncomment-end // VSCODE_GLOBALS: file root of all resources globalThis._VSCODE_FILE_ROOT = __dirname; // ESM-comment-begin -const bootstrapNode = require('./bootstrap-node'); -const performance = require(`./vs/base/common/performance`); -const fs = require('fs'); +// const bootstrapNode = require('./bootstrap-node'); +// const performance = require(`./vs/base/common/performance`); +// const fs = require('fs'); // ESM-comment-end //#region NLS helpers @@ -169,47 +169,6 @@ async function doSetupNLS() { //#region Loader Config // ESM-uncomment-begin -// /** -// * @param {string=} entrypoint -// * @param {(value: any) => void} [onLoad] -// * @param {(err: Error) => void} [onError] -// */ -// module.exports.load = function (entrypoint, onLoad, onError) { -// if (!entrypoint) { -// return; -// } - -// entrypoint = `./${entrypoint}.js`; - -// onLoad = onLoad || function () { }; -// onError = onError || function (err) { console.error(err); }; - -// setupNLS().then(() => { -// performance.mark(`code/fork/willLoadCode`); -// import(entrypoint).then(onLoad, onError); -// }); -// }; -// ESM-uncomment-end - -// ESM-comment-begin -// @ts-ignore -const loader = require('./vs/loader'); - -loader.config({ - baseUrl: bootstrapNode.fileUriFromPath(__dirname, { isWindows: process.platform === 'win32' }), - catchError: true, - nodeRequire, - amdModulesPattern: /^vs\//, - recordStats: true -}); - -// Running in Electron -if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) { - loader.define('fs', ['original-fs'], function (/** @type {import('fs')} */originalFS) { - return originalFS; // replace the patched electron fs with the original node fs for all AMD code - }); -} - /** * @param {string=} entrypoint * @param {(value: any) => void} [onLoad] @@ -220,28 +179,69 @@ module.exports.load = function (entrypoint, onLoad, onError) { return; } - // code cache config - if (process.env['VSCODE_CODE_CACHE_PATH']) { - loader.config({ - nodeCachedData: { - path: process.env['VSCODE_CODE_CACHE_PATH'], - seed: entrypoint - } - }); - } + entrypoint = `./${entrypoint}.js`; onLoad = onLoad || function () { }; onError = onError || function (err) { console.error(err); }; setupNLS().then(() => { - performance.mark('code/fork/willLoadCode'); - loader([entrypoint], onLoad, onError); + performance.mark(`code/fork/willLoadCode`); + import(entrypoint).then(onLoad, onError); }); }; +// ESM-uncomment-end + +// ESM-comment-begin +// // @ts-ignore +// const loader = require('./vs/loader'); +// +// loader.config({ +// baseUrl: bootstrapNode.fileUriFromPath(__dirname, { isWindows: process.platform === 'win32' }), +// catchError: true, +// nodeRequire, +// amdModulesPattern: /^vs\//, +// recordStats: true +// }); +// +// // Running in Electron +// if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) { +// loader.define('fs', ['original-fs'], function (/** @type {import('fs')} */originalFS) { +// return originalFS; // replace the patched electron fs with the original node fs for all AMD code +// }); +// } +// +// /** +// * @param {string=} entrypoint +// * @param {(value: any) => void} [onLoad] +// * @param {(err: Error) => void} [onError] +// */ +// module.exports.load = function (entrypoint, onLoad, onError) { +// if (!entrypoint) { +// return; +// } +// +// // code cache config +// if (process.env['VSCODE_CODE_CACHE_PATH']) { +// loader.config({ +// nodeCachedData: { +// path: process.env['VSCODE_CODE_CACHE_PATH'], +// seed: entrypoint +// } +// }); +// } +// +// onLoad = onLoad || function () { }; +// onError = onError || function (err) { console.error(err); }; +// +// setupNLS().then(() => { +// performance.mark('code/fork/willLoadCode'); +// loader([entrypoint], onLoad, onError); +// }); +// }; // ESM-comment-end //#endregion // ESM-uncomment-begin -// export const load = module.exports.load; +export const load = module.exports.load; // ESM-uncomment-end diff --git a/src/bootstrap-fork.js b/src/bootstrap-fork.js index e18265497262a..129517b608eec 100644 --- a/src/bootstrap-fork.js +++ b/src/bootstrap-fork.js @@ -7,14 +7,14 @@ 'use strict'; // ESM-comment-begin -const performance = require('./vs/base/common/performance'); -const bootstrapNode = require('./bootstrap-node'); -const bootstrapAmd = require('./bootstrap-amd'); +// const performance = require('./vs/base/common/performance'); +// const bootstrapNode = require('./bootstrap-node'); +// const bootstrapAmd = require('./bootstrap-amd'); // ESM-comment-end // ESM-uncomment-begin -// import * as performance from './vs/base/common/performance.js'; -// import * as bootstrapNode from './bootstrap-node.js'; -// import * as bootstrapAmd from './bootstrap-amd.js'; +import * as performance from './vs/base/common/performance.js'; +import * as bootstrapNode from './bootstrap-node.js'; +import * as bootstrapAmd from './bootstrap-amd.js'; // ESM-uncomment-end performance.mark('code/fork/start'); diff --git a/src/bootstrap-meta.js b/src/bootstrap-meta.js index b437ed75c203b..f9a968c82f50e 100644 --- a/src/bootstrap-meta.js +++ b/src/bootstrap-meta.js @@ -11,11 +11,11 @@ */ // ESM-uncomment-begin -// import { createRequire } from 'node:module'; -// -// const require = createRequire(import.meta.url); -// /** @type any */ -// const module = { exports: {} }; +import { createRequire } from 'node:module'; + +const require = createRequire(import.meta.url); +/** @type any */ +const module = { exports: {} }; // ESM-uncomment-end /** @type Partial & { BUILD_INSERT_PRODUCT_CONFIGURATION?: string } */ @@ -36,6 +36,6 @@ module.exports.product = productObj; module.exports.pkg = pkgObj; // ESM-uncomment-begin -// export const product = module.exports.product; -// export const pkg = module.exports.pkg; +export const product = module.exports.product; +export const pkg = module.exports.pkg; // ESM-uncomment-end diff --git a/src/bootstrap-node.js b/src/bootstrap-node.js index 8c9af7d924ec8..d9e8e7e9945c9 100644 --- a/src/bootstrap-node.js +++ b/src/bootstrap-node.js @@ -7,20 +7,21 @@ 'use strict'; // ESM-comment-begin -const path = require('path'); -const fs = require('fs'); -const Module = require('module'); +// const path = require('path'); +// const fs = require('fs'); +// const Module = require('module'); // ESM-comment-end // ESM-uncomment-begin -// import * as path from 'path'; -// import * as fs from 'fs'; -// import { fileURLToPath } from 'url'; -// import { createRequire } from 'node:module'; -// -// const require = createRequire(import.meta.url); -// /** @type any */ -// const module = { exports: {} }; -// const __dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as path from 'path'; +import * as fs from 'fs'; +import { fileURLToPath } from 'url'; +import { createRequire } from 'node:module'; + +/** @ts-ignore */ +const require = createRequire(import.meta.url); +/** @type any */ +const module = { exports: {} }; +const __dirname = path.dirname(fileURLToPath(import.meta.url)); // ESM-uncomment-end // increase number of stack frames(from 10, https://github.com/v8/v8/wiki/Stack-Trace-API) @@ -84,29 +85,29 @@ module.exports.devInjectNodeModuleLookupPath = function (injectPath) { const Module = require('node:module'); // ESM-uncomment-begin - // // register a loader hook - // Module.register('./bootstrap-import.js', { parentURL: import.meta.url, data: injectPath }); + // register a loader hook + Module.register('./bootstrap-import.js', { parentURL: import.meta.url, data: injectPath }); // ESM-uncomment-end // ESM-comment-begin - const nodeModulesPath = path.join(__dirname, '../node_modules'); - - // @ts-ignore - const originalResolveLookupPaths = Module._resolveLookupPaths; - - // @ts-ignore - Module._resolveLookupPaths = function (moduleName, parent) { - const paths = originalResolveLookupPaths(moduleName, parent); - if (Array.isArray(paths)) { - for (let i = 0, len = paths.length; i < len; i++) { - if (paths[i] === nodeModulesPath) { - paths.splice(i, 0, injectPath); - break; - } - } - } - - return paths; - }; + // const nodeModulesPath = path.join(__dirname, '../node_modules'); + // + // // @ts-ignore + // const originalResolveLookupPaths = Module._resolveLookupPaths; + // + // // @ts-ignore + // Module._resolveLookupPaths = function (moduleName, parent) { + // const paths = originalResolveLookupPaths(moduleName, parent); + // if (Array.isArray(paths)) { + // for (let i = 0, len = paths.length; i < len; i++) { + // if (paths[i] === nodeModulesPath) { + // paths.splice(i, 0, injectPath); + // break; + // } + // } + // } + // + // return paths; + // }; // ESM-comment-end }; @@ -208,26 +209,26 @@ module.exports.configurePortable = function (product) { */ module.exports.enableASARSupport = function () { // ESM-comment-begin - const NODE_MODULES_PATH = path.join(__dirname, '../node_modules'); - const NODE_MODULES_ASAR_PATH = `${NODE_MODULES_PATH}.asar`; - - // @ts-ignore - const originalResolveLookupPaths = Module._resolveLookupPaths; - - // @ts-ignore - Module._resolveLookupPaths = function (request, parent) { - const paths = originalResolveLookupPaths(request, parent); - if (Array.isArray(paths)) { - for (let i = 0, len = paths.length; i < len; i++) { - if (paths[i] === NODE_MODULES_PATH) { - paths.splice(i, 0, NODE_MODULES_ASAR_PATH); - break; - } - } - } - - return paths; - }; + // const NODE_MODULES_PATH = path.join(__dirname, '../node_modules'); + // const NODE_MODULES_ASAR_PATH = `${NODE_MODULES_PATH}.asar`; + // + // // @ts-ignore + // const originalResolveLookupPaths = Module._resolveLookupPaths; + // + // // @ts-ignore + // Module._resolveLookupPaths = function (request, parent) { + // const paths = originalResolveLookupPaths(request, parent); + // if (Array.isArray(paths)) { + // for (let i = 0, len = paths.length; i < len; i++) { + // if (paths[i] === NODE_MODULES_PATH) { + // paths.splice(i, 0, NODE_MODULES_ASAR_PATH); + // break; + // } + // } + // } + // + // return paths; + // }; // ESM-comment-end }; @@ -270,9 +271,9 @@ module.exports.fileUriFromPath = function (path, config) { //#endregion // ESM-uncomment-begin -// export const devInjectNodeModuleLookupPath = module.exports.devInjectNodeModuleLookupPath; -// export const removeGlobalNodeJsModuleLookupPaths = module.exports.removeGlobalNodeJsModuleLookupPaths; -// export const configurePortable = module.exports.configurePortable; -// export const enableASARSupport = module.exports.enableASARSupport; -// export const fileUriFromPath = module.exports.fileUriFromPath; +export const devInjectNodeModuleLookupPath = module.exports.devInjectNodeModuleLookupPath; +export const removeGlobalNodeJsModuleLookupPaths = module.exports.removeGlobalNodeJsModuleLookupPaths; +export const configurePortable = module.exports.configurePortable; +export const enableASARSupport = module.exports.enableASARSupport; +export const fileUriFromPath = module.exports.fileUriFromPath; // ESM-uncomment-end diff --git a/src/bootstrap-window.js b/src/bootstrap-window.js index 25a4a216ba2ad..9b5ed26e6c689 100644 --- a/src/bootstrap-window.js +++ b/src/bootstrap-window.js @@ -89,130 +89,130 @@ window['MonacoEnvironment'] = {}; // ESM-uncomment-begin - // // Signal before require() - // if (typeof options?.beforeRequire === 'function') { - // options.beforeRequire(configuration); - // } - - // const baseUrl = new URL(`${fileUriFromPath(configuration.appRoot, { isWindows: safeProcess.platform === 'win32', scheme: 'vscode-file', fallbackAuthority: 'vscode-app' })}/out/`); - // globalThis._VSCODE_FILE_ROOT = baseUrl.toString(); - - // // DEV --------------------------------------------------------------------------------------- - // // DEV: This is for development and enables loading CSS via import-statements via import-maps. - // // DEV: For each CSS modules that we have we defined an entry in the import map that maps to - // // DEV: a blob URL that loads the CSS via a dynamic @import-rule. - // // DEV --------------------------------------------------------------------------------------- - // if (Array.isArray(configuration.cssModules) && configuration.cssModules.length > 0) { - // performance.mark('code/willAddCssLoader'); - - // const style = document.createElement('style'); - // style.type = 'text/css'; - // style.media = 'screen'; - // style.id = 'vscode-css-loading'; - // document.head.appendChild(style); - - // globalThis._VSCODE_CSS_LOAD = function (url) { - // style.textContent += `@import url(${url});\n`; - // }; - - // /** - // * @type { { imports: Record }} - // */ - // const importMap = { imports: {} }; - // for (const cssModule of configuration.cssModules) { - // const cssUrl = new URL(cssModule, baseUrl).href; - // const jsSrc = `globalThis._VSCODE_CSS_LOAD('${cssUrl}');\n`; - // const blob = new Blob([jsSrc], { type: 'application/javascript' }); - // importMap.imports[cssUrl] = URL.createObjectURL(blob); - // } - - // const ttp = window.trustedTypes?.createPolicy('vscode-bootstrapImportMap', { createScript(value) { return value; }, }); - // const importMapSrc = JSON.stringify(importMap, undefined, 2); - // const importMapScript = document.createElement('script'); - // importMapScript.type = 'importmap'; - // importMapScript.setAttribute('nonce', '0c6a828f1297'); - // // @ts-ignore - // importMapScript.textContent = ttp?.createScript(importMapSrc) ?? importMapSrc; - // document.head.appendChild(importMapScript); - - // performance.mark('code/didAddCssLoader'); - // } - - // const result = Promise.all(modulePaths.map(modulePath => { - // if (modulePath.includes('vs/css!')) { - // // ESM/CSS when seeing the old `vs/css!` prefix we use that as a signal to - // // load CSS via a tag - // const cssModule = modulePath.replace('vs/css!', ''); - // const link = document.createElement('link'); - // link.rel = 'stylesheet'; - // link.href = new URL(`${cssModule}.css`, baseUrl).href; - // document.head.appendChild(link); - // return Promise.resolve(); - - // } else { - // // ESM/JS module loading - // return import(new URL(`${modulePath}.js`, baseUrl).href); - // } - // })); - - // result.then((res) => invokeResult(res[0]), onUnexpectedError); - // ESM-uncomment-end + // Signal before require() + if (typeof options?.beforeRequire === 'function') { + options.beforeRequire(configuration); + } - // ESM-comment-begin - /** @type {LoaderConfig} */ - const loaderConfig = { - baseUrl: `${fileUriFromPath(configuration.appRoot, { isWindows: safeProcess.platform === 'win32', scheme: 'vscode-file', fallbackAuthority: 'vscode-app' })}/out`, - preferScriptTags: true - }; + const baseUrl = new URL(`${fileUriFromPath(configuration.appRoot, { isWindows: safeProcess.platform === 'win32', scheme: 'vscode-file', fallbackAuthority: 'vscode-app' })}/out/`); + globalThis._VSCODE_FILE_ROOT = baseUrl.toString(); + + // DEV --------------------------------------------------------------------------------------- + // DEV: This is for development and enables loading CSS via import-statements via import-maps. + // DEV: For each CSS modules that we have we defined an entry in the import map that maps to + // DEV: a blob URL that loads the CSS via a dynamic @import-rule. + // DEV --------------------------------------------------------------------------------------- + if (Array.isArray(configuration.cssModules) && configuration.cssModules.length > 0) { + performance.mark('code/willAddCssLoader'); + + const style = document.createElement('style'); + style.type = 'text/css'; + style.media = 'screen'; + style.id = 'vscode-css-loading'; + document.head.appendChild(style); + + globalThis._VSCODE_CSS_LOAD = function (url) { + style.textContent += `@import url(${url});\n`; + }; - // use a trusted types policy when loading via script tags - loaderConfig.trustedTypesPolicy = window.trustedTypes?.createPolicy('amdLoader', { - createScriptURL(value) { - if (value.startsWith(window.location.origin)) { - return value; - } - throw new Error(`Invalid script url: ${value}`); + /** + * @type { { imports: Record }} + */ + const importMap = { imports: {} }; + for (const cssModule of configuration.cssModules) { + const cssUrl = new URL(cssModule, baseUrl).href; + const jsSrc = `globalThis._VSCODE_CSS_LOAD('${cssUrl}');\n`; + const blob = new Blob([jsSrc], { type: 'application/javascript' }); + importMap.imports[cssUrl] = URL.createObjectURL(blob); } - }); - - // Teach the loader the location of the node modules we use in renderers - // This will enable to load these modules via + + + + + - - - diff --git a/test/unit/browser/renderer.html b/test/unit/browser/renderer.html index 28e6912fcad19..466b20d345534 100644 --- a/test/unit/browser/renderer.html +++ b/test/unit/browser/renderer.html @@ -40,31 +40,83 @@ }); - - - - + // set up require + + globalThis._VSCODE_FILE_ROOT = new URL('../../../src', baseUrl).href; + globalThis.require = { + paths: { + xterm: new URL('../../../node_modules/xterm', baseUrl).href, + '@vscode/iconv-lite-umd': new URL('../../../node_modules/@vscode/iconv-lite-umd', baseUrl).href, + jschardet: new URL('../../../node_modules/jschardet', baseUrl).href + } + } + + + + diff --git a/test/unit/electron/index.esm.js b/test/unit/electron/index.amd.js similarity index 95% rename from test/unit/electron/index.esm.js rename to test/unit/electron/index.amd.js index 8daeeb26ab354..a02f5613e02fb 100644 --- a/test/unit/electron/index.esm.js +++ b/test/unit/electron/index.amd.js @@ -10,7 +10,7 @@ // come before any mocha imports. process.env.MOCHA_COLORS = '1'; -const { app, BrowserWindow, ipcMain, crashReporter, session } = require('electron'); +const { app, BrowserWindow, ipcMain, crashReporter } = require('electron'); const product = require('../../../product.json'); const { tmpdir } = require('os'); const { existsSync, mkdirSync } = require('fs'); @@ -218,12 +218,6 @@ class IPCRunner extends events.EventEmitter { app.on('ready', () => { - // needed when loading resources from the renderer, e.g xterm.js or the encoding lib - session.defaultSession.protocol.registerFileProtocol('vscode-file', (request, callback) => { - const path = new URL(request.url).pathname; - callback({ path }); - }); - ipcMain.on('error', (_, err) => { if (!args.dev) { console.error(err); @@ -308,9 +302,7 @@ app.on('ready', () => { win.webContents.send('run', args); } - const target = url.pathToFileURL(path.join(__dirname, 'renderer.esm.html')); - target.searchParams.set('argv', JSON.stringify(args)); - win.loadURL(target.href); + win.loadURL(url.format({ pathname: path.join(__dirname, 'renderer.amd.html'), protocol: 'file:', slashes: true })); const runner = new IPCRunner(win); createStatsCollector(runner); diff --git a/test/unit/electron/index.js b/test/unit/electron/index.js index 40c0260671596..f69104799ca5e 100644 --- a/test/unit/electron/index.js +++ b/test/unit/electron/index.js @@ -10,7 +10,7 @@ // come before any mocha imports. process.env.MOCHA_COLORS = '1'; -const { app, BrowserWindow, ipcMain, crashReporter } = require('electron'); +const { app, BrowserWindow, ipcMain, crashReporter, session } = require('electron'); const product = require('../../../product.json'); const { tmpdir } = require('os'); const { existsSync, mkdirSync } = require('fs'); @@ -218,6 +218,12 @@ class IPCRunner extends events.EventEmitter { app.on('ready', () => { + // needed when loading resources from the renderer, e.g xterm.js or the encoding lib + session.defaultSession.protocol.registerFileProtocol('vscode-file', (request, callback) => { + const path = new URL(request.url).pathname; + callback({ path }); + }); + ipcMain.on('error', (_, err) => { if (!args.dev) { console.error(err); @@ -249,7 +255,7 @@ app.on('ready', () => { width: 800, show: false, webPreferences: { - preload: path.join(__dirname, 'preload.js'), + preload: path.join(__dirname, 'preload.js'), // ensure similar environment as VSCode as tests may depend on this additionalArguments: [`--vscode-window-config=vscode:test-vscode-window-config`], nodeIntegration: true, contextIsolation: false, @@ -302,7 +308,9 @@ app.on('ready', () => { win.webContents.send('run', args); } - win.loadURL(url.format({ pathname: path.join(__dirname, 'renderer.html'), protocol: 'file:', slashes: true })); + const target = url.pathToFileURL(path.join(__dirname, 'renderer.html')); + target.searchParams.set('argv', JSON.stringify(args)); + win.loadURL(target.href); const runner = new IPCRunner(win); createStatsCollector(runner); diff --git a/test/unit/electron/renderer.amd.html b/test/unit/electron/renderer.amd.html new file mode 100644 index 0000000000000..3f022d009e0ce --- /dev/null +++ b/test/unit/electron/renderer.amd.html @@ -0,0 +1,35 @@ + + + + + VSCode Tests + + + + +
+ + + + + + diff --git a/test/unit/electron/renderer.esm.js b/test/unit/electron/renderer.amd.js similarity index 56% rename from test/unit/electron/renderer.esm.js rename to test/unit/electron/renderer.amd.js index 27d65249ac8ea..02a8c77701aa4 100644 --- a/test/unit/electron/renderer.esm.js +++ b/test/unit/electron/renderer.amd.js @@ -3,22 +3,21 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -// @ts-check - /*eslint-env mocha*/ const fs = require('fs'); +const inspector = require('inspector'); (function () { const originals = {}; let logging = false; let withStacks = false; - globalThis.beginLoggingFS = (_withStacks) => { + self.beginLoggingFS = (_withStacks) => { logging = true; withStacks = _withStacks || false; }; - globalThis.endLoggingFS = () => { + self.endLoggingFS = () => { logging = false; withStacks = false; }; @@ -68,7 +67,7 @@ const path = require('path'); const glob = require('glob'); const util = require('util'); const coverage = require('../coverage'); -const { pathToFileURL } = require('url'); +const { takeSnapshotAndCountClasses } = require('../analyzeSnapshot'); // Disabled custom inspect. See #38847 if (util.inspect && util.inspect['defaultOptions']) { @@ -76,14 +75,15 @@ if (util.inspect && util.inspect['defaultOptions']) { } // VSCODE_GLOBALS: node_modules -globalThis._VSCODE_NODE_MODULES = new Proxy(Object.create(null), { get: (_target, mod) => require(String(mod)) }); +globalThis._VSCODE_NODE_MODULES = new Proxy(Object.create(null), { get: (_target, mod) => (require.__$__nodeRequire ?? require)(String(mod)) }); // VSCODE_GLOBALS: package/product.json -globalThis._VSCODE_PRODUCT_JSON = require('../../../product.json'); -globalThis._VSCODE_PACKAGE_JSON = require('../../../package.json'); +globalThis._VSCODE_PRODUCT_JSON = (require.__$__nodeRequire ?? require)('../../../product.json'); +globalThis._VSCODE_PACKAGE_JSON = (require.__$__nodeRequire ?? require)('../../../package.json'); // Test file operations that are common across platforms. Used for test infra, namely snapshot tests Object.assign(globalThis, { + __analyzeSnapshotInTests: takeSnapshotAndCountClasses, __readFileInTests: path => fs.promises.readFile(path, 'utf-8'), __writeFileInTests: (path, contents) => fs.promises.writeFile(path, contents), __readDirInTests: path => fs.promises.readdir(path), @@ -91,54 +91,50 @@ Object.assign(globalThis, { __mkdirPInTests: path => fs.promises.mkdir(path, { recursive: true }), }); +const IS_CI = !!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY; +const _tests_glob = '**/test/**/*.test.js'; +let loader; +let _out; + function initNls(opts) { if (opts.build) { // when running from `out-build`, ensure to load the default // messages file, because all `nls.localize` calls have their // english values removed and replaced by an index. - // VSCODE_GLOBALS: NLS - globalThis._VSCODE_NLS_MESSAGES = require(`../../../out-build/nls.messages.json`); + globalThis._VSCODE_NLS_MESSAGES = (require.__$__nodeRequire ?? require)(`../../../out-build/nls.messages.json`); } } -const _tests_glob = '**/test/**/*.test.js'; -let loader; -let _out; -const _loaderErrors = []; function initLoader(opts) { - // debugger; const outdir = opts.build ? 'out-build' : 'out'; _out = path.join(__dirname, `../../../${outdir}`); - const baseUrl = pathToFileURL(path.join(__dirname, `../../../${outdir}/`)); - globalThis._VSCODE_FILE_ROOT = baseUrl.href; - - // set loader - /** - * @param {string[]} modules - * @param {(...args:any[]) => void} callback - */ - function esmRequire(modules, callback, errorback) { - const tasks = modules.map(mod => { - - const url = new URL(`./${mod}.js`, baseUrl).href; - return import(url).catch(err => { - console.log(mod, url); - console.log(err); - _loaderErrors.push(err); - throw err; - }); - }); + const bootstrapNode = require(`../../../${outdir}/bootstrap-node`); + + // setup loader + loader = require(`${_out}/vs/loader`); + const loaderConfig = { + nodeRequire: require, + catchError: true, + baseUrl: bootstrapNode.fileUriFromPath(path.join(__dirname, '../../../src2'), { isWindows: process.platform === 'win32' }), + paths: { + 'vs': `../${outdir}/vs`, + 'lib': `../${outdir}/lib`, + 'bootstrap-fork': `../${outdir}/bootstrap-fork` + } + }; - Promise.all(tasks).then(modules => callback(...modules)).catch(errorback); + if (opts.coverage) { + // initialize coverage if requested + coverage.initialize(loaderConfig); } - loader = { require: esmRequire }; + loader.require.config(loaderConfig); } function createCoverageReport(opts) { if (opts.coverage) { - return coverage.createReport(opts.run || opts.runGlob); + return coverage.createReport(opts.run || opts.runGlob, opts.coveragePath, opts.coverageFormats); } return Promise.resolve(undefined); } @@ -163,9 +159,8 @@ function loadTestModules(opts) { if (opts.run) { const files = Array.isArray(opts.run) ? opts.run : [opts.run]; const modules = files.map(file => { - file = file.replace(/^src/, 'out'); - file = file.replace(/\.ts$/, '.js'); - return path.relative(_out, file).replace(/\.js$/, ''); + file = file.replace(/^src[\\/]/, ''); + return file.replace(/\.[jt]s$/, ''); }); return loadModules(modules); } @@ -184,22 +179,113 @@ function loadTestModules(opts) { }).then(loadModules); } -function loadTests(opts) { +/** @type Mocha.Test */ +let currentTest; + +async function loadTests(opts) { + + //#region Unexpected Output + + const _allowedTestOutput = [ + /The vm module of Node\.js is deprecated in the renderer process and will be removed./, + ]; + + // allow snapshot mutation messages locally + if (!IS_CI) { + _allowedTestOutput.push(/Creating new snapshot in/); + _allowedTestOutput.push(/Deleting [0-9]+ old snapshots/); + } + + const perTestCoverage = opts['per-test-coverage'] ? await PerTestCoverage.init() : undefined; + + const _allowedTestsWithOutput = new Set([ + 'creates a snapshot', // self-testing + 'validates a snapshot', // self-testing + 'cleans up old snapshots', // self-testing + 'issue #149412: VS Code hangs when bad semantic token data is received', // https://github.com/microsoft/vscode/issues/192440 + 'issue #134973: invalid semantic tokens should be handled better', // https://github.com/microsoft/vscode/issues/192440 + 'issue #148651: VSCode UI process can hang if a semantic token with negative values is returned by language service', // https://github.com/microsoft/vscode/issues/192440 + 'issue #149130: vscode freezes because of Bracket Pair Colorization', // https://github.com/microsoft/vscode/issues/192440 + 'property limits', // https://github.com/microsoft/vscode/issues/192443 + 'Error events', // https://github.com/microsoft/vscode/issues/192443 + 'fetch returns keybinding with user first if title and id matches', // + 'throw ListenerLeakError' + ]); + + const _allowedSuitesWithOutput = new Set([ + 'InteractiveChatController' + ]); + + let _testsWithUnexpectedOutput = false; + + for (const consoleFn of [console.log, console.error, console.info, console.warn, console.trace, console.debug]) { + console[consoleFn.name] = function (msg) { + if (!currentTest) { + consoleFn.apply(console, arguments); + } else if (!_allowedTestOutput.some(a => a.test(msg)) && !_allowedTestsWithOutput.has(currentTest.title) && !_allowedSuitesWithOutput.has(currentTest.parent?.title)) { + _testsWithUnexpectedOutput = true; + consoleFn.apply(console, arguments); + } + }; + } + + //#endregion + + //#region Unexpected / Loader Errors const _unexpectedErrors = []; + const _loaderErrors = []; + + const _allowedTestsWithUnhandledRejections = new Set([ + // Lifecycle tests + 'onWillShutdown - join with error is handled', + 'onBeforeShutdown - veto with error is treated as veto', + 'onBeforeShutdown - final veto with error is treated as veto', + // Search tests + 'Search Model: Search reports timed telemetry on search when error is called' + ]); + + loader.require.config({ + onError(err) { + _loaderErrors.push(err); + console.error(err); + } + }); - // collect unexpected errors loader.require(['vs/base/common/errors'], function (errors) { - errors.setUnexpectedErrorHandler(function (err) { + + const onUnexpectedError = function (err) { + if (err.name === 'Canceled') { + return; // ignore canceled errors that are common + } + let stack = (err ? err.stack : null); if (!stack) { stack = new Error().stack; } _unexpectedErrors.push((err && err.message ? err.message : err) + '\n' + stack); + }; + + process.on('uncaughtException', error => onUnexpectedError(error)); + process.on('unhandledRejection', (reason, promise) => { + onUnexpectedError(reason); + promise.catch(() => { }); }); + window.addEventListener('unhandledrejection', event => { + event.preventDefault(); // Do not log to test output, we show an error later when test ends + event.stopPropagation(); + + if (!_allowedTestsWithUnhandledRejections.has(currentTest.title)) { + onUnexpectedError(event.reason); + } + }); + + errors.setUnexpectedErrorHandler(err => unexpectedErrorHandler(err)); }); + //#endregion + return loadWorkbenchTestingUtilsModule().then((workbenchTestingModule) => { const assertCleanState = workbenchTestingModule.assertCleanState; @@ -209,24 +295,35 @@ function loadTests(opts) { }); }); - return loadTestModules(opts).then(() => { - suite('Unexpected Errors & Loader Errors', function () { - test('should not have unexpected errors', function () { - const errors = _unexpectedErrors.concat(_loaderErrors); - if (errors.length) { - errors.forEach(function (stack) { - console.error(''); - console.error(stack); - }); - assert.ok(false, errors.join()); - } - }); - - test('assertCleanState - check that registries are clean and objects are disposed at the end of test running', () => { - assertCleanState(); - }); - }); + setup(async () => { + await perTestCoverage?.startTest(); + }); + + teardown(async () => { + await perTestCoverage?.finishTest(currentTest.file, currentTest.fullTitle()); + + // should not have unexpected output + if (_testsWithUnexpectedOutput && !opts.dev) { + assert.ok(false, 'Error: Unexpected console output in test run. Please ensure no console.[log|error|info|warn] usage in tests or runtime errors.'); + } + + // should not have unexpected errors + const errors = _unexpectedErrors.concat(_loaderErrors); + if (errors.length) { + for (const error of errors) { + console.error(`Error: Test run should not have unexpected errors:\n${error}`); + } + assert.ok(false, 'Error: Test run should not have unexpected errors.'); + } }); + + suiteTeardown(() => { // intentionally not in teardown because some tests only cleanup in suiteTeardown + + // should have cleaned up in registries + assertCleanState(); + }); + + return loadTestModules(opts); }); } @@ -338,9 +435,10 @@ function runTests(opts) { }); }); + runner.on('test', test => currentTest = test); + if (opts.dev) { runner.on('fail', (test, err) => { - console.error(test.fullTitle()); console.error(err.stack); }); @@ -348,19 +446,33 @@ function runTests(opts) { }); } -ipcRenderer.on('run', async (_e, opts) => { +ipcRenderer.on('run', (e, opts) => { initNls(opts); initLoader(opts); - - await Promise.resolve(globalThis._VSCODE_TEST_INIT); - - try { - await runTests(opts); - } catch (err) { + runTests(opts).catch(err => { if (typeof err !== 'string') { err = JSON.stringify(err); } + console.error(err); ipcRenderer.send('error', err); - } + }); }); + +class PerTestCoverage { + static async init() { + await ipcRenderer.invoke('startCoverage'); + return new PerTestCoverage(); + } + + async startTest() { + if (!this.didInit) { + this.didInit = true; + await ipcRenderer.invoke('snapshotCoverage'); + } + } + + async finishTest(file, fullTitle) { + await ipcRenderer.invoke('snapshotCoverage', { file, fullTitle }); + } +} diff --git a/test/unit/electron/renderer.esm.html b/test/unit/electron/renderer.esm.html deleted file mode 100644 index 8f6866efca574..0000000000000 --- a/test/unit/electron/renderer.esm.html +++ /dev/null @@ -1,136 +0,0 @@ - - - - - VSCode Tests - - - - - -
- - - - - - - - diff --git a/test/unit/electron/renderer.html b/test/unit/electron/renderer.html index 5fcbc9661aa11..830dd553c01e4 100644 --- a/test/unit/electron/renderer.html +++ b/test/unit/electron/renderer.html @@ -4,6 +4,7 @@ VSCode Tests + @@ -23,13 +24,113 @@ window.alert = function () { throw new Error('window.alert() is not supported in tests!'); } window.confirm = function () { throw new Error('window.confirm() is not supported in tests!'); } + // Ignore uncaught cancelled promise errors + window.addEventListener('unhandledrejection', e => { + const name = e && e.reason && e.reason.name; + + if (name === 'Canceled') { + e.preventDefault(); + e.stopPropagation(); + } + }); + mocha.setup({ ui: 'tdd', - timeout: typeof process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] === 'string' ? 30000 : 5000, + timeout: 5000, forbidOnly: typeof process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] === 'string' // disallow .only() when running on build machine }); - require('./renderer'); + + diff --git a/test/unit/electron/renderer.js b/test/unit/electron/renderer.js index b95931575576a..27d65249ac8ea 100644 --- a/test/unit/electron/renderer.js +++ b/test/unit/electron/renderer.js @@ -3,21 +3,22 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +// @ts-check + /*eslint-env mocha*/ const fs = require('fs'); -const inspector = require('inspector'); (function () { const originals = {}; let logging = false; let withStacks = false; - self.beginLoggingFS = (_withStacks) => { + globalThis.beginLoggingFS = (_withStacks) => { logging = true; withStacks = _withStacks || false; }; - self.endLoggingFS = () => { + globalThis.endLoggingFS = () => { logging = false; withStacks = false; }; @@ -66,9 +67,8 @@ const assert = require('assert'); const path = require('path'); const glob = require('glob'); const util = require('util'); -const bootstrapNode = require('../../../src/bootstrap-node'); const coverage = require('../coverage'); -const { takeSnapshotAndCountClasses } = require('../analyzeSnapshot'); +const { pathToFileURL } = require('url'); // Disabled custom inspect. See #38847 if (util.inspect && util.inspect['defaultOptions']) { @@ -76,15 +76,14 @@ if (util.inspect && util.inspect['defaultOptions']) { } // VSCODE_GLOBALS: node_modules -globalThis._VSCODE_NODE_MODULES = new Proxy(Object.create(null), { get: (_target, mod) => (require.__$__nodeRequire ?? require)(String(mod)) }); +globalThis._VSCODE_NODE_MODULES = new Proxy(Object.create(null), { get: (_target, mod) => require(String(mod)) }); // VSCODE_GLOBALS: package/product.json -globalThis._VSCODE_PRODUCT_JSON = (require.__$__nodeRequire ?? require)('../../../product.json'); -globalThis._VSCODE_PACKAGE_JSON = (require.__$__nodeRequire ?? require)('../../../package.json'); +globalThis._VSCODE_PRODUCT_JSON = require('../../../product.json'); +globalThis._VSCODE_PACKAGE_JSON = require('../../../package.json'); // Test file operations that are common across platforms. Used for test infra, namely snapshot tests Object.assign(globalThis, { - __analyzeSnapshotInTests: takeSnapshotAndCountClasses, __readFileInTests: path => fs.promises.readFile(path, 'utf-8'), __writeFileInTests: (path, contents) => fs.promises.writeFile(path, contents), __readDirInTests: path => fs.promises.readdir(path), @@ -92,48 +91,54 @@ Object.assign(globalThis, { __mkdirPInTests: path => fs.promises.mkdir(path, { recursive: true }), }); -const IS_CI = !!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY; -const _tests_glob = '**/test/**/*.test.js'; -let loader; -let _out; - function initNls(opts) { if (opts.build) { // when running from `out-build`, ensure to load the default // messages file, because all `nls.localize` calls have their // english values removed and replaced by an index. - globalThis._VSCODE_NLS_MESSAGES = (require.__$__nodeRequire ?? require)(`../../../out-build/nls.messages.json`); + // VSCODE_GLOBALS: NLS + globalThis._VSCODE_NLS_MESSAGES = require(`../../../out-build/nls.messages.json`); } } +const _tests_glob = '**/test/**/*.test.js'; +let loader; +let _out; +const _loaderErrors = []; function initLoader(opts) { + // debugger; const outdir = opts.build ? 'out-build' : 'out'; _out = path.join(__dirname, `../../../${outdir}`); - // setup loader - loader = require(`${_out}/vs/loader`); - const loaderConfig = { - nodeRequire: require, - catchError: true, - baseUrl: bootstrapNode.fileUriFromPath(path.join(__dirname, '../../../src'), { isWindows: process.platform === 'win32' }), - paths: { - 'vs': `../${outdir}/vs`, - 'lib': `../${outdir}/lib`, - 'bootstrap-fork': `../${outdir}/bootstrap-fork` - } - }; + const baseUrl = pathToFileURL(path.join(__dirname, `../../../${outdir}/`)); + globalThis._VSCODE_FILE_ROOT = baseUrl.href; + + // set loader + /** + * @param {string[]} modules + * @param {(...args:any[]) => void} callback + */ + function esmRequire(modules, callback, errorback) { + const tasks = modules.map(mod => { + + const url = new URL(`./${mod}.js`, baseUrl).href; + return import(url).catch(err => { + console.log(mod, url); + console.log(err); + _loaderErrors.push(err); + throw err; + }); + }); - if (opts.coverage) { - // initialize coverage if requested - coverage.initialize(loaderConfig); + Promise.all(tasks).then(modules => callback(...modules)).catch(errorback); } - loader.require.config(loaderConfig); + loader = { require: esmRequire }; } function createCoverageReport(opts) { if (opts.coverage) { - return coverage.createReport(opts.run || opts.runGlob, opts.coveragePath, opts.coverageFormats); + return coverage.createReport(opts.run || opts.runGlob); } return Promise.resolve(undefined); } @@ -158,8 +163,9 @@ function loadTestModules(opts) { if (opts.run) { const files = Array.isArray(opts.run) ? opts.run : [opts.run]; const modules = files.map(file => { - file = file.replace(/^src[\\/]/, ''); - return file.replace(/\.[jt]s$/, ''); + file = file.replace(/^src/, 'out'); + file = file.replace(/\.ts$/, '.js'); + return path.relative(_out, file).replace(/\.js$/, ''); }); return loadModules(modules); } @@ -178,113 +184,22 @@ function loadTestModules(opts) { }).then(loadModules); } -/** @type Mocha.Test */ -let currentTest; - -async function loadTests(opts) { - - //#region Unexpected Output - - const _allowedTestOutput = [ - /The vm module of Node\.js is deprecated in the renderer process and will be removed./, - ]; - - // allow snapshot mutation messages locally - if (!IS_CI) { - _allowedTestOutput.push(/Creating new snapshot in/); - _allowedTestOutput.push(/Deleting [0-9]+ old snapshots/); - } - - const perTestCoverage = opts['per-test-coverage'] ? await PerTestCoverage.init() : undefined; - - const _allowedTestsWithOutput = new Set([ - 'creates a snapshot', // self-testing - 'validates a snapshot', // self-testing - 'cleans up old snapshots', // self-testing - 'issue #149412: VS Code hangs when bad semantic token data is received', // https://github.com/microsoft/vscode/issues/192440 - 'issue #134973: invalid semantic tokens should be handled better', // https://github.com/microsoft/vscode/issues/192440 - 'issue #148651: VSCode UI process can hang if a semantic token with negative values is returned by language service', // https://github.com/microsoft/vscode/issues/192440 - 'issue #149130: vscode freezes because of Bracket Pair Colorization', // https://github.com/microsoft/vscode/issues/192440 - 'property limits', // https://github.com/microsoft/vscode/issues/192443 - 'Error events', // https://github.com/microsoft/vscode/issues/192443 - 'fetch returns keybinding with user first if title and id matches', // - 'throw ListenerLeakError' - ]); - - const _allowedSuitesWithOutput = new Set([ - 'InteractiveChatController' - ]); - - let _testsWithUnexpectedOutput = false; - - for (const consoleFn of [console.log, console.error, console.info, console.warn, console.trace, console.debug]) { - console[consoleFn.name] = function (msg) { - if (!currentTest) { - consoleFn.apply(console, arguments); - } else if (!_allowedTestOutput.some(a => a.test(msg)) && !_allowedTestsWithOutput.has(currentTest.title) && !_allowedSuitesWithOutput.has(currentTest.parent?.title)) { - _testsWithUnexpectedOutput = true; - consoleFn.apply(console, arguments); - } - }; - } - - //#endregion - - //#region Unexpected / Loader Errors +function loadTests(opts) { const _unexpectedErrors = []; - const _loaderErrors = []; - - const _allowedTestsWithUnhandledRejections = new Set([ - // Lifecycle tests - 'onWillShutdown - join with error is handled', - 'onBeforeShutdown - veto with error is treated as veto', - 'onBeforeShutdown - final veto with error is treated as veto', - // Search tests - 'Search Model: Search reports timed telemetry on search when error is called' - ]); - - loader.require.config({ - onError(err) { - _loaderErrors.push(err); - console.error(err); - } - }); + // collect unexpected errors loader.require(['vs/base/common/errors'], function (errors) { - - const onUnexpectedError = function (err) { - if (err.name === 'Canceled') { - return; // ignore canceled errors that are common - } - + errors.setUnexpectedErrorHandler(function (err) { let stack = (err ? err.stack : null); if (!stack) { stack = new Error().stack; } _unexpectedErrors.push((err && err.message ? err.message : err) + '\n' + stack); - }; - - process.on('uncaughtException', error => onUnexpectedError(error)); - process.on('unhandledRejection', (reason, promise) => { - onUnexpectedError(reason); - promise.catch(() => { }); }); - window.addEventListener('unhandledrejection', event => { - event.preventDefault(); // Do not log to test output, we show an error later when test ends - event.stopPropagation(); - - if (!_allowedTestsWithUnhandledRejections.has(currentTest.title)) { - onUnexpectedError(event.reason); - } - }); - - errors.setUnexpectedErrorHandler(err => unexpectedErrorHandler(err)); }); - //#endregion - return loadWorkbenchTestingUtilsModule().then((workbenchTestingModule) => { const assertCleanState = workbenchTestingModule.assertCleanState; @@ -294,35 +209,24 @@ async function loadTests(opts) { }); }); - setup(async () => { - await perTestCoverage?.startTest(); - }); - - teardown(async () => { - await perTestCoverage?.finishTest(currentTest.file, currentTest.fullTitle()); - - // should not have unexpected output - if (_testsWithUnexpectedOutput && !opts.dev) { - assert.ok(false, 'Error: Unexpected console output in test run. Please ensure no console.[log|error|info|warn] usage in tests or runtime errors.'); - } - - // should not have unexpected errors - const errors = _unexpectedErrors.concat(_loaderErrors); - if (errors.length) { - for (const error of errors) { - console.error(`Error: Test run should not have unexpected errors:\n${error}`); - } - assert.ok(false, 'Error: Test run should not have unexpected errors.'); - } - }); - - suiteTeardown(() => { // intentionally not in teardown because some tests only cleanup in suiteTeardown - - // should have cleaned up in registries - assertCleanState(); + return loadTestModules(opts).then(() => { + suite('Unexpected Errors & Loader Errors', function () { + test('should not have unexpected errors', function () { + const errors = _unexpectedErrors.concat(_loaderErrors); + if (errors.length) { + errors.forEach(function (stack) { + console.error(''); + console.error(stack); + }); + assert.ok(false, errors.join()); + } + }); + + test('assertCleanState - check that registries are clean and objects are disposed at the end of test running', () => { + assertCleanState(); + }); + }); }); - - return loadTestModules(opts); }); } @@ -434,10 +338,9 @@ function runTests(opts) { }); }); - runner.on('test', test => currentTest = test); - if (opts.dev) { runner.on('fail', (test, err) => { + console.error(test.fullTitle()); console.error(err.stack); }); @@ -445,33 +348,19 @@ function runTests(opts) { }); } -ipcRenderer.on('run', (e, opts) => { +ipcRenderer.on('run', async (_e, opts) => { initNls(opts); initLoader(opts); - runTests(opts).catch(err => { + + await Promise.resolve(globalThis._VSCODE_TEST_INIT); + + try { + await runTests(opts); + } catch (err) { if (typeof err !== 'string') { err = JSON.stringify(err); } - console.error(err); ipcRenderer.send('error', err); - }); -}); - -class PerTestCoverage { - static async init() { - await ipcRenderer.invoke('startCoverage'); - return new PerTestCoverage(); } - - async startTest() { - if (!this.didInit) { - this.didInit = true; - await ipcRenderer.invoke('snapshotCoverage'); - } - } - - async finishTest(file, fullTitle) { - await ipcRenderer.invoke('snapshotCoverage', { file, fullTitle }); - } -} +}); diff --git a/test/unit/node/index.js b/test/unit/node/index.amd.js similarity index 99% rename from test/unit/node/index.js rename to test/unit/node/index.amd.js index d087e8409f3ab..8e4a0fa091515 100644 --- a/test/unit/node/index.js +++ b/test/unit/node/index.amd.js @@ -17,7 +17,6 @@ const minimatch = require('minimatch'); const coverage = require('../coverage'); const minimist = require('minimist'); const { takeSnapshotAndCountClasses } = require('../analyzeSnapshot'); -const bootstrapNode = require('../../../src/bootstrap-node'); /** * @type {{ build: boolean; run: string; runGlob: string; coverage: boolean; help: boolean; coverageFormats: string | string[]; coveragePath: string; }} @@ -106,6 +105,8 @@ function main() { console.error(e.stack || e); }); + const bootstrapNode = require(`../../../${out}/bootstrap-node`); + const loaderConfig = { nodeRequire: require, baseUrl: bootstrapNode.fileUriFromPath(src, { isWindows: process.platform === 'win32' }),