Merge pull request #37 from CodinGame/register-json-configuration-schema

Register json configuration schema

Author: CGNonofr

rollup/rollup.config.ts

@@ -265,12 +265,6 @@ export default (args: Record<string, string>): rollup.RollupOptions[] => {
                         return null
                       }
                     }
-                    // Remove schemaRegistry.registerSchema calls
-                    if (name != null && name.endsWith('registerSchema')) {
-                      if (['/keybindingService', '/tokenClassificationRegistry'].every(file => id.includes(file))) {
-                        return null
-                      }
-                    }
                   }
                 } else if (node.callee.type === 'Identifier' && PURE_FUNCTIONS.has(node.callee.name)) {
                   path.replace(addComment(node))
@@ -297,7 +291,17 @@ export default (args: Record<string, string>): rollup.RollupOptions[] => {
       }, replace({
         VSCODE_VERSION: JSON.stringify(vscodeVersion),
         preventAssignment: true
-      })
+      }),
+      {
+        name: 'dynamic-import-polyfill',
+        renderDynamicImport (): { left: string, right: string } {
+          // dynamic imports of vscode-oniguruma and vscode-textmate aren't working without it on vite
+          return {
+            left: 'import(',
+            right: ').then(module => module.default ?? module)'
+          }
+        }
+      }
     ]
   }, {
     // 2nd pass to improve treeshaking

scripts/vscode.patch

@@ -46,3 +46,16 @@ index a82ae60c449..143a208b867 100644
  		return await backend.createProcess(shellLaunchConfig, initialCwd, cols, rows, this._configHelper.config.unicodeVersion, env, options, shouldPersist);
  	}
 
