diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6254f83b..85550bb5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,8 +1,6 @@ name: Release -on: - push: - branches: [main] +on: workflow_dispatch permissions: contents: write # to be able to publish a GitHub release diff --git a/demo/src/features/customView.ts b/demo/src/features/customView.ts index ae439b53..8e5a4d49 100644 --- a/demo/src/features/customView.ts +++ b/demo/src/features/customView.ts @@ -1,7 +1,6 @@ -import { IDialogService } from 'vscode/services' -import { registerCustomView, registerEditorPane, ViewContainerLocation } from '@codingame/monaco-vscode-views-service-override' +import { IDialogService, EditorInput, ITelemetryService, IThemeService, IStorageService, createInstance } from 'vscode/services' +import { registerCustomView, registerEditorPane, registerEditor, ViewContainerLocation, SimpleEditorPane, SimpleEditorInput, RegisteredEditorPriority, IEditorCloseHandler, ConfirmResult } from '@codingame/monaco-vscode-views-service-override' import * as monaco from 'monaco-editor' -import iconUrl from '../Visual_Studio_Code_1.35_icon.svg?url' registerCustomView({ id: 'custom-view', @@ -20,7 +19,7 @@ registerCustomView({ } }, location: ViewContainerLocation.Panel, - icon: new URL(iconUrl, window.location.href).toString(), + icon: new URL('../Visual_Studio_Code_1.35_icon.svg', import.meta.url).toString(), actions: [{ id: 'custom-action', title: 'Custom action', @@ -43,20 +42,76 @@ registerCustomView({ }] }) -const { CustomEditorInput } = registerEditorPane({ - id: 'custom-editor-pane', - name: 'Custom editor pane', - renderBody (container) { +class CustomEditorPane extends SimpleEditorPane { + static readonly ID = 'workbench.editors.customEditor' + + constructor ( + @ITelemetryService telemetryService: ITelemetryService, @IThemeService themeService: IThemeService, @IStorageService storageService: IStorageService + ) { + super(CustomEditorPane.ID, telemetryService, themeService, storageService) + } + + initialize (): HTMLElement { + const container = document.createElement('div') container.style.display = 'flex' container.style.alignItems = 'center' container.style.justifyContent = 'center' container.innerHTML = 'This is a custom editor pane
You can render anything you want here' + return container + } + + async renderInput (input: EditorInput): Promise { + if (input.resource != null) { + this.container.innerHTML = 'Opened file: ' + input.resource.path + } else { + this.container.innerHTML = 'This is a custom editor pane
You can render anything you want here' + } return { dispose () { } } } +} +class CustomEditorInput extends SimpleEditorInput implements IEditorCloseHandler { + constructor (resource: monaco.Uri | undefined, @IDialogService private dialogService: IDialogService) { + super(resource) + + this.closeHandler = this + + this.setName('Custom editor pane input') + } + + async confirm (): Promise { + const { confirmed } = await this.dialogService.confirm({ + message: 'Are you sure you want to close this INCREDIBLE editor pane?' + }) + return confirmed ? ConfirmResult.DONT_SAVE : ConfirmResult.CANCEL + } + + showConfirm (): boolean { + return true + } + + get typeId (): string { + return CustomEditorPane.ID + } +} + +registerEditorPane('custom-editor-pane', 'Custom editor pane', CustomEditorPane, [CustomEditorInput]) + +registerEditor('*.customeditor', { + id: CustomEditorPane.ID, + label: 'Custom editor pane input', + priority: RegisteredEditorPriority.default +}, { + singlePerResource: true +}, { + async createEditorInput (editorInput) { + return { + editor: await createInstance(CustomEditorInput, editorInput.resource) + } + } }) export { CustomEditorInput } diff --git a/demo/src/features/filesystem.ts b/demo/src/features/filesystem.ts index 5993d5ba..22974d98 100644 --- a/demo/src/features/filesystem.ts +++ b/demo/src/features/filesystem.ts @@ -49,6 +49,10 @@ $$ $$` )) +fileSystemProvider.registerFile(new RegisteredMemoryFile(vscode.Uri.file('/tmp/test.customeditor'), ` +Custom Editor!` +)) + fileSystemProvider.registerFile(new RegisteredMemoryFile(vscode.Uri.file('/tmp/test.css'), ` h1 { color: DeepSkyBlue; diff --git a/demo/src/main.ts b/demo/src/main.ts index 58019148..513619e5 100644 --- a/demo/src/main.ts +++ b/demo/src/main.ts @@ -3,8 +3,8 @@ import * as monaco from 'monaco-editor' import { createConfiguredEditor, createModelReference } from 'vscode/monaco' import { registerFileSystemOverlay, HTMLFileSystemProvider } from '@codingame/monaco-vscode-files-service-override' import * as vscode from 'vscode' -import { ILogService, StandaloneServices, IPreferencesService, IEditorService, IDialogService, getService } from 'vscode/services' -import { ConfirmResult, Parts, isPartVisibile, setPartVisibility } from '@codingame/monaco-vscode-views-service-override' +import { ILogService, StandaloneServices, IPreferencesService, IEditorService, IDialogService, getService, createInstance } from 'vscode/services' +import { Parts, isPartVisibile, setPartVisibility } from '@codingame/monaco-vscode-views-service-override' import { defaultUserConfigurationFile } from '@codingame/monaco-vscode-configuration-service-override' import { defaultUserKeybindindsFile } from '@codingame/monaco-vscode-keybindings-service-override' import { clearStorage, remoteAuthority } from './setup' @@ -151,17 +151,7 @@ document.querySelector('#keybindingsui')!.addEventListener('click', async () => }) document.querySelector('#customEditorPanel')!.addEventListener('click', async () => { - const input = new CustomEditorInput({ - async confirm () { - const { confirmed } = await StandaloneServices.get(IDialogService).confirm({ - message: 'Are you sure you want to close this INCREDIBLE editor pane?' - }) - return confirmed ? ConfirmResult.DONT_SAVE : ConfirmResult.CANCEL - }, - showConfirm () { - return true - } - }) + const input = await createInstance(CustomEditorInput, undefined) let toggle = false const interval = window.setInterval(() => { const title = toggle ? 'Awesome editor pane' : 'Incredible editor pane' diff --git a/demo/tsconfig.json b/demo/tsconfig.json index dd632cfe..361f43e5 100644 --- a/demo/tsconfig.json +++ b/demo/tsconfig.json @@ -15,6 +15,7 @@ "noUnusedParameters": true, "noImplicitReturns": true, "baseUrl": ".", + "experimentalDecorators": true, "paths": { "vscode/vscode/*": ["../dist/main/vscode/src/*"], "vscode/*": ["../dist/main/*"] diff --git a/package.json b/package.json index 0191caa2..bcd4ccb6 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "compile-default-extensions": "NODE_OPTIONS=--max_old_space_size=8192 rollup --config rollup/rollup.default-extensions.ts --configPlugin 'typescript={tsconfig: `tsconfig.rollup-config-default-extensions.json`}'", "compile-language-packs": "NODE_OPTIONS=--max_old_space_size=8192 rollup --config rollup/rollup.language-packs.ts --configPlugin 'typescript={tsconfig: `tsconfig.rollup-config-language-packs.json`}'", "clean": "rm -rf dist/", - "compile-server": "rollup --config rollup/rollup.server.config.ts --configPlugin 'typescript={tsconfig: `tsconfig.rollup-config-server.json`, include: [`./rollup/rollup.server.config.ts`, `./rollup/rollup-metadata-plugin.ts`]}'", + "compile-server": "rollup --config rollup/rollup.server.config.ts --configPlugin 'typescript={tsconfig: `tsconfig.rollup-config-server.json`, include: [`./rollup/rollup.server.config.ts`, `./rollup/rollup-metadata-plugin.ts`]}' --vscode-version ${npm_package_config_vscode_version}", "compile-treemending-script": "rollup --config rollup/rollup.treemending-script.config.ts --configPlugin 'typescript={tsconfig: `tsconfig.rollup-config-treemending-script.json`, include: [`./rollup/rollup.treemending-script.config.ts`, `./rollup/rollup-metadata-plugin.ts`]}'", "compile-rollup-plugins": "rollup --config rollup/rollup.rollup-plugins.config.ts --configPlugin 'typescript={tsconfig: `tsconfig.rollup-config-plugins.json`, include: [`./rollup/rollup.rollup-plugins.config.ts`, `./rollup/rollup-metadata-plugin.ts`]}'", "copy-monaco-editor": "cp -R node_modules/monaco-editor dist/ && (cd dist/monaco-editor; change-package-name \"@codingame/monaco-editor-treemended\")", diff --git a/rollup/rollup.config.ts b/rollup/rollup.config.ts index 4929a8a7..8b071c30 100644 --- a/rollup/rollup.config.ts +++ b/rollup/rollup.config.ts @@ -115,7 +115,6 @@ const DIST_DIR_MAIN = path.resolve(DIST_DIR, 'main') const VSCODE_SRC_DIST_DIR = path.resolve(DIST_DIR_MAIN, 'vscode', 'src') const VSCODE_DIR = path.resolve(BASE_DIR, 'vscode') const VSCODE_SRC_DIR = path.resolve(VSCODE_DIR, 'src') -const ASSETS_PATH = path.resolve(BASE_DIR, 'src/assets') const NODE_MODULES_DIR = path.resolve(BASE_DIR, 'node_modules') const MONACO_EDITOR_DIR = path.resolve(NODE_MODULES_DIR, './monaco-editor') const MONACO_EDITOR_ESM_DIR = path.resolve(MONACO_EDITOR_DIR, './esm') @@ -552,26 +551,6 @@ export default (args: Record): rollup.RollupOptions[] => { assetFileNames: 'assets/[name][extname]', format: 'esm', dir: 'dist/main', - intro (chunk) { - // Ensure that all our files start with an import to `assets.ts`, as this - // file has a side-effect (setting monacoRequire on globalThis) that needs - // to be evaluated before VSCode evaluates. Because VSCode needs this side-effect - // for its own side-effects. - if (chunk.facadeModuleId == null) { - return '' - } - - if (!chunk.facadeModuleId.startsWith(SRC_DIR)) { - return '' - } - - let relativePath = path.relative(path.dirname(chunk.facadeModuleId), ASSETS_PATH) - if (!relativePath.startsWith('.')) { - relativePath = './' + relativePath - } - - return `import "${relativePath}";\n` - }, entryFileNames: (chunkInfo) => { // Rename node_modules to external so it's not removing while publishing the package // tslib and rollup-plugin-styles and bundled @@ -581,10 +560,7 @@ export default (args: Record): rollup.RollupOptions[] => { return '[name].js' }, chunkFileNames: '[name].js', - hoistTransitiveImports: false, - paths: { - 'monaco-editor': 'monaco-editor/esm/vs/editor/editor.api.js' - } + hoistTransitiveImports: false }], input, plugins: [ @@ -694,7 +670,8 @@ export default (args: Record): rollup.RollupOptions[] => { } }] } - }), replace({ + }), + replace({ VSCODE_VERSION: JSON.stringify(vscodeVersion), VSCODE_REF: JSON.stringify(vscodeRef), preventAssignment: true diff --git a/rollup/rollup.server.config.ts b/rollup/rollup.server.config.ts index 2c722959..ae31e427 100644 --- a/rollup/rollup.server.config.ts +++ b/rollup/rollup.server.config.ts @@ -3,6 +3,7 @@ import * as rollup from 'rollup' import typescript from '@rollup/plugin-typescript' import commonjs from '@rollup/plugin-commonjs' import json from '@rollup/plugin-json' +import replace from '@rollup/plugin-replace' import { PackageJson } from 'type-fest' import * as fs from 'fs/promises' import * as path from 'path' @@ -22,72 +23,85 @@ const dir = 'dist/server' await fs.mkdir('dist/server/extensions', { recursive: true }) const externals = Object.keys(pkg.dependencies) -const config: rollup.RollupOptions = { - cache: false, - external: (source) => { - if (source === 'graceful-fs' || source === 'xterm-headless') { - // commonjs module - return false - } - return externals.some(external => source === external || source.startsWith(`${external}/`)) - }, - output: [{ - format: 'esm', - dir, - entryFileNames: '[name].js', - chunkFileNames: '[name].js', - banner: (module) => module.isEntry ? '#!/usr/bin/env node' : '' - }], - input: { - server: 'src/server/server.ts', - 'bootstrap-fork': 'src/server/bootstrap-fork.ts' - }, - plugins: [ - json({ - compact: true, - namedExports: false, - preferConst: false - }), - commonjs({ - ignoreDynamicRequires: true - }), - nodeResolve({ - extensions: EXTENSIONS, - modulePaths: ['vscode/src'], - browser: false, - preferBuiltins: true - }), - typescript({ - noEmitOnError: true, - tsconfig: TSCONFIG, - compilerOptions: { - outDir: 'dist/server' + +export default (args: Record): rollup.RollupOptions[] => { + const vscodeVersion = args['vscode-version'] + delete args['vscode-version'] + if (vscodeVersion == null) { + throw new Error('Vscode version is mandatory') + } + + const config: rollup.RollupOptions[] = [{ + cache: false, + external: (source) => { + if (source === 'graceful-fs' || source === 'xterm-headless') { + // commonjs module + return false } - }), - metadataPlugin({ - handle (_, dependencies) { - const packageJson: PackageJson = { - name: '@codingame/monaco-vscode-server', - ...Object.fromEntries(Object.entries(pkg).filter(([key]) => ['version', 'keywords', 'author', 'license', 'repository', 'type'].includes(key))), - private: false, - description: `VSCode server designed to be used with ${pkg.name}`, - bin: { - 'vscode-ext-host-server': './server.js' - }, - dependencies: { - vscode: `npm:${pkg.name}@^${pkg.version}`, - ...Object.fromEntries(Object.entries(pkg.dependencies).filter(([key]) => dependencies.has(key))) + return externals.some(external => source === external || source.startsWith(`${external}/`)) + }, + output: [{ + format: 'esm', + dir, + entryFileNames: '[name].js', + chunkFileNames: '[name].js', + banner: (module) => module.isEntry ? '#!/usr/bin/env node' : '' + }], + input: { + server: 'src/server/server.ts', + 'bootstrap-fork': 'src/server/bootstrap-fork.ts' + }, + plugins: [ + json({ + compact: true, + namedExports: false, + preferConst: false + }), + commonjs({ + ignoreDynamicRequires: true + }), + nodeResolve({ + extensions: EXTENSIONS, + modulePaths: ['vscode/src'], + browser: false, + preferBuiltins: true + }), + typescript({ + noEmitOnError: true, + tsconfig: TSCONFIG, + compilerOptions: { + outDir: 'dist/server' + } + }), + replace({ + VSCODE_VERSION: JSON.stringify(vscodeVersion), + preventAssignment: true + }), + metadataPlugin({ + handle (_, dependencies) { + const packageJson: PackageJson = { + name: '@codingame/monaco-vscode-server', + ...Object.fromEntries(Object.entries(pkg).filter(([key]) => ['version', 'keywords', 'author', 'license', 'repository', 'type'].includes(key))), + private: false, + description: `VSCode server designed to be used with ${pkg.name}`, + bin: { + 'vscode-ext-host-server': './server.js' + }, + dependencies: { + vscode: `npm:${pkg.name}@^${pkg.version}`, + ...Object.fromEntries(Object.entries(pkg.dependencies).filter(([key]) => dependencies.has(key))) + } } + this.emitFile({ + fileName: 'package.json', + needsCodeReference: false, + source: JSON.stringify(packageJson, null, 2), + type: 'asset' + }) } - this.emitFile({ - fileName: 'package.json', - needsCodeReference: false, - source: JSON.stringify(packageJson, null, 2), - type: 'asset' - }) - } - }) - ] -} + }) + ] + }] -export default config + return config +} diff --git a/scripts/vscode.patch b/scripts/vscode.patch index 23be8027..71d92fee 100644 --- a/scripts/vscode.patch +++ b/scripts/vscode.patch @@ -10,10 +10,45 @@ index f44673cd1cd..cdb439f7dd1 100644 "worker_threads", "xterm", "xterm-addon-canvas", +diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js +index f9f76e4d371..dd21532bc73 100644 +--- a/build/gulpfile.editor.js ++++ b/build/gulpfile.editor.js +@@ -404,17 +404,10 @@ gulp.task('editor-distro', + util.rimraf('out-editor-min') + ), + extractEditorSrcTask, +- task.parallel( +- task.series( +- compileEditorAMDTask, +- optimizeEditorAMDTask, +- minifyEditorAMDTask +- ), +- task.series( +- createESMSourcesAndResourcesTask, +- compileEditorESMTask, +- appendJSToESMImportsTask +- ) ++ task.series( ++ createESMSourcesAndResourcesTask, ++ compileEditorESMTask, ++ appendJSToESMImportsTask + ), + finalEditorResourcesTask + ) diff --git a/build/lib/standalone.js b/build/lib/standalone.js -index 38be1131300..f958d658cb2 100644 +index 38be1131300..ab391ee2b3e 100644 --- a/build/lib/standalone.js +++ b/build/lib/standalone.js +@@ -134,7 +134,7 @@ function createESMSourcesAndResources2(options) { + } + if (file === 'tsconfig.json') { + const tsConfig = JSON.parse(fs.readFileSync(path.join(SRC_FOLDER, file)).toString()); +- tsConfig.compilerOptions.module = 'es6'; ++ tsConfig.compilerOptions.module = 'es2020'; + tsConfig.compilerOptions.outDir = path.join(path.relative(OUT_FOLDER, OUT_RESOURCES_FOLDER), 'vs').replace(/\\/g, '/'); + write(getDestAbsoluteFilePath(file), JSON.stringify(tsConfig, null, '\t')); + continue; @@ -150,6 +150,9 @@ function createESMSourcesAndResources2(options) { const info = ts.preProcessFile(fileContents); for (let i = info.importedFiles.length - 1; i >= 0; i--) { @@ -55,11 +90,21 @@ index 38be1131300..f958d658cb2 100644 } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"standalone.js","sourceRoot":"","sources":["standalone.ts"],"names":[],"mappings":"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"} \ No newline at end of file -+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"standalone.js","sourceRoot":"","sources":["standalone.ts"],"names":[],"mappings":"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"} ++//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"standalone.js","sourceRoot":"","sources":["standalone.ts"],"names":[],"mappings":"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"} +\ No newline at end of file diff --git a/build/lib/standalone.ts b/build/lib/standalone.ts -index 775a1be5996..9a6d37f2765 100644 +index 775a1be5996..e1fa15ec079 100644 --- a/build/lib/standalone.ts +++ b/build/lib/standalone.ts +@@ -160,7 +160,7 @@ export function createESMSourcesAndResources2(options: IOptions2): void { + + if (file === 'tsconfig.json') { + const tsConfig = JSON.parse(fs.readFileSync(path.join(SRC_FOLDER, file)).toString()); +- tsConfig.compilerOptions.module = 'es6'; ++ tsConfig.compilerOptions.module = 'es2020'; + tsConfig.compilerOptions.outDir = path.join(path.relative(OUT_FOLDER, OUT_RESOURCES_FOLDER), 'vs').replace(/\\/g, '/'); + write(getDestAbsoluteFilePath(file), JSON.stringify(tsConfig, null, '\t')); + continue; @@ -180,6 +180,9 @@ export function createESMSourcesAndResources2(options: IOptions2): void { for (let i = info.importedFiles.length - 1; i >= 0; i--) { @@ -155,16 +200,36 @@ index 191c2d03f63..f1526cf68ac 100644 } diff --git a/src/tsconfig.base.json b/src/tsconfig.base.json -index c0a2e174591..7cc68fbc22b 100644 +index c0a2e174591..1d80c22afa3 100644 --- a/src/tsconfig.base.json +++ b/src/tsconfig.base.json -@@ -1,5 +1,6 @@ +@@ -1,6 +1,7 @@ { "compilerOptions": { +- "module": "amd", + "esModuleInterop": true, - "module": "amd", ++ "module": "ES2020", "moduleResolution": "node", "experimentalDecorators": true, + "noImplicitReturns": true, +diff --git a/src/tsconfig.monaco.json b/src/tsconfig.monaco.json +index b7c5d7468b5..c73b524ea2a 100644 +--- a/src/tsconfig.monaco.json ++++ b/src/tsconfig.monaco.json +@@ -7,11 +7,11 @@ + "wicg-file-system-access" + ], + "paths": {}, +- "module": "amd", ++ "module": "es2020", + "moduleResolution": "classic", + "removeComments": false, + "preserveConstEnums": true, +- "target": "es6", ++ "target": "es2020", + "sourceMap": false, + "declaration": true + }, diff --git a/src/vs/base/browser/defaultWorkerFactory.ts b/src/vs/base/browser/defaultWorkerFactory.ts index 4f42810f0bd..58b0747c812 100644 --- a/src/vs/base/browser/defaultWorkerFactory.ts @@ -180,7 +245,7 @@ index 4f42810f0bd..58b0747c812 100644 const ttPolicy = createTrustedTypesPolicy('defaultWorkerFactory', { createScriptURL: value => value }); diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts -index b00899c50db..825c7a073bf 100644 +index b00899c50db..2acfa2df3b2 100644 --- a/src/vs/base/common/network.ts +++ b/src/vs/base/common/network.ts @@ -4,6 +4,8 @@ @@ -192,24 +257,37 @@ index b00899c50db..825c7a073bf 100644 import * as platform from 'vs/base/common/platform'; import { URI } from 'vs/base/common/uri'; -@@ -195,6 +197,7 @@ export const nodeModulesAsarUnpackedPath: AppResourcePath = 'vs/../../node_modul +@@ -195,6 +197,20 @@ export const nodeModulesAsarUnpackedPath: AppResourcePath = 'vs/../../node_modul class FileAccessImpl { private static readonly FALLBACK_AUTHORITY = 'vscode-app'; + private staticBrowserUris = new ResourceMap(); ++ private appResourcePathUrls = new Map string)>(); ++ ++ public registerAppResourcePathUrl(moduleId: string, url: string | (() => string)): void { ++ this.appResourcePathUrls.set(moduleId, url); ++ } ++ ++ private toUrl(moduleId: string): string { ++ let url = this.appResourcePathUrls.get(moduleId); ++ if (typeof url === 'function') { ++ url = url(); ++ } ++ return new URL(url ?? '', globalThis.location?.href ?? import.meta.url).toString(); ++ } /** * Returns a URI to use in contexts where the browser is responsible -@@ -203,7 +206,7 @@ class FileAccessImpl { +@@ -203,7 +219,7 @@ class FileAccessImpl { * **Note:** use `dom.ts#asCSSUrl` whenever the URL is to be used in CSS context. */ asBrowserUri(resourcePath: AppResourcePath | ''): URI { - const uri = this.toUri(resourcePath, require); -+ const uri = this.toUri(resourcePath, (globalThis as any).monacoRequire); ++ const uri = this.toUri(resourcePath, { toUrl: this.toUrl.bind(this) }); return this.uriToBrowserUri(uri); } -@@ -242,7 +245,7 @@ class FileAccessImpl { +@@ -242,7 +258,7 @@ class FileAccessImpl { }); } @@ -218,16 +296,16 @@ index b00899c50db..825c7a073bf 100644 } /** -@@ -250,7 +253,7 @@ class FileAccessImpl { +@@ -250,7 +266,7 @@ class FileAccessImpl { * is responsible for loading. */ asFileUri(resourcePath: AppResourcePath | ''): URI { - const uri = this.toUri(resourcePath, require); -+ const uri = this.toUri(resourcePath, (globalThis as any).monacoRequire); ++ const uri = this.toUri(resourcePath, { toUrl: this.toUrl.bind(this) }); return this.uriToFileUri(uri); } -@@ -282,6 +285,19 @@ class FileAccessImpl { +@@ -282,6 +298,19 @@ class FileAccessImpl { return URI.parse(moduleIdToUrl.toUrl(uriOrModule)); } diff --git a/src/assets.ts b/src/assets.ts index 478672d8..333e1b96 100644 --- a/src/assets.ts +++ b/src/assets.ts @@ -1,21 +1,7 @@ -let assetUrls: Record string)> = {} -export function registerAssets (assets: Record string)>): void { - assetUrls = { - ...assetUrls, - ...assets - } -} +import { FileAccess } from 'vs/base/common/network' -function toUrl (name: string): string | undefined { - let url = assetUrls[name] - if (typeof url === 'function') { - url = url() +export function registerAssets (assets: Record string)>): void { + for (const [moduleId, url] of Object.entries(assets)) { + FileAccess.registerAppResourcePathUrl(moduleId, url) } - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition - return new URL(url ?? '', globalThis.location?.href ?? import.meta.url).toString() -} - -// eslint-disable-next-line @typescript-eslint/no-explicit-any -(globalThis as any).monacoRequire = { - toUrl } diff --git a/src/lifecycle.ts b/src/lifecycle.ts index f3c13670..bf3ad2d2 100644 --- a/src/lifecycle.ts +++ b/src/lifecycle.ts @@ -9,6 +9,7 @@ const renderWorkbenchEmitter = new Emitter() export const onRenderWorkbench = renderWorkbenchEmitter.event export const serviceInitializedBarrier = new Barrier() +export const serviceInitializedEmitter = new Emitter() interface ServiceInitializeParticipant { (accessor: ServicesAccessor): Promise @@ -45,6 +46,7 @@ export async function startup (instantiationService: IInstantiationService): Pro }) serviceInitializedBarrier.open() + serviceInitializedEmitter.fire() instantiationService.invokeFunction(accessor => { const lifecycleService = accessor.get(ILifecycleService) diff --git a/src/server/bootstrap-fork.ts b/src/server/bootstrap-fork.ts index fcfb8c2f..2a9b28f3 100644 --- a/src/server/bootstrap-fork.ts +++ b/src/server/bootstrap-fork.ts @@ -1,5 +1,4 @@ import { createRequire } from 'node:module' -import { registerAssets } from '../assets' const entrypoints: Record Promise> = { 'vs/workbench/api/node/extensionHostProcess': async () => { await import('vs/workbench/api/node/extensionHostProcess') }, @@ -10,9 +9,6 @@ const entrypoints: Record Promise> = { const require = createRequire(import.meta.url) -// just to create globalThis.monacoRequire -registerAssets({}) - // eslint-disable-next-line @typescript-eslint/no-explicit-any ;(globalThis as any)._VSCODE_NODE_MODULES = new Proxy(Object.create(null), { get: (_target, mod) => require(String(mod)) }) diff --git a/src/server/server.ts b/src/server/server.ts index 021890a7..c6c57783 100644 --- a/src/server/server.ts +++ b/src/server/server.ts @@ -1,19 +1,28 @@ // Initialize the product information for the server, including the extension gallery URL. -// @ts-ignore -globalThis._VSCODE_PRODUCT_JSON = { - extensionsGallery: { - serviceUrl: 'https://open-vsx.org/vscode/gallery', - itemUrl: 'https://open-vsx.org/vscode/item', - resourceUrlTemplate: 'https://open-vsx.org/vscode/unpkg/{publisher}/{name}/{version}/{path}', - controlUrl: '', - recommendationsUrl: '', - nlsBaseUrl: '', - publisherUrl: '' + +if (process.env.VSCODE_PRODUCT_JSON_PATH != null) { + // Path to a custom product.json file + // eslint-disable-next-line @typescript-eslint/no-var-requires + const productJson = require(process.env.VSCODE_PRODUCT_JSON_PATH) + // @ts-ignore + globalThis._VSCODE_PRODUCT_JSON = productJson +} else { + // @ts-ignore + globalThis._VSCODE_PRODUCT_JSON = { + extensionsGallery: { + serviceUrl: 'https://open-vsx.org/vscode/gallery', + itemUrl: 'https://open-vsx.org/vscode/item', + resourceUrlTemplate: 'https://open-vsx.org/vscode/unpkg/{publisher}/{name}/{version}/{path}', + controlUrl: '', + recommendationsUrl: '', + nlsBaseUrl: '', + publisherUrl: '' + } } } // @ts-ignore globalThis._VSCODE_PACKAGE_JSON = { - version: '1.83.0' + version: VSCODE_VERSION } import('./server-main') diff --git a/src/service-override/views.ts b/src/service-override/views.ts index dadf19b9..98f47ec7 100644 --- a/src/service-override/views.ts +++ b/src/service-override/views.ts @@ -2,7 +2,7 @@ import { IEditorOverrideServices, StandaloneServices } from 'vs/editor/standalon import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' import { IViewContainersRegistry, IViewDescriptor, IViewDescriptorService, IViewsRegistry, IViewsService, ViewContainerLocation, Extensions as ViewExtensions } from 'vs/workbench/common/views' import { ViewsService } from 'vs/workbench/browser/parts/views/viewsService' -import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation' +import { BrandedService, IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation' import { SidebarPart } from 'vs/workbench/browser/parts/sidebar/sidebarPart' import { ViewDescriptorService } from 'vs/workbench/services/views/browser/viewDescriptorService' import { IActivityService } from 'vs/workbench/services/activity/common/activity' @@ -10,13 +10,13 @@ import { ActivityService } from 'vs/workbench/services/activity/browser/activity import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite' import { PaneCompositeParts } from 'vs/workbench/browser/parts/paneCompositePart' import { ActivitybarPart } from 'vs/workbench/browser/parts/activitybar/activitybarPart' -import { DisposableStore, IDisposable, IReference } from 'vs/base/common/lifecycle' +import { DisposableStore, IDisposable, IReference, MutableDisposable } from 'vs/base/common/lifecycle' import { IHoverService } from 'vs/workbench/services/hover/browser/hover' import { HoverService } from 'vs/workbench/services/hover/browser/hoverService' import { ExplorerService } from 'vs/workbench/contrib/files/browser/explorerService' import { IExplorerService } from 'vs/workbench/contrib/files/browser/files' import { PanelPart } from 'vs/workbench/browser/parts/panel/panelPart' -import { append, $, Dimension } from 'vs/base/browser/dom' +import { append, $, Dimension, size } from 'vs/base/browser/dom' import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane' import { Registry } from 'vs/platform/registry/common/platform' import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer' @@ -47,14 +47,14 @@ import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editor import { IEditorDropService } from 'vs/workbench/services/editor/browser/editorDropService' import { IEditorDropTargetDelegate } from 'vs/workbench/browser/parts/editor/editorDropTarget' import { IEditorService } from 'vs/workbench/services/editor/common/editorService' -import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService' +import { EditorInputFactoryObject, IEditorResolverService, RegisteredEditorInfo, RegisteredEditorOptions, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService' import { EditorResolverService } from 'vs/workbench/services/editor/browser/editorResolverService' import { BreadcrumbsService, IBreadcrumbsService } from 'vs/workbench/browser/parts/editor/breadcrumbs' import { IContextViewService } from 'vs/platform/contextview/browser/contextView' import { ContextViewService } from 'vs/platform/contextview/browser/contextViewService' import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService' import { EditorInput, IEditorCloseHandler } from 'vs/workbench/common/editor/editorInput' -import { EditorExtensions, Verbosity } from 'vs/workbench/common/editor' +import { EditorExtensions, EditorInputCapabilities, IEditorOpenContext, Verbosity } from 'vs/workbench/common/editor' import { IEditorOptions } from 'vs/platform/editor/common/editor' import { IResolvedTextEditorModel } from 'vs/editor/common/services/resolverService' import { ITextEditorService, TextEditorService } from 'vs/workbench/services/textfile/common/textEditorService' @@ -87,6 +87,12 @@ import { ConfirmResult } from 'vs/platform/dialogs/common/dialogs' import { ILayoutService } from 'vs/platform/layout/browser/layoutService' import { IBannerService } from 'vs/workbench/services/banner/browser/bannerService' import { ITitleService } from 'vs/workbench/services/title/common/titleService' +import { CancellationToken } from 'vs/base/common/cancellation' +import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement' +import { assertAllDefined, assertIsDefined } from 'vs/base/common/types' +import { ScrollbarVisibility } from 'vs/base/common/scrollable' +import { AbstractResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput' +import { AbstractTextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput' import { MonacoDelegateEditorGroupsService, MonacoEditorService, OpenEditor } from './tools/editor' import getBulkEditServiceOverride from './bulkEdit' import getLayoutServiceOverride, { LayoutService } from './layout' @@ -95,6 +101,7 @@ import getKeybindingsOverride from './keybindings' import { changeUrlDomain } from './tools/url' import { registerAssets } from '../assets' import { registerServiceInitializePostParticipant } from '../lifecycle' +import { withReadyServices } from '../services' function createPart (id: string, role: string, classes: string[]): HTMLElement { const part = document.createElement(role === 'status' ? 'footer' /* Use footer element for status bar #98376 */ : 'div') @@ -194,128 +201,173 @@ type Label = string | { medium: string long: string } -interface EditorPanelOption { - readonly id: string - name: string - renderBody (container: HTMLElement): IDisposable -} -interface SimpleEditorInput extends EditorInput { - setName (name: Label): void - setTitle (title: Label): void - setDescription (description: Label): void - setDirty (dirty: boolean): void -} +abstract class SimpleEditorPane extends EditorPane { + protected container!: HTMLElement + private scrollbar: DomScrollableElement | undefined + private inputDisposable = this._register(new MutableDisposable()) + constructor ( + id: string, + @ITelemetryService telemetryService: ITelemetryService, + @IThemeService themeService: IThemeService, + @IStorageService storageService: IStorageService + ) { + super(id, telemetryService, themeService, storageService) + } -function registerEditorPane (options: EditorPanelOption): { disposable: IDisposable, CustomEditorInput: new (closeHandler?: IEditorCloseHandler) => SimpleEditorInput } { - class CustomEditorPane extends EditorPane { - private content?: HTMLElement - constructor ( - @ITelemetryService telemetryService: ITelemetryService, - @IThemeService themeService: IThemeService, - @IStorageService storageService: IStorageService - ) { - super(options.id, telemetryService, themeService, storageService) - } + protected override createEditor (parent: HTMLElement): void { + this.container = this.initialize() - protected override createEditor (parent: HTMLElement): void { - this.content = $('.editor-pane-content') - this.content.style.display = 'flex' - this.content.style.alignItems = 'stretch' - append(parent, this.content) - this._register(options.renderBody(this.content)) - } + // Custom Scrollbars + this.scrollbar = this._register(new DomScrollableElement(this.container, { horizontal: ScrollbarVisibility.Auto, vertical: ScrollbarVisibility.Auto })) + parent.appendChild(this.scrollbar.getDomNode()) + } + + override async setInput (input: EditorInput, editorOptions: IEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise { + await super.setInput(input, editorOptions, context, token) - override layout (dimension: Dimension): void { - this.content!.style.height = `${dimension.height}px` - this.content!.style.width = `${dimension.width}px` + // Check for cancellation + if (token.isCancellationRequested) { + return } + + this.inputDisposable.value = await this.renderInput?.(input, editorOptions, context, token) } - class CustomEditorInput extends EditorInput implements SimpleEditorInput { - static readonly ID: string = `workbench.editors.${options.id}Input` + override layout (dimension: Dimension): void { + const [container, scrollbar] = assertAllDefined(this.container, this.scrollbar) - private name: string = options.name - private title: Label = options.name - private description: Label = options.name - private dirty: boolean = false + // Pass on to Container + size(container, dimension.width, dimension.height) - constructor (public override readonly closeHandler?: IEditorCloseHandler) { - super() - } + // Adjust scrollbar + scrollbar.scanDomNode() + } - override get typeId (): string { - return CustomEditorInput.ID - } + override focus (): void { + const container = assertIsDefined(this.container) - override get resource (): URI | undefined { - return undefined - } + container.focus() + } - public setName (name: string) { - this.name = name - this._onDidChangeLabel.fire() - } + override clearInput (): void { + this.inputDisposable.clear() - public setTitle (title: string) { - this.title = title - this._onDidChangeLabel.fire() - } + super.clearInput() + } - public setDescription (description: string) { - this.description = description - this._onDidChangeLabel.fire() - } + abstract initialize (): HTMLElement + abstract renderInput? (input: EditorInput, options: IEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise +} - private getLabelValue (label: Label, verbosity?: Verbosity) { - if (typeof label === 'string') { - return label - } - switch (verbosity) { - case Verbosity.SHORT: - return label.short - case Verbosity.LONG: - return label.long - case Verbosity.MEDIUM: - default: - return label.medium - } - } +abstract class SimpleEditorInput extends EditorInput { + private dirty: boolean = false + private _capabilities: EditorInputCapabilities = 0 + private name: string | undefined + private title: Label | undefined + private description: Label | undefined + public override resource: URI | undefined - override getName (): string { - return this.name - } + constructor (resource?: URI, public override closeHandler?: IEditorCloseHandler) { + super() + this.resource = resource + } - override getTitle (verbosity?: Verbosity) { - return this.getLabelValue(this.title, verbosity) - } + public override get capabilities (): EditorInputCapabilities { + return this._capabilities + } - override getDescription (verbosity?: Verbosity): string { - return this.getLabelValue(this.description, verbosity) - } + public addCapability (capability: EditorInputCapabilities): void { + this._capabilities |= capability + this._onDidChangeCapabilities.fire() + } - override isDirty () { - return this.dirty - } + public removeCapability (capability: EditorInputCapabilities): void { + this._capabilities &= ~capability + this._onDidChangeCapabilities.fire() + } + + override get editorId (): string | undefined { + return this.typeId + } + + public setName (name: string): void { + this.name = name + this._onDidChangeLabel.fire() + } - public setDirty (dirty: boolean) { - this.dirty = dirty - this._onDidChangeDirty.fire() + public setTitle (title: Label): void { + this.title = title + this._onDidChangeLabel.fire() + } + + public setDescription (description: string): void { + this.description = description + this._onDidChangeLabel.fire() + } + + private getLabelValue (label: Label, verbosity?: Verbosity) { + if (typeof label === 'string') { + return label } + switch (verbosity) { + case Verbosity.SHORT: + return label.short + case Verbosity.LONG: + return label.long + case Verbosity.MEDIUM: + default: + return label.medium + } + } + + override getName (): string { + return this.name ?? 'Unnamed' } - const disposable = Registry.as(EditorExtensions.EditorPane).registerEditorPane( + override getTitle (verbosity?: Verbosity): string { + return this.getLabelValue(this.title ?? this.getName(), verbosity) + } + + override getDescription (verbosity?: Verbosity): string { + return this.getLabelValue(this.description ?? this.getName(), verbosity) + } + + override isDirty (): boolean { + return this.dirty + } + + public setDirty (dirty: boolean): void { + this.dirty = dirty + this._onDidChangeDirty.fire() + } +} + +function registerEditorPane ( + typeId: string, + name: string, + ctor: new (...services: Services) => EditorPane, + inputCtors: (new (...args: any[]) => EditorInput)[] +): IDisposable { + return Registry.as(EditorExtensions.EditorPane).registerEditorPane( EditorPaneDescriptor.create( - CustomEditorPane, - options.id, - options.name + ctor, + typeId, + name ), - [new SyncDescriptor(CustomEditorInput)]) + inputCtors.map(ctor => new SyncDescriptor(ctor))) +} - return { - disposable, - CustomEditorInput - } +function registerEditor (globPattern: string, editorInfo: RegisteredEditorInfo, editorOptions: RegisteredEditorOptions, factory: EditorInputFactoryObject): IDisposable { + return withReadyServices((servicesAccessor) => { + const resolverService = servicesAccessor.get(IEditorResolverService) + return resolverService.registerEditor( + globPattern, + editorInfo, + editorOptions, + factory + ) + }) } interface CustomViewOption { @@ -648,10 +700,21 @@ export { ViewContainerLocation, CustomViewOption, registerCustomView, - EditorPanelOption, IEditorCloseHandler, ConfirmResult, registerEditorPane, + RegisteredEditorPriority, + EditorPane, + SimpleEditorPane, + SimpleEditorInput, + AbstractResourceEditorInput, + AbstractTextResourceEditorInput, + EditorInput, + registerEditor, + RegisteredEditorInfo, + RegisteredEditorOptions, + EditorInputFactoryObject, + EditorInputCapabilities, renderPart, renderSidebarPart, diff --git a/src/services.ts b/src/services.ts index cd7b5d0c..2d3acfca 100644 --- a/src/services.ts +++ b/src/services.ts @@ -5,15 +5,15 @@ import { ITextModelContentProvider } from 'vs/editor/common/services/resolverSer import { IColorTheme } from 'vs/platform/theme/common/themeService' import { StorageScope, StorageTarget } from 'vscode/src/vs/platform/storage/common/storage' import { IEditorOverrideServices, StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices' -import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation' +import { GetLeadingNonServiceArgs, IInstantiationService, ServiceIdentifier, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation' import { IAction } from 'vs/base/common/actions' -import { Disposable } from 'vs/base/common/lifecycle' +import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle' import getLayoutServiceOverride from './service-override/layout' import getEnvironmentServiceOverride from './service-override/environment' import getExtensionsServiceOverride from './service-override/extensions' import getFileServiceOverride from './service-override/files' import getQuickAccessOverride from './service-override/quickaccess' -import { serviceInitializedBarrier, startup } from './lifecycle' +import { serviceInitializedBarrier, serviceInitializedEmitter, startup } from './lifecycle' let servicesInitialized = false StandaloneServices.withServices(() => { @@ -37,11 +37,51 @@ export async function initialize (overrides: IEditorOverrideServices, container? await startup(instantiationService) } -export async function getService (identifier: ServiceIdentifier): Promise { +export async function waitServicesReady (): Promise { await serviceInitializedBarrier.wait() +} + +export function checkServicesReady (): void { + if (!serviceInitializedBarrier.isOpen()) { + throw new Error('Services are not ready yet') + } +} + +export async function getService (identifier: ServiceIdentifier): Promise { + await waitServicesReady() return StandaloneServices.get(identifier) } +// eslint-disable-next-line @typescript-eslint/no-explicit-any +export async function createInstance any, R extends InstanceType>(ctor: Ctor, ...args: GetLeadingNonServiceArgs>): Promise { + await waitServicesReady() + return StandaloneServices.get(IInstantiationService).createInstance(ctor, ...args) +} + +// eslint-disable-next-line @typescript-eslint/no-explicit-any +export function createInstanceSync any, R extends InstanceType>(ctor: Ctor, ...args: GetLeadingNonServiceArgs>): R { + checkServicesReady() + return StandaloneServices.get(IInstantiationService).createInstance(ctor, ...args) +} + +/** + * Equivalent to `StandaloneServices.withServices` except the callback is called when the services are ready, not just initialized + */ +export function withReadyServices (callback: (serviceAccessor: ServicesAccessor) => IDisposable): IDisposable { + if (serviceInitializedBarrier.isOpen()) { + return StandaloneServices.get(IInstantiationService).invokeFunction(callback) + } + + const disposable = new DisposableStore() + + const listener = disposable.add(serviceInitializedEmitter.event(() => { + listener.dispose() + disposable.add(StandaloneServices.get(IInstantiationService).invokeFunction(callback)) + })) + + return disposable +} + export { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' // Export all services as monaco doesn't export them @@ -140,6 +180,8 @@ export { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteA export { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver' export { IRemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService' export { ITerminalService, ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal' +export { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService' +export { ILabelService } from 'vs/platform/label/common/label' // Export all Notification service parts export {