diff --git a/package-lock.json b/package-lock.json index c6cf5e2..b3fc8b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,6 +34,7 @@ "@codingame/monaco-vscode-language-detection-worker-service-override": "~2.0.0", "@codingame/monaco-vscode-languages-service-override": "~2.0.0", "@codingame/monaco-vscode-lifecycle-service-override": "~2.0.0", + "@codingame/monaco-vscode-log-service-override": "^2.0.1", "@codingame/monaco-vscode-lua-default-extension": "~2.0.0", "@codingame/monaco-vscode-markdown-basics-default-extension": "~2.0.0", "@codingame/monaco-vscode-markdown-language-features-default-extension": "~2.0.0", @@ -70,6 +71,7 @@ "@codingame/monaco-vscode-vb-default-extension": "~2.0.0", "@codingame/monaco-vscode-view-status-bar-service-override": "~2.0.0", "@codingame/monaco-vscode-views-service-override": "~2.0.0", + "@codingame/monaco-vscode-working-copy-service-override": "^2.0.1", "@codingame/monaco-vscode-xml-default-extension": "~2.0.0", "@codingame/monaco-vscode-yaml-default-extension": "~2.0.0", "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.0.0", @@ -615,15 +617,94 @@ } }, "node_modules/@codingame/monaco-vscode-log-service-override": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-log-service-override/-/monaco-vscode-log-service-override-2.0.0.tgz", - "integrity": "sha512-cKOiAfU7YeJlVJV9fP8+WFoRkOgrpN0UJn9LDxurwxHlGafGnYsCz3mHcLuCj4jpb2W7YN84d61ZtHu5K2VSLA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-log-service-override/-/monaco-vscode-log-service-override-2.0.1.tgz", + "integrity": "sha512-JmYLEBMD25YtdwvHsG36FKt9qwGiBw8Zz72WSiGrbwnv1aATOo0AI45msu/3RBSQ+TC4Ur0J7m10M+drJ78ojQ==", "dependencies": { - "@codingame/monaco-vscode-environment-service-override": "2.0.0", - "vscode": "npm:@codingame/monaco-vscode-api@2.0.0", + "@codingame/monaco-vscode-environment-service-override": "2.0.1", + "vscode": "npm:@codingame/monaco-vscode-api@2.0.1", + "vscode-marked": "npm:marked@=3.0.2" + } + }, + "node_modules/@codingame/monaco-vscode-log-service-override/node_modules/@codingame/monaco-vscode-base-service-override": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-base-service-override/-/monaco-vscode-base-service-override-2.0.1.tgz", + "integrity": "sha512-6FFMm50zMCFvXvf5MMxAK4iKmuCNYGSL4DOBnWdqUIq/HQEful0plyei6rHPeBC1XMeZur9keQoCI/wJzI6K2A==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@2.0.1" + } + }, + "node_modules/@codingame/monaco-vscode-log-service-override/node_modules/@codingame/monaco-vscode-environment-service-override": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-environment-service-override/-/monaco-vscode-environment-service-override-2.0.1.tgz", + "integrity": "sha512-BbXsqHyANEGfwlSqCxnqZ7pa1DR9t3Do+1nV8XonVuKIk5Scy+g2N2TShlP0szsgnABIRaFdIUqHiQSRtBxhpQ==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@2.0.1" + } + }, + "node_modules/@codingame/monaco-vscode-log-service-override/node_modules/@codingame/monaco-vscode-extensions-service-override": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-extensions-service-override/-/monaco-vscode-extensions-service-override-2.0.1.tgz", + "integrity": "sha512-zBhLzuMHIFnn2EOYvylFxyTQTII72/X+9E+K2LFSFeqaeV/WhOxE36OKvBNt/3U+g/vGx+5UzHSUhPat9XS7fA==", + "dependencies": { + "@codingame/monaco-vscode-files-service-override": "2.0.1", + "vscode": "npm:@codingame/monaco-vscode-api@2.0.1", + "vscode-marked": "npm:marked@=3.0.2", + "vscode-semver": "npm:semver@=5.5.0" + } + }, + "node_modules/@codingame/monaco-vscode-log-service-override/node_modules/@codingame/monaco-vscode-files-service-override": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-files-service-override/-/monaco-vscode-files-service-override-2.0.1.tgz", + "integrity": "sha512-abTC3S/E8kZ2xMMnukF6RU3Od42g4e+jfkbSgIZp6wnShKAY9b5UWsRzK5wN7Zp+4yXBDtWqZrg2KOAR6wAtfQ==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@2.0.1", "vscode-marked": "npm:marked@=3.0.2" } }, + "node_modules/@codingame/monaco-vscode-log-service-override/node_modules/@codingame/monaco-vscode-host-service-override": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-host-service-override/-/monaco-vscode-host-service-override-2.0.1.tgz", + "integrity": "sha512-C/RX+IMMmWmU8K70RwFtd50dyUBM70iueLFi/tvqLQlJadjRaKGHHfrUzwPt485FT7DDVvURf/4wm2sT9o1qVQ==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@2.0.1" + } + }, + "node_modules/@codingame/monaco-vscode-log-service-override/node_modules/@codingame/monaco-vscode-layout-service-override": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-layout-service-override/-/monaco-vscode-layout-service-override-2.0.1.tgz", + "integrity": "sha512-gTdcK0wgL32q39QY+VOlQuyry2uxdqCG6QHw0T2j/u/MJQzRbk7jHr1IJV3i+Z1dUZqlYKr4qT1zKcF6bBRA3A==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@2.0.1", + "vscode-marked": "npm:marked@=3.0.2" + } + }, + "node_modules/@codingame/monaco-vscode-log-service-override/node_modules/@codingame/monaco-vscode-quickaccess-service-override": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-quickaccess-service-override/-/monaco-vscode-quickaccess-service-override-2.0.1.tgz", + "integrity": "sha512-dss4UsCK+OuqaV2YDPeQER6hwbkp4b1wldTwUaztkU4z8WmWzNKq8yNDfLyEBk3G2FSAKCjZknkrvr+37CmTYA==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@2.0.1", + "vscode-marked": "npm:marked@=3.0.2" + } + }, + "node_modules/@codingame/monaco-vscode-log-service-override/node_modules/vscode": { + "name": "@codingame/monaco-vscode-api", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-2.0.1.tgz", + "integrity": "sha512-tV9e8WOeR1id8Jmqvh2v/ccMfhwrbVq3YAYvkn0wPOiHDAaEhkTPHPX68Vu0pexQif4VfJzDFDc4W56LAKhrAg==", + "dependencies": { + "@codingame/monaco-vscode-base-service-override": "2.0.1", + "@codingame/monaco-vscode-environment-service-override": "2.0.1", + "@codingame/monaco-vscode-extensions-service-override": "2.0.1", + "@codingame/monaco-vscode-files-service-override": "2.0.1", + "@codingame/monaco-vscode-host-service-override": "2.0.1", + "@codingame/monaco-vscode-layout-service-override": "2.0.1", + "@codingame/monaco-vscode-quickaccess-service-override": "2.0.1", + "vscode-marked": "npm:marked@=3.0.2", + "vscode-semver": "npm:semver@=5.5.0" + } + }, "node_modules/@codingame/monaco-vscode-lua-default-extension": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-lua-default-extension/-/monaco-vscode-lua-default-extension-2.0.0.tgz", @@ -707,6 +788,16 @@ "vscode-marked": "npm:marked@=3.0.2" } }, + "node_modules/@codingame/monaco-vscode-output-service-override/node_modules/@codingame/monaco-vscode-log-service-override": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-log-service-override/-/monaco-vscode-log-service-override-2.0.0.tgz", + "integrity": "sha512-cKOiAfU7YeJlVJV9fP8+WFoRkOgrpN0UJn9LDxurwxHlGafGnYsCz3mHcLuCj4jpb2W7YN84d61ZtHu5K2VSLA==", + "dependencies": { + "@codingame/monaco-vscode-environment-service-override": "2.0.0", + "vscode": "npm:@codingame/monaco-vscode-api@2.0.0", + "vscode-marked": "npm:marked@=3.0.2" + } + }, "node_modules/@codingame/monaco-vscode-perl-default-extension": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-perl-default-extension/-/monaco-vscode-perl-default-extension-2.0.0.tgz", @@ -949,6 +1040,94 @@ "vscode-marked": "npm:marked@=3.0.2" } }, + "node_modules/@codingame/monaco-vscode-working-copy-service-override": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-working-copy-service-override/-/monaco-vscode-working-copy-service-override-2.0.1.tgz", + "integrity": "sha512-ZfqC/UiyOOlnjdV6gQbsec1FVjSEIMOjS0maLwO0wu2uweyAkEhMIFI5kIe83Js6TAwMT16hJLt9R5KY2dbX8g==", + "dependencies": { + "@codingame/monaco-vscode-files-service-override": "2.0.1", + "vscode": "npm:@codingame/monaco-vscode-api@2.0.1" + } + }, + "node_modules/@codingame/monaco-vscode-working-copy-service-override/node_modules/@codingame/monaco-vscode-base-service-override": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-base-service-override/-/monaco-vscode-base-service-override-2.0.1.tgz", + "integrity": "sha512-6FFMm50zMCFvXvf5MMxAK4iKmuCNYGSL4DOBnWdqUIq/HQEful0plyei6rHPeBC1XMeZur9keQoCI/wJzI6K2A==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@2.0.1" + } + }, + "node_modules/@codingame/monaco-vscode-working-copy-service-override/node_modules/@codingame/monaco-vscode-environment-service-override": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-environment-service-override/-/monaco-vscode-environment-service-override-2.0.1.tgz", + "integrity": "sha512-BbXsqHyANEGfwlSqCxnqZ7pa1DR9t3Do+1nV8XonVuKIk5Scy+g2N2TShlP0szsgnABIRaFdIUqHiQSRtBxhpQ==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@2.0.1" + } + }, + "node_modules/@codingame/monaco-vscode-working-copy-service-override/node_modules/@codingame/monaco-vscode-extensions-service-override": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-extensions-service-override/-/monaco-vscode-extensions-service-override-2.0.1.tgz", + "integrity": "sha512-zBhLzuMHIFnn2EOYvylFxyTQTII72/X+9E+K2LFSFeqaeV/WhOxE36OKvBNt/3U+g/vGx+5UzHSUhPat9XS7fA==", + "dependencies": { + "@codingame/monaco-vscode-files-service-override": "2.0.1", + "vscode": "npm:@codingame/monaco-vscode-api@2.0.1", + "vscode-marked": "npm:marked@=3.0.2", + "vscode-semver": "npm:semver@=5.5.0" + } + }, + "node_modules/@codingame/monaco-vscode-working-copy-service-override/node_modules/@codingame/monaco-vscode-files-service-override": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-files-service-override/-/monaco-vscode-files-service-override-2.0.1.tgz", + "integrity": "sha512-abTC3S/E8kZ2xMMnukF6RU3Od42g4e+jfkbSgIZp6wnShKAY9b5UWsRzK5wN7Zp+4yXBDtWqZrg2KOAR6wAtfQ==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@2.0.1", + "vscode-marked": "npm:marked@=3.0.2" + } + }, + "node_modules/@codingame/monaco-vscode-working-copy-service-override/node_modules/@codingame/monaco-vscode-host-service-override": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-host-service-override/-/monaco-vscode-host-service-override-2.0.1.tgz", + "integrity": "sha512-C/RX+IMMmWmU8K70RwFtd50dyUBM70iueLFi/tvqLQlJadjRaKGHHfrUzwPt485FT7DDVvURf/4wm2sT9o1qVQ==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@2.0.1" + } + }, + "node_modules/@codingame/monaco-vscode-working-copy-service-override/node_modules/@codingame/monaco-vscode-layout-service-override": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-layout-service-override/-/monaco-vscode-layout-service-override-2.0.1.tgz", + "integrity": "sha512-gTdcK0wgL32q39QY+VOlQuyry2uxdqCG6QHw0T2j/u/MJQzRbk7jHr1IJV3i+Z1dUZqlYKr4qT1zKcF6bBRA3A==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@2.0.1", + "vscode-marked": "npm:marked@=3.0.2" + } + }, + "node_modules/@codingame/monaco-vscode-working-copy-service-override/node_modules/@codingame/monaco-vscode-quickaccess-service-override": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-quickaccess-service-override/-/monaco-vscode-quickaccess-service-override-2.0.1.tgz", + "integrity": "sha512-dss4UsCK+OuqaV2YDPeQER6hwbkp4b1wldTwUaztkU4z8WmWzNKq8yNDfLyEBk3G2FSAKCjZknkrvr+37CmTYA==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@2.0.1", + "vscode-marked": "npm:marked@=3.0.2" + } + }, + "node_modules/@codingame/monaco-vscode-working-copy-service-override/node_modules/vscode": { + "name": "@codingame/monaco-vscode-api", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-2.0.1.tgz", + "integrity": "sha512-tV9e8WOeR1id8Jmqvh2v/ccMfhwrbVq3YAYvkn0wPOiHDAaEhkTPHPX68Vu0pexQif4VfJzDFDc4W56LAKhrAg==", + "dependencies": { + "@codingame/monaco-vscode-base-service-override": "2.0.1", + "@codingame/monaco-vscode-environment-service-override": "2.0.1", + "@codingame/monaco-vscode-extensions-service-override": "2.0.1", + "@codingame/monaco-vscode-files-service-override": "2.0.1", + "@codingame/monaco-vscode-host-service-override": "2.0.1", + "@codingame/monaco-vscode-layout-service-override": "2.0.1", + "@codingame/monaco-vscode-quickaccess-service-override": "2.0.1", + "vscode-marked": "npm:marked@=3.0.2", + "vscode-semver": "npm:semver@=5.5.0" + } + }, "node_modules/@codingame/monaco-vscode-xml-default-extension": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-xml-default-extension/-/monaco-vscode-xml-default-extension-2.0.0.tgz", diff --git a/package.json b/package.json index ffd1eb4..180a5a9 100644 --- a/package.json +++ b/package.json @@ -94,6 +94,7 @@ "@codingame/monaco-vscode-language-detection-worker-service-override": "~2.0.0", "@codingame/monaco-vscode-languages-service-override": "~2.0.0", "@codingame/monaco-vscode-lifecycle-service-override": "~2.0.0", + "@codingame/monaco-vscode-log-service-override": "^2.0.1", "@codingame/monaco-vscode-lua-default-extension": "~2.0.0", "@codingame/monaco-vscode-markdown-basics-default-extension": "~2.0.0", "@codingame/monaco-vscode-markdown-language-features-default-extension": "~2.0.0", @@ -130,6 +131,7 @@ "@codingame/monaco-vscode-vb-default-extension": "~2.0.0", "@codingame/monaco-vscode-view-status-bar-service-override": "~2.0.0", "@codingame/monaco-vscode-views-service-override": "~2.0.0", + "@codingame/monaco-vscode-working-copy-service-override": "^2.0.1", "@codingame/monaco-vscode-xml-default-extension": "~2.0.0", "@codingame/monaco-vscode-yaml-default-extension": "~2.0.0", "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.0.0", @@ -198,4 +200,4 @@ "rollup": "4.9.6", "typescript": "5.3.3" } -} \ No newline at end of file +} diff --git a/src/services.ts b/src/services.ts index d098dd1..26ed989 100644 --- a/src/services.ts +++ b/src/services.ts @@ -15,6 +15,8 @@ import getEditorServiceOverride from '@codingame/monaco-vscode-editor-service-ov import getStorageServiceOverride from '@codingame/monaco-vscode-storage-service-override' import getLifecycleServiceOverride from '@codingame/monaco-vscode-lifecycle-service-override' import getQuickAccessServiceOverride from '@codingame/monaco-vscode-quickaccess-service-override' +import getLogServiceOverride from '@codingame/monaco-vscode-log-service-override' +import getWorkingCopyServiceOverride from '@codingame/monaco-vscode-working-copy-service-override' import { ILogService, LogLevel, StandaloneServices, initialize as initializeServices } from 'vscode/services' import * as monaco from 'monaco-editor' import { initFile } from '@codingame/monaco-vscode-files-service-override' @@ -34,6 +36,7 @@ export function useGlobalPicker (): boolean { } let services: monaco.editor.IEditorOverrideServices = { + ...getLogServiceOverride(), ...getExtensionServiceOverride(), ...getModelServiceOverride(), ...getDialogsServiceOverride(), @@ -60,7 +63,8 @@ let services: monaco.editor.IEditorOverrideServices = { shouldUseGlobalPicker () { return useGlobalPicker() } - }) + }), + ...getWorkingCopyServiceOverride() } export function registerServices (newServices: monaco.editor.IEditorOverrideServices): void {