+diff --git a/src/vs/workbench/services/configuration/browser/configurationService.ts b/src/vs/workbench/services/configuration/browser/configurationService.ts
+index a1245856684..55bb8224f51 100644
+--- a/src/vs/workbench/services/configuration/browser/configurationService.ts
++++ b/src/vs/workbench/services/configuration/browser/configurationService.ts
+@@ -1106,7 +1106,7 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
+ 	}
+ }
+ 
+-class RegisterConfigurationSchemasContribution extends Disposable implements IWorkbenchContribution {
++export class RegisterConfigurationSchemasContribution extends Disposable implements IWorkbenchContribution {
+ 	constructor(
+ 		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
+ 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,

src/monaco.ts

@@ -16,8 +16,11 @@ import { Registry } from 'vs/platform/registry/common/platform'
 import { IJSONContributionRegistry, Extensions as JsonExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry'
 import { CommandsRegistry } from 'vs/platform/commands/common/commands'
 import { IJSONSchema } from 'vs/base/common/jsonSchema'
-import { allSettings } from 'vs/platform/configuration/common/configurationRegistry'
+import { Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry'
 import { EditorOptionsUtil } from 'vs/editor/browser/config/editorConfiguration'
+import * as monaco from 'monaco-editor'
+import { Event } from 'vs/base/common/event'
+import { registerColor } from 'vs/platform/theme/common/colorRegistry'
 import { createInjectedClass } from './tools/injection'
 
 function computeConfiguration (configuration: IEditorConfiguration, isDiffEditor: boolean, overrides?: Readonly<IEditorOptions>): IEditorOptions {
@@ -117,9 +120,27 @@ export const createConfiguredDiffEditor: typeof createDiffEditor = (domElement,
 }
 
 const Extensions = {
-  ...JsonExtensions
+  ...JsonExtensions,
+  ...ConfigurationExtensions
 }
 
+const registry = Registry.as<IJSONContributionRegistry>(Extensions.JSONContribution)
+type FileMatch = Partial<Record<string, string[]>>
+function getJsonSchemas (fileMatchs: FileMatch = {}): monaco.languages.json.DiagnosticsOptions['schemas'] {
+  return Object.entries(registry.getSchemaContributions().schemas)
+    .filter(([uri]) => uri !== 'vscode://schemas/vscode-extensions') // remove it because for some reason it makes the json worker message fail
+    .map(([uri, schema]) => {
+      const path = monaco.Uri.parse(uri).path
+      const schemaName = path.slice(1) // Remove leading "/"
+      return {
+        uri,
+        schema,
+        fileMatch: schemaName != null ? fileMatchs[schemaName] : undefined
+      }
+    })
+}
+const onDidChangeJsonSchema: Event<string> = registry.onDidChangeSchema
+
 export {
   errorHandler,
   DisposableStore,
@@ -134,5 +155,8 @@ export {
   IJSONContributionRegistry,
   IJSONSchema,
 
-  allSettings
+  getJsonSchemas,
+  onDidChangeJsonSchema,
+
+  registerColor
 }

src/service-override/configuration.ts

@@ -15,7 +15,11 @@ import { Configuration } from 'vs/platform/configuration/common/configurationMod
 import { IColorCustomizations, IThemeScopedColorCustomizations } from 'vs/workbench/services/themes/common/workbenchThemeService'
 import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile'
 import { IPolicyService } from 'vs/platform/policy/common/policy'
+import { RegisterConfigurationSchemasContribution } from 'vs/workbench/services/configuration/browser/configurationService'
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'
+import getWorkspaceContextServiceOverride from './workspaceContext'
 import getFileServiceOverride from './files'
+import { onServicesInitialized } from './tools'
 
 function updateUserConfiguration (configurationJson: string): void {
   const userDataProfilesService: IUserDataProfilesService = StandaloneServices.get(IUserDataProfilesService)
@@ -55,9 +59,15 @@ class InjectedConfigurationService extends ConfigurationService {
   }
 }
 
+function initialize (instantiationService: IInstantiationService) {
+  instantiationService.createInstance(RegisterConfigurationSchemasContribution)
+}
+
 export default function getServiceOverride (): IEditorOverrideServices {
+  onServicesInitialized(initialize)
   return {
     ...getFileServiceOverride(),
+    ...getWorkspaceContextServiceOverride(),
     [IConfigurationService.toString()]: new SyncDescriptor(InjectedConfigurationService),
     [ITextResourceConfigurationService.toString()]: new SyncDescriptor(TextResourceConfigurationService)
   }

src/service-override/languageConfiguration.ts

@@ -1,28 +1,24 @@
 import '../polyfill'
 import '../vscode-services/missing-services'
-import { IEditorOverrideServices, StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices'
+import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices'
 import { LanguageConfigurationFileHandler } from 'vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint'
-import { URI } from 'vs/base/common/uri'
+import { joinPath } from 'vs/base/common/resources'
 import getFileServiceOverride, { registerExtensionFile } from './files'
+import { onServicesInitialized } from './tools'
 import { IInstantiationService, Services } from '../services'
 import { DEFAULT_EXTENSION } from '../vscode-services/extHost'
 
-function setLanguageConfiguration (resource: URI, getConfiguration: () => Promise<string>): void {
+function setLanguageConfiguration (path: string, getConfiguration: () => Promise<string>): void {
   const extension = Services.get().extension ?? DEFAULT_EXTENSION
-  if (resource.scheme !== extension.extensionLocation.scheme) {
-    throw new Error(`The provided resource url should have the ${extension.extensionLocation.scheme} scheme`)
-  }
-
-  registerExtensionFile(resource, getConfiguration)
+  registerExtensionFile(joinPath(extension.extensionLocation, path), getConfiguration)
 }
 
-function initialize () {
-  const instantiationService = StandaloneServices.get(IInstantiationService)
+function initialize (instantiationService: IInstantiationService) {
   instantiationService.createInstance(LanguageConfigurationFileHandler)
 }
 
 export default function getServiceOverride (): IEditorOverrideServices {
-  setTimeout(initialize)
+  onServicesInitialized(initialize)
   return {
     ...getFileServiceOverride()
   }

src/service-override/messages.ts

@@ -13,14 +13,14 @@ import { IDialogService } from 'vs/platform/dialogs/common/dialogs'
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'
 import { ILayoutService } from 'vs/platform/layout/browser/layoutService'
 import getLayoutServiceOverride from './layout'
+import { onServicesInitialized } from './tools'
 import { unsupported } from '../tools'
 
-function register () {
+function initialize (instantiationService: IInstantiationService) {
   const container = StandaloneServices.get(ILayoutService).container
   container.classList.add('monaco-workbench')
 
-  const model = (StandaloneServices.get(INotificationService) as NotificationService).model
-  const instantiationService = StandaloneServices.get(IInstantiationService)
+  const model = (instantiationService.invokeFunction((accessor) => accessor.get(INotificationService)) as NotificationService).model
 
   const notificationsToasts = instantiationService.createInstance(NotificationsToasts, container, model)
   notificationsToasts.layout(dom.getClientArea(container))
@@ -40,11 +40,11 @@ function register () {
 
   registerNotificationCommands(notificationsCenter, notificationsToasts, model)
 
-  StandaloneServices.get(IInstantiationService).createInstance(DialogHandlerContribution)
+  instantiationService.createInstance(DialogHandlerContribution)
 }
 
 export default function getServiceOverride (container?: HTMLElement): IEditorOverrideServices {
-  setTimeout(() => register())
+  onServicesInitialized(initialize)
 
   return {
     [IDialogService.toString()]: new SyncDescriptor(DialogService),

src/service-override/snippets.ts

@@ -7,11 +7,13 @@ import { SnippetsService } from 'vs/workbench/contrib/snippets/browser/snippetsS
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions'
 import { ExtensionMessageCollector } from 'vs/workbench/services/extensions/common/extensionsRegistry'
 import { joinPath } from 'vs/base/common/resources'
-import { consoleExtensionMessageHandler, getExtensionPoint } from './tools'
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'
+import { consoleExtensionMessageHandler, getExtensionPoint, onServicesInitialized } from './tools'
 import { registerExtensionFile } from './files'
 import getWorkspaceContextServiceOverride from './workspaceContext'
 import { DEFAULT_EXTENSION } from '../vscode-services/extHost'
 import { Services } from '../services'
+
 interface ISnippetsExtensionPoint {
   language: string
   path: string
@@ -31,7 +33,13 @@ function setSnippets (snippets: ISnippetsExtensionPoint[], getContent: (snippet:
   }
 }
 
+function initialize (instantiationService: IInstantiationService) {
+  // Force load the service
+  instantiationService.invokeFunction((accessor) => accessor.get(ISnippetsService))
+}
+
 export default function getServiceOverride (): IEditorOverrideServices {
+  onServicesInitialized(initialize)
   return {
     ...getWorkspaceContextServiceOverride(),
     [ISnippetsService.toString()]: new SyncDescriptor(SnippetsService)

src/service-override/textmate.ts

@@ -1,6 +1,6 @@
 import '../polyfill'
 import '../vscode-services/missing-services'
-import { StandaloneServices, IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices'
+import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices'
 import { ITextMateService } from 'vs/workbench/services/textMate/browser/textMate'
 import { ExtensionMessageCollector } from 'vs/workbench/services/extensions/common/extensionsRegistry'
 import { ITMSyntaxExtensionPoint } from 'vs/workbench/services/textMate/common/TMGrammars'
@@ -10,7 +10,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions'
 import getFileServiceOverride, { registerExtensionFile } from './files'
-import { consoleExtensionMessageHandler, getExtensionPoint } from './tools'
+import { consoleExtensionMessageHandler, getExtensionPoint, onServicesInitialized } from './tools'
 import { Services } from '../services'
 import { DEFAULT_EXTENSION } from '../vscode-services/extHost'
 import { createInjectedClass } from '../tools/injection'
@@ -28,9 +28,10 @@ class TextMateService extends createInjectedClass(AbstractTextMateService) {
   }
 }
 
-const extensionPoint = getExtensionPoint<ITMSyntaxExtensionPoint[]>('grammars')
+type PartialITMSyntaxExtensionPoint = Partial<ITMSyntaxExtensionPoint> & Pick<ITMSyntaxExtensionPoint, 'path' | 'scopeName'>
+const extensionPoint = getExtensionPoint<PartialITMSyntaxExtensionPoint[]>('grammars')
 
-export function setGrammars<T extends ITMSyntaxExtensionPoint> (grammars: T[], getContent: (grammar: T) => Promise<string>, extension: IExtensionDescription = Services.get().extension ?? DEFAULT_EXTENSION): void {
+export function setGrammars<T extends PartialITMSyntaxExtensionPoint> (grammars: T[], getContent: (grammar: T) => Promise<string>, extension: IExtensionDescription = Services.get().extension ?? DEFAULT_EXTENSION): void {
   extensionPoint.acceptUsers([{
     description: extension,
     value: grammars,
@@ -42,14 +43,13 @@ export function setGrammars<T extends ITMSyntaxExtensionPoint> (grammars: T[], g
   }
 }
 
-function initialize () {
-  // LanguageConfigurationFileHandler
+function initialize (instantiationService: IInstantiationService) {
   // Force load the service
-  StandaloneServices.get(ITextMateService)
+  instantiationService.invokeFunction((accessor) => accessor.get(ITextMateService))
 }
 
 export default function getServiceOverride (getOnigLib: () => Promise<Response | ArrayBuffer>): IEditorOverrideServices {
-  setTimeout(initialize)
+  onServicesInitialized(initialize)
   return {
     ...getFileServiceOverride(),
     [ITextMateService.toString()]: new SyncDescriptor(TextMateService, [getOnigLib])
@@ -58,5 +58,5 @@ export default function getServiceOverride (getOnigLib: () => Promise<Response |
 
 export {
   ITextMateService,
-  ITMSyntaxExtensionPoint
+  PartialITMSyntaxExtensionPoint as ITMSyntaxExtensionPoint
 }

src/service-override/theme.ts

@@ -51,10 +51,11 @@ const DEFAULT_THEME_EXTENSION: IExtensionDescription = {
   targetPlatform: TargetPlatform.WEB
 }
 
-const extensionPoint: ExtensionPoint<IThemeExtensionPoint[]> = ExtensionsRegistry.getExtensionPoints().find(ep => ep.name === 'themes')!
+type PartialIThemeExtensionPoint = Partial<IThemeExtensionPoint> & Pick<IThemeExtensionPoint, 'id' | 'path'>
+const extensionPoint: ExtensionPoint<PartialIThemeExtensionPoint[]> = ExtensionsRegistry.getExtensionPoints().find(ep => ep.name === 'themes')!
 
-let defaultThemes: IThemeExtensionPoint[] = []
-let themes: IThemeExtensionPoint[] = []
+let defaultThemes: PartialIThemeExtensionPoint[] = []
+let themes: PartialIThemeExtensionPoint[] = []
 function updateThemes () {
   extensionPoint.acceptUsers([{
     description: DEFAULT_THEME_EXTENSION,
@@ -67,7 +68,7 @@ function updateThemes () {
   }])
 }
 
-export function setThemes<T extends IThemeExtensionPoint> (_themes: T[], getContent: (theme: T) => Promise<string>): void {
+export function setThemes<T extends PartialIThemeExtensionPoint> (_themes: T[], getContent: (theme: T) => Promise<string>): void {
   const extension = Services.get().extension ?? DEFAULT_EXTENSION
   themes = _themes
   for (const theme of _themes) {
@@ -76,7 +77,7 @@ export function setThemes<T extends IThemeExtensionPoint> (_themes: T[], getCont
   updateThemes()
 }
 
-export function setDefaultThemes<T extends IThemeExtensionPoint> (_themes: T[], getContent: (theme: T) => Promise<string>): void {
+export function setDefaultThemes<T extends PartialIThemeExtensionPoint> (_themes: T[], getContent: (theme: T) => Promise<string>): void {
   defaultThemes = _themes
   for (const theme of _themes) {
     registerExtensionFile(joinPath(DEFAULT_THEME_EXTENSION.extensionLocation, theme.path), () => getContent(theme))
@@ -92,5 +93,5 @@ export default function getServiceOverride (): IEditorOverrideServices {
 }
 
 export {
-  IThemeExtensionPoint
+  PartialIThemeExtensionPoint as IThemeExtensionPoint
 }

src/service-override/tokenClassification.ts

@@ -1,10 +1,10 @@
 import '../polyfill'
 import '../vscode-services/missing-services'
-import { IEditorOverrideServices, StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices'
+import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices'
 import { TokenClassificationExtensionPoints } from 'vs/workbench/services/themes/common/tokenClassificationExtensionPoint'
 import { ExtensionMessageCollector } from 'vs/workbench/services/extensions/common/extensionsRegistry'
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions'
-import { consoleExtensionMessageHandler, getExtensionPoint } from './tools'
+import { consoleExtensionMessageHandler, getExtensionPoint, onServicesInitialized } from './tools'
 import { IInstantiationService, Services } from '../services'
 import { DEFAULT_EXTENSION } from '../vscode-services/extHost'
 
@@ -53,12 +53,12 @@ function setTokenStyleDefaults (tokenStyleDefaults: ITokenStyleDefaultExtensionP
   }])
 }
 
-function register () {
-  StandaloneServices.get(IInstantiationService).createInstance(TokenClassificationExtensionPoints)
+function initialize (instantiationService: IInstantiationService) {
+  instantiationService.createInstance(TokenClassificationExtensionPoints)
 }
 
 export default function getServiceOverride (): IEditorOverrideServices {
-  setTimeout(register)
+  onServicesInitialized(initialize)
   return {}
 }