diff --git a/package-lock.json b/package-lock.json index 84cc0d6..711d049 100644 --- a/package-lock.json +++ b/package-lock.json @@ -69,6 +69,7 @@ "@codingame/monaco-vscode-sql-default-extension": "^3.1.0", "@codingame/monaco-vscode-storage-service-override": "^3.1.0", "@codingame/monaco-vscode-swift-default-extension": "^3.1.0", + "@codingame/monaco-vscode-testing-service-override": "^3.1.1", "@codingame/monaco-vscode-textmate-service-override": "^3.1.0", "@codingame/monaco-vscode-theme-defaults-default-extension": "^3.1.0", "@codingame/monaco-vscode-theme-service-override": "^3.1.0", @@ -925,6 +926,106 @@ "vscode": "npm:@codingame/monaco-vscode-api@3.1.0" } }, + "node_modules/@codingame/monaco-vscode-testing-service-override": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-testing-service-override/-/monaco-vscode-testing-service-override-3.1.1.tgz", + "integrity": "sha512-M3H4DzK+cN5625McobUB0Qw71OrBGkdnzk+x8O+WIFHVt1KJnEZiyUZpxIUqslyzFawgpjOYOg2djfBBwaWh5w==", + "dependencies": { + "@xterm/addon-canvas": "0.6.0-beta.31", + "@xterm/addon-image": "0.7.0-beta.29", + "@xterm/addon-search": "0.14.0-beta.31", + "@xterm/addon-serialize": "0.12.0-beta.31", + "@xterm/addon-unicode11": "0.7.0-beta.31", + "@xterm/addon-webgl": "0.17.0-beta.31", + "vscode": "npm:@codingame/monaco-vscode-api@3.1.1", + "vscode-marked": "npm:marked@=3.0.2" + } + }, + "node_modules/@codingame/monaco-vscode-testing-service-override/node_modules/@codingame/monaco-vscode-base-service-override": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-base-service-override/-/monaco-vscode-base-service-override-3.1.1.tgz", + "integrity": "sha512-Q2as13w1lX+ng4LvIH0O01c++7U2GQkqScQh3ThQI86/g96rX8JONmtWKuPojYzT3DkastsaYZ4rrkh68VDZLg==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@3.1.1" + } + }, + "node_modules/@codingame/monaco-vscode-testing-service-override/node_modules/@codingame/monaco-vscode-environment-service-override": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-environment-service-override/-/monaco-vscode-environment-service-override-3.1.1.tgz", + "integrity": "sha512-aJqZKmTetYPYKasNWPKZCKiKVvxtmDBYbJmwImEu2psddpxe5o948EVbnFVdYRydvX49VGMmEd3yv7mw/7ohOg==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@3.1.1" + } + }, + "node_modules/@codingame/monaco-vscode-testing-service-override/node_modules/@codingame/monaco-vscode-extensions-service-override": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-extensions-service-override/-/monaco-vscode-extensions-service-override-3.1.1.tgz", + "integrity": "sha512-0hXbNQFHUm9cwGMfoG7jL+BFJjJ0JuAkP5sCqbomdHe2tB7hZG+Fk38DYxWHxC3lpgOqcxD4ERBNQ24HBMuPAw==", + "dependencies": { + "@codingame/monaco-vscode-base-service-override": "3.1.1", + "@codingame/monaco-vscode-environment-service-override": "3.1.1", + "@codingame/monaco-vscode-extensions-service-override": "3.1.1", + "@codingame/monaco-vscode-files-service-override": "3.1.1", + "@codingame/monaco-vscode-host-service-override": "3.1.1", + "@codingame/monaco-vscode-layout-service-override": "3.1.1", + "@codingame/monaco-vscode-quickaccess-service-override": "3.1.1", + "vscode": "npm:@codingame/monaco-vscode-api@3.1.1", + "vscode-marked": "npm:marked@=3.0.2", + "vscode-semver": "npm:semver@=5.5.0" + } + }, + "node_modules/@codingame/monaco-vscode-testing-service-override/node_modules/@codingame/monaco-vscode-files-service-override": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-files-service-override/-/monaco-vscode-files-service-override-3.1.1.tgz", + "integrity": "sha512-Hxqd3eWtlMKiRVCoFkLcse4I2KntU0ylnaMxkxDAgP1L8M83AZTsEckeazw/HO6Z8tfNp+F+qJymWocRY7bK8w==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@3.1.1", + "vscode-marked": "npm:marked@=3.0.2" + } + }, + "node_modules/@codingame/monaco-vscode-testing-service-override/node_modules/@codingame/monaco-vscode-host-service-override": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-host-service-override/-/monaco-vscode-host-service-override-3.1.1.tgz", + "integrity": "sha512-qFA1k0H0YwLic5q6JgYiuogotV35CmWhWTbrqp+luksq+q4bTujfgqo9hg7UdjmEXtmxOjxBuTHSZ8JdSRmMGA==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@3.1.1" + } + }, + "node_modules/@codingame/monaco-vscode-testing-service-override/node_modules/@codingame/monaco-vscode-layout-service-override": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-layout-service-override/-/monaco-vscode-layout-service-override-3.1.1.tgz", + "integrity": "sha512-SueE7zH8VYQ0+GFPCsGYyEJHks8hAwU83tWf4JdNK3Hf7dFpNv/NTM1ssP6AHbNhqRFsptGr8JSCGR5SMYvbjQ==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@3.1.1", + "vscode-marked": "npm:marked@=3.0.2" + } + }, + "node_modules/@codingame/monaco-vscode-testing-service-override/node_modules/@codingame/monaco-vscode-quickaccess-service-override": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-quickaccess-service-override/-/monaco-vscode-quickaccess-service-override-3.1.1.tgz", + "integrity": "sha512-YmhrlDOzqdwGnA09eEOSlI47EzIODhMBqBmnOQoRthw98GGBxYNOQmVLAJp6/0++G7xmfz1lkzx+RNyW9ni7gA==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@3.1.1", + "vscode-marked": "npm:marked@=3.0.2" + } + }, + "node_modules/@codingame/monaco-vscode-testing-service-override/node_modules/vscode": { + "name": "@codingame/monaco-vscode-api", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-3.1.1.tgz", + "integrity": "sha512-Tw+8EYlTGLpP4+MOEr9OHmXofmr9FFbh5v18ui8hpnR+1taDDLQIyXXZSU1FW4jC9P/vzns6l4G+rdpy2bRXjg==", + "dependencies": { + "@codingame/monaco-vscode-base-service-override": "3.1.1", + "@codingame/monaco-vscode-environment-service-override": "3.1.1", + "@codingame/monaco-vscode-extensions-service-override": "3.1.1", + "@codingame/monaco-vscode-files-service-override": "3.1.1", + "@codingame/monaco-vscode-host-service-override": "3.1.1", + "@codingame/monaco-vscode-layout-service-override": "3.1.1", + "@codingame/monaco-vscode-quickaccess-service-override": "3.1.1", + "vscode-marked": "npm:marked@=3.0.2", + "vscode-semver": "npm:semver@=5.5.0" + } + }, "node_modules/@codingame/monaco-vscode-textmate-service-override": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-textmate-service-override/-/monaco-vscode-textmate-service-override-3.1.0.tgz", @@ -3056,6 +3157,60 @@ "vscode-languagedetection": "cli/index.js" } }, + "node_modules/@xterm/addon-canvas": { + "version": "0.6.0-beta.31", + "resolved": "https://registry.npmjs.org/@xterm/addon-canvas/-/addon-canvas-0.6.0-beta.31.tgz", + "integrity": "sha512-jm/7FWZOgnAGG7MXjr0W4SnuIzsag+oVpyf6wAD9UlCgq5HBuk/3kJ5mYGiGR7CpdTxqXmzyBk3OhQe8npZ1aQ==", + "peerDependencies": { + "@xterm/xterm": "^5.0.0" + } + }, + "node_modules/@xterm/addon-image": { + "version": "0.7.0-beta.29", + "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.7.0-beta.29.tgz", + "integrity": "sha512-Z5JCuhl0AcwQA+DE/kQMeSSHZbfwJVLUUBodDeujVItQrcpc9vA8mxf/qIwS3XTA/tPbFihfc/CE9zL7OFdbaw==", + "peerDependencies": { + "@xterm/xterm": "^5.2.0" + } + }, + "node_modules/@xterm/addon-search": { + "version": "0.14.0-beta.31", + "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.14.0-beta.31.tgz", + "integrity": "sha512-SS4CdgciLT98Uc4Dq0IjJegHcGIjGaASTcMtVkNBx9dOat9xt6lCXmtgUUj5w0KlB8nUfKrcy5T6fHgzrOzvrw==", + "peerDependencies": { + "@xterm/xterm": "^5.0.0" + } + }, + "node_modules/@xterm/addon-serialize": { + "version": "0.12.0-beta.31", + "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.12.0-beta.31.tgz", + "integrity": "sha512-MZ24pw33qOJrHdA6tlvwE4dSSpmIp/H9ZKtbiWZvuxVsY/hfYYPOluBQiCsOiYT7bZ8gQub2OOBX3jyMoZVxnQ==", + "peerDependencies": { + "@xterm/xterm": "^5.0.0" + } + }, + "node_modules/@xterm/addon-unicode11": { + "version": "0.7.0-beta.31", + "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.7.0-beta.31.tgz", + "integrity": "sha512-wrZLt2s6Yjmpe4nh0Sp6DKji0EoHod7V6ABfWBf8krjmEGSleE+GSb+ZwDOMsNzLJLmxoq1e6glHcVixG1z7WQ==", + "peerDependencies": { + "@xterm/xterm": "^5.0.0" + } + }, + "node_modules/@xterm/addon-webgl": { + "version": "0.17.0-beta.31", + "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.17.0-beta.31.tgz", + "integrity": "sha512-wqbBDDppwQ4R8o0YgnyFL8Pai2mVZqHb3E097vkFLB5Fw2hNx2dys3MgiXriSGXaUABKM3usVdZyouL6QgWdxQ==", + "peerDependencies": { + "@xterm/xterm": "^5.0.0" + } + }, + "node_modules/@xterm/xterm": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.4.0.tgz", + "integrity": "sha512-GlyzcZZ7LJjhFevthHtikhiDIl8lnTSgol6eTM4aoSNLcuXu3OEhnbqdCVIjtIil3jjabf3gDtb1S8FGahsuEw==", + "peer": true + }, "node_modules/abstract-leveldown": { "version": "0.12.4", "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz", diff --git a/package.json b/package.json index 0044693..ccfa712 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,10 @@ "types": "./dist/features/debug.d.ts", "default": "./dist/features/debug.js" }, + "./features/testing": { + "types": "./dist/features/testing.d.ts", + "default": "./dist/features/testing.js" + }, "./features/search": { "types": "./dist/features/search.d.ts", "default": "./dist/features/search.js" @@ -68,6 +72,9 @@ "features/debug": [ "./dist/features/debug.d.ts" ], + "features/testing": [ + "./dist/features/debug.d.ts" + ], "features/search": [ "./dist/features/search.d.ts" ], @@ -148,6 +155,7 @@ "@codingame/monaco-vscode-sql-default-extension": "^3.1.0", "@codingame/monaco-vscode-storage-service-override": "^3.1.0", "@codingame/monaco-vscode-swift-default-extension": "^3.1.0", + "@codingame/monaco-vscode-testing-service-override": "^3.1.1", "@codingame/monaco-vscode-textmate-service-override": "^3.1.0", "@codingame/monaco-vscode-theme-defaults-default-extension": "^3.1.0", "@codingame/monaco-vscode-theme-service-override": "^3.1.0", diff --git a/rollup.config.ts b/rollup.config.ts index 95267a3..9c94985 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -7,9 +7,9 @@ import * as rollup from 'rollup' import builtins from 'rollup-plugin-node-builtins' import vsixPlugin from '@codingame/monaco-vscode-rollup-vsix-plugin' import glob from 'fast-glob' +import { addExtension } from '@rollup/pluginutils' import path from 'path' import pkg from './package.json' assert { type: 'json' } -import { addExtension } from '@rollup/pluginutils' const externals = Object.keys(pkg.dependencies) @@ -23,6 +23,7 @@ export default rollup.defineConfig({ 'features/viewPanels': 'src/features/viewPanels.ts', 'features/search': 'src/features/search.ts', 'features/debug': 'src/features/debug.ts', + 'features/testing': 'src/features/testing.ts', 'features/extensionHostWorker': 'src/features/extensionHostWorker.ts', 'features/notifications': 'src/features/notifications.ts', 'features/extensionGallery': 'src/features/extensionGallery.ts', diff --git a/src/features/testing.ts b/src/features/testing.ts new file mode 100644 index 0000000..d9f2076 --- /dev/null +++ b/src/features/testing.ts @@ -0,0 +1,6 @@ +import getTestingServiceOverride from '@codingame/monaco-vscode-testing-service-override' +import { registerServices } from '../services' + +registerServices({ + ...getTestingServiceOverride() +}) diff --git a/src/index.ts b/src/index.ts index 38eccb8..c7659ec 100644 --- a/src/index.ts +++ b/src/index.ts @@ -3,12 +3,13 @@ import { createEditor, createModelReference, registerEditorOpenHandler } from '. import { updateUserConfiguration, registerConfigurations, registerDefaultConfigurations, onConfigurationChanged, getConfiguration, getUserConfiguration, onUserConfigurationChange } from './configuration' import { getMonacoLanguage, loadLanguage } from './languages' import { updateKeybindings, updateEditorKeybindingsMode } from './keybindings' -import { generateAndInitializeWorkspace, initialize, initializePromise, isInitialized, setUseGlobalPicker } from './services' +import { generateAndInitializeWorkspace, initialize, initializePromise, isInitialized, registerServices, setUseGlobalPicker } from './services' import './style' export * from './tools' export { monaco, + registerServices, initialize, generateAndInitializeWorkspace, isInitialized,