@codingame/monaco-editor-wrapper 2.3.0 → 3.1.1

package/dist/features/extensionConfigurations.js

@@ -1,4 +1,4 @@
-import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
+import { configurationRegistry } from 'vscode/service-override/configuration';
 
 // Generated file, do not modify
 
@@ -126,7 +126,6 @@ const loader = {
   '../svelte.svelte-vscode.js').then(module => module)).default
 };
 
-const configurationRegistry = monaco.extra.Registry.as(monaco.extra.ConfigurationExtensions.Configuration);
 async function loadConfigurationForExtension(extensionId) {
   const loader$1 = loader[extensionId];
 

package/dist/features/htmlContribution.js

@@ -1,10 +1,10 @@
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
 import 'monaco-editor/esm/vs/language/html/monaco.contribution';
-import { r as registerConfigurations, g as getConfiguration, o as onConfigurationChanged } from '../index2.js';
+import { ConfigurationScope } from 'vscode/service-override/configuration';
+import { DisposableStore } from 'vscode/monaco';
+import { StandaloneServices, ICodeEditorService } from 'vscode/services';
 import { r as registerWorkerLoader } from '../worker.js';
-import 'vscode/services';
-import 'vscode/service-override/configuration';
-import '../_rollupPluginBabelHelpers.js';
+import { r as registerConfigurations, g as getConfiguration, o as onConfigurationChanged } from '../index.js';
 
 const workerLoader = async () => (await import(
 /* webpackChunkName: "MonacoHtmlWorker" */
@@ -27,7 +27,7 @@ registerConfigurations([{
   properties: {
     'html.autoClosingTags': {
       type: 'boolean',
-      scope: monaco.extra.ConfigurationScope.RESOURCE,
+      scope: ConfigurationScope.RESOURCE,
       default: true,
       description: 'Enable/disable autoclosing of HTML tags.'
     }
@@ -45,7 +45,7 @@ setTimeout(() => {
 });
 
 function autoCloseHtmlTags(editor) {
-  const disposableStore = new monaco.DisposableStore();
+  const disposableStore = new DisposableStore();
   let timeout;
   disposableStore.add({
     dispose: () => {
@@ -110,7 +110,7 @@ function autoCloseHtmlTags(editor) {
 
 setTimeout(() => {
   // In a timeout so the service can be overriden
-  const codeEditors = monaco.extra.StandaloneServices.get(monaco.extra.ICodeEditorService).listCodeEditors();
+  const codeEditors = StandaloneServices.get(ICodeEditorService).listCodeEditors();
 
   for (const editor of codeEditors) {
     autoCloseHtmlTags(editor);

package/dist/features/jsonContribution.js

@@ -1,81 +1,21 @@
-import { _ as _objectSpread2 } from '../_rollupPluginBabelHelpers.js';
 import 'monaco-editor/esm/vs/language/json/monaco.contribution';
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
+import { onDidChangeJsonSchema, getJsonSchemas } from 'vscode/monaco';
 import { r as registerWorkerLoader } from '../worker.js';
 
-const registry = monaco.extra.Registry.as(monaco.extra.JsonContributionExtensions.JSONContribution); // Hack because the commands are filled by a code not run in monaco-editor
-
-{
-  const allCommands = monaco.extra.CommandsRegistry.getCommands();
-  const keybindingsCommandSchema = registry.getSchemaContributions().schemas['vscode://schemas/keybindings'].items.properties.command.anyOf[0];
-  keybindingsCommandSchema.enum = Array.from(allCommands.keys());
-  keybindingsCommandSchema.enumDescriptions = Array.from(allCommands.values()).map(command => {
-    var _command$description;
-
-    return (_command$description = command.description) === null || _command$description === void 0 ? void 0 : _command$description.description;
-  });
-}
-const vimKeybindingsSchema = {
-  type: 'object',
-  properties: {
-    before: {
-      type: 'array',
-      items: {
-        type: 'string'
-      }
-    },
-    after: {
-      type: 'array',
-      items: {
-        type: 'string'
-      }
-    }
-  }
-};
-
 function updateDiagnosticsOptions() {
   monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
     comments: 'ignore',
     validate: true,
-    schemas: [{
-      uri: 'vscode://schemas/settings/resourceLanguage',
-      schema: registry.getSchemaContributions().schemas['vscode://schemas/settings/resourceLanguage']
-    }, {
-      uri: 'vscode://schemas/keybindings',
-      fileMatch: ['file:///keybindings.json'],
-      schema: registry.getSchemaContributions().schemas['vscode://schemas/keybindings']
-    }, {
-      uri: 'vscode://schemas/settings/user',
-      fileMatch: ['file:///settings.json'],
-      schema: {
-        properties: _objectSpread2(_objectSpread2({}, monaco.extra.allSettings.properties), {}, {
-          'vim.normalModeKeyBindings': {
-            type: 'array',
-            description: 'Remapped keys in Normal mode.',
-            items: vimKeybindingsSchema
-          },
-          'vim.insertModeKeyBindings': {
-            type: 'array',
-            description: 'Remapped keys in Insert mode.',
-            items: vimKeybindingsSchema
-          },
-          'vim.visualModeKeyBindings': {
-            type: 'array',
-            description: 'Remapped keys in Visual mode.',
-            items: vimKeybindingsSchema
-          }
-        }),
-        patternProperties: monaco.extra.allSettings.patternProperties,
-        additionalProperties: true,
-        allowTrailingCommas: true,
-        allowComments: true
-      }
-    }]
+    schemas: getJsonSchemas({
+      keybindings: ['file:///keybindings.json'],
+      'settings/user': ['file:///settings.json']
+    })
   });
 }
 
 updateDiagnosticsOptions();
-registry.onDidChangeSchema(updateDiagnosticsOptions);
+onDidChangeJsonSchema(updateDiagnosticsOptions);
 
 const workerLoader = async () => (await import(
 /* webpackChunkName: "MonacoJsonWorker" */

package/dist/features/typescriptContribution.d.ts

@@ -1,5 +1 @@
 import 'monaco-editor/esm/vs/language/typescript/monaco.contribution';
-import * as monaco from 'monaco-editor';
-declare const typescriptReactDefaults: monaco.languages.typescript.LanguageServiceDefaultsImpl;
-declare const javascriptReactDefaults: monaco.languages.typescript.LanguageServiceDefaultsImpl;
-export { typescriptReactDefaults, javascriptReactDefaults };

package/dist/features/typescriptContribution.js

@@ -1,4 +1,3 @@
-import { _ as _objectSpread2 } from '../_rollupPluginBabelHelpers.js';
 import 'monaco-editor/esm/vs/language/typescript/monaco.contribution';
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
 import { r as registerWorkerLoader } from '../worker.js';
@@ -29,36 +28,9 @@ monaco.languages.typescript.javascriptDefaults.addExtraLib(typescriptGlobal, 'no
 monaco.languages.typescript.javascriptDefaults.addExtraLib(typescriptConsole, 'node/console.d.ts');
 monaco.languages.typescript.javascriptDefaults.addExtraLib(typescriptProcess, 'node/process.d.ts');
 
-const reactCompilerOptions = _objectSpread2(_objectSpread2({}, compilerOptions), {}, {
-  jsx: monaco.languages.typescript.JsxEmit.React,
-  esModuleInterop: true
-});
-
-const typescriptReactDefaults = new monaco.languages.typescript.LanguageServiceDefaultsImpl(reactCompilerOptions, {
-  noSemanticValidation: false,
-  noSyntaxValidation: false,
-  onlyVisible: false
-}, {}, {});
-const javascriptReactDefaults = new monaco.languages.typescript.LanguageServiceDefaultsImpl(reactCompilerOptions, {
-  noSemanticValidation: true,
-  noSyntaxValidation: false,
-  onlyVisible: false
-}, {}, {});
-
 const workerLoader = async () => (await import(
 /* webpackChunkName: "MonacoTypescriptWorker" */
 '../ts.worker.js').then(module => module)).default;
 
 registerWorkerLoader('typescript', workerLoader);
-registerWorkerLoader('javascript', workerLoader); // Add support for typescriptreact/javascriptreact which don't come out of the box
-
-registerWorkerLoader('typescriptreact', workerLoader);
-registerWorkerLoader('javascriptreact', workerLoader);
-monaco.languages.onLanguage('typescriptreact', () => {
-  void monaco.languages.typescript.setupMode(typescriptReactDefaults, 'typescriptreact');
-});
-monaco.languages.onLanguage('javascriptreact', () => {
-  void monaco.languages.typescript.setupMode(javascriptReactDefaults, 'javascriptreact');
-});
-
-export { javascriptReactDefaults, typescriptReactDefaults };
+registerWorkerLoader('javascript', workerLoader);

package/dist/hacks.d.ts

@@ -1,2 +1,15 @@
-import * as monaco from 'monaco-editor';
-export declare function addCustomFoldingMarkers(configuration: monaco.extra.ILanguageConfiguration): monaco.extra.ILanguageConfiguration;
+interface IRegExp {
+    pattern: string;
+    flags?: string;
+}
+export interface ILanguageConfiguration {
+    folding?: {
+        offSide?: boolean;
+        markers?: {
+            start?: string | IRegExp;
+            end?: string | IRegExp;
+        };
+    };
+}
+export declare function addCustomFoldingMarkers<T extends ILanguageConfiguration>(configuration: T): T;
+export {};