@codingame/monaco-editor-wrapper 1.15.0 → 2.0.0

package/dist/main.js

@@ -5,6 +5,8 @@ import onigFile from 'vscode-oniguruma/release/onig.wasm';
 import { loadWASM, createOnigScanner, createOnigString } from 'vscode-oniguruma';
 import { e as extensions, g as getConfiguration$1, o as onConfigurationChanged } from './index.js';
 export { g as getConfiguration, o as onConfigurationChanged, r as registerConfigurations, a as registerDefaultConfigurations, u as updateUserConfiguration } from './index.js';
+import getModelEditorServiceOverride from 'vscode/service-override/modelEditor';
+import getMessageServiceOverride from 'vscode/service-override/messages';
 import './worker.js';
 import 'monaco-editor/esm/vs/editor/editor.all';
 import 'monaco-editor/esm/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp';
@@ -4080,326 +4082,6 @@ for (const themeExtensionPoint of defaultThemes) {
   });
 }
 
-let popupEditorDisposable = null;
-
-function openNewCodeEditor(model) {
-  if (popupEditorDisposable != null) {
-    popupEditorDisposable.dispose();
-    popupEditorDisposable = null;
-  }
-
-  const container = document.createElement('div');
-  container.style.position = 'fixed';
-  container.style.zIndex = '10000';
-  container.style.backgroundColor = 'rgba(0, 0, 0, 0.5)';
-  container.style.top = container.style.bottom = container.style.left = container.style.right = '0';
-  container.style.cursor = 'pointer';
-  const editorElem = document.createElement('div');
-  editorElem.style.position = 'absolute';
-  editorElem.style.top = editorElem.style.bottom = editorElem.style.left = editorElem.style.right = '0';
-  editorElem.style.margin = 'auto';
-  editorElem.style.width = '80%';
-  editorElem.style.height = '80%';
-  container.appendChild(editorElem);
-  document.body.appendChild(container);
-  const editor = createEditor(editorElem, _objectSpread2({
-    model,
-    readOnly: true,
-    automaticLayout: true
-  }, getConfiguration$1(model.getLanguageId(), 'editor')));
-  popupEditorDisposable = {
-    dispose: () => {
-      editor.dispose();
-      document.body.removeChild(container);
-      popupEditorDisposable = null;
-    }
-  };
-  container.addEventListener('mousedown', event => {
-    var _popupEditorDisposabl;
-
-    if (event.target !== container) {
-      return;
-    }
-
-    (_popupEditorDisposabl = popupEditorDisposable) === null || _popupEditorDisposabl === void 0 ? void 0 : _popupEditorDisposabl.dispose();
-  });
-  return editor;
-}
-
-class MultiEditorStandaloneCodeEditorServiceImpl extends monaco$2.extra.StandaloneCodeEditorService {
-  constructor(contextKeyService, themeService, textModelService) {
-    super(contextKeyService, themeService);
-
-    _defineProperty(this, "textModelService", void 0);
-
-    _defineProperty(this, "handlers", []);
-
-    this.textModelService = textModelService;
-  }
-
-  registerEditorOpenHandler(handler) {
-    this.handlers.push(handler);
-    return {
-      dispose: () => {
-        const index = this.handlers.indexOf(handler);
-
-        if (index >= 0) {
-          this.handlers.splice(index, 1);
-        }
-      }
-    };
-  }
-
-  async openCodeEditor(input, editor, sideBySide) {
-    var _modelEditor$getDomNo;
-
-    const reference = await this.textModelService.createModelReference(input.resource);
-    const model = reference.object.textEditorModel;
-    let modelEditor;
-
-    if (editor != null && editor.getModel() === model) {
-      modelEditor = editor;
-    }
-
-    if (modelEditor == null) {
-      const codeEditors = monaco$2.extra.StandaloneServices.get(monaco$2.extra.ICodeEditorService).listCodeEditors();
-      modelEditor = codeEditors.find(editor => editor.getModel() === model);
-    }
-
-    if (modelEditor == null) {
-      for (const handler of this.handlers) {
-        const handlerEditor = await handler(model, input, editor, sideBySide);
-
-        if (handlerEditor != null) {
-          modelEditor = handlerEditor;
-          break;
-        }
-      }
-    }
-
-    if (modelEditor == null) {
-      modelEditor = openNewCodeEditor(model);
-    }
-
-    super.doOpenEditor(modelEditor, input);
-    modelEditor.focus();
-
-    if (((_modelEditor$getDomNo = modelEditor.getDomNode()) === null || _modelEditor$getDomNo === void 0 ? void 0 : _modelEditor$getDomNo.scrollIntoView) != null) {
-      var _modelEditor$getDomNo2;
-
-      (_modelEditor$getDomNo2 = modelEditor.getDomNode()) === null || _modelEditor$getDomNo2 === void 0 ? void 0 : _modelEditor$getDomNo2.scrollIntoView({
-        block: 'nearest',
-        inline: 'nearest'
-      });
-    }
-
-    const onModelUnmount = () => {
-      reference.dispose();
-    };
-
-    const onDidDisposeDisposable = modelEditor.onDidDispose(() => {
-      onModelUnmount();
-    });
-    const onDidChangeModelDisposable = modelEditor.onDidChangeModel(e => {
-      if (e.newModelUrl == null || e.newModelUrl.toString() !== model.uri.toString()) {
-        onModelUnmount();
-        onDidDisposeDisposable.dispose();
-        onDidChangeModelDisposable.dispose();
-      }
-    });
-    return modelEditor;
-  }
-
-}
-
-class SimpleResolvedModel {
-  constructor(model, readonly) {
-    this.model = model;
-    this.readonly = readonly;
-
-    _defineProperty(this, "_onWillDispose", void 0);
-
-    _defineProperty(this, "disposed", false);
-
-    this._onWillDispose = new monaco$2.Emitter();
-  }
-
-  getLanguageId() {
-    return this.model.getLanguageId();
-  }
-
-  get onWillDispose() {
-    return this._onWillDispose.event;
-  }
-
-  resolve() {
-    return Promise.resolve();
-  }
-
-  get textEditorModel() {
-    return this.model;
-  }
-
-  createSnapshot() {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    return this.model.createSnapshot();
-  }
-
-  isReadonly() {
-    return this.readonly;
-  }
-
-  dispose() {
-    this.disposed = true;
-
-    this._onWillDispose.fire();
-  }
-
-  isDisposed() {
-    return this.disposed;
-  }
-
-  isResolved() {
-    return true;
-  }
-
-  getMode() {
-    return this.model.getLanguageId();
-  }
-
-}
-
-class ResourceModelCollection extends monaco$2.extra.ReferenceCollection {
-  constructor() {
-    super(...arguments);
-
-    _defineProperty(this, "providers", new Map());
-
-    _defineProperty(this, "modelsToDispose", new Set());
-  }
-
-  async createReferencedObject(key) {
-    // Untrack as being disposed
-    this.modelsToDispose.delete(key);
-    const resource = monaco$2.Uri.parse(key);
-    const existingModel = monaco$2.editor.getModel(resource);
-
-    if (existingModel != null) {
-      return new SimpleResolvedModel(existingModel, false);
-    }
-
-    if (this.providers.has(resource.scheme)) {
-      const model = await this.resolveTextModelContent(key);
-      const resolvedModel = new SimpleResolvedModel(model, true);
-      resolvedModel.onWillDispose(() => {
-        model.dispose();
-      });
-      return resolvedModel;
-    }
-
-    throw new Error("Unable to resolve resource ".concat(key));
-  }
-
-  destroyReferencedObject(key, modelPromise) {
-    const resource = monaco$2.Uri.parse(key);
-
-    if (resource.scheme === 'untitled' || resource.scheme === 'inMemory') {
-      return;
-    }
-
-    this.modelsToDispose.add(key);
-    (async () => {
-      try {
-        const model = await modelPromise;
-
-        if (!this.modelsToDispose.has(key)) {
-          // return if model has been acquired again meanwhile
-          return;
-        } // Finally we can dispose the model
-
-
-        model.dispose();
-      } finally {
-        this.modelsToDispose.delete(key); // Untrack as being disposed
-      }
-    })().catch(() => {// ignore
-    });
-  }
-
-  registerTextModelContentProvider(scheme, provider) {
-    let providers = this.providers.get(scheme);
-
-    if (providers == null) {
-      providers = [];
-      this.providers.set(scheme, providers);
-    }
-
-    providers.unshift(provider);
-    return monaco$2.extra.toDisposable(() => {
-      const providersForScheme = this.providers.get(scheme);
-
-      if (providersForScheme == null) {
-        return;
-      }
-
-      const index = providersForScheme.indexOf(provider);
-
-      if (index === -1) {
-        return;
-      }
-
-      providersForScheme.splice(index, 1);
-
-      if (providersForScheme.length === 0) {
-        this.providers.delete(scheme);
-      }
-    });
-  }
-
-  hasTextModelContentProvider(scheme) {
-    return this.providers.get(scheme) !== undefined;
-  }
-
-  async resolveTextModelContent(key) {
-    var _this$providers$get;
-
-    const resource = monaco$2.Uri.parse(key);
-    const providersForScheme = (_this$providers$get = this.providers.get(resource.scheme)) !== null && _this$providers$get !== void 0 ? _this$providers$get : [];
-
-    for (const provider of providersForScheme) {
-      const value = await provider.provideTextContent(resource);
-
-      if (value != null) {
-        return value;
-      }
-    }
-
-    throw new Error("Unable to resolve text model content for resource ".concat(key));
-  }
-
-}
-
-class TextModelService extends monaco$2.extra.StandaloneTextModelService {
-  // eslint-disable-next-line @typescript-eslint/no-useless-constructor
-  constructor(modelService) {
-    super(modelService);
-
-    _defineProperty(this, "resourceModelCollection", new ResourceModelCollection());
-
-    _defineProperty(this, "asyncModelCollection", new monaco$2.extra.AsyncReferenceCollection(this.resourceModelCollection));
-  }
-
-  registerTextModelContentProvider(scheme, provider) {
-    return this.resourceModelCollection.registerTextModelContentProvider(scheme, provider);
-  }
-
-  async createModelReference(resource) {
-    const result = await this.asyncModelCollection.acquire(resource.toString());
-    return result;
-  }
-
-}
-
 const fixedPositions = [0, 6, 7, 11];
 const lastFixedPosition = fixedPositions[fixedPositions.length - 1];
 
@@ -4519,16 +4201,136 @@ function setup(editor) {
   setup$1(editor);
 }
 
-monaco$2.extra.StandaloneServices.initialize({
-  get textModelService() {
-    return new TextModelService(monaco$2.extra.StandaloneServices.get(monaco$2.extra.IModelService));
-  },
+let currentEditor = null;
 
-  get codeEditorService() {
-    return new MultiEditorStandaloneCodeEditorServiceImpl(monaco$2.extra.StandaloneServices.get(monaco$2.extra.IContextKeyService), monaco$2.extra.StandaloneServices.get(monaco$2.editor.IStandaloneThemeService), monaco$2.extra.StandaloneServices.get(monaco$2.extra.ITextModelService));
+function openNewCodeEditor(model) {
+  if (currentEditor != null && model === currentEditor.model) {
+    return currentEditor.editor;
+  }
+
+  if (currentEditor != null) {
+    currentEditor.dispose();
+    currentEditor = null;
   }
 
-}); // Disable high contrast autodetection because it fallbacks on the hc-black no matter what
+  const container = document.createElement('div');
+  container.style.position = 'fixed';
+  container.style.zIndex = '10000';
+  container.style.backgroundColor = 'rgba(0, 0, 0, 0.5)';
+  container.style.top = container.style.bottom = container.style.left = container.style.right = '0';
+  container.style.cursor = 'pointer';
+  const editorElem = document.createElement('div');
+  editorElem.style.position = 'absolute';
+  editorElem.style.top = editorElem.style.bottom = editorElem.style.left = editorElem.style.right = '0';
+  editorElem.style.margin = 'auto';
+  editorElem.style.width = '80%';
+  editorElem.style.height = '80%';
+  container.appendChild(editorElem);
+  document.body.appendChild(container);
+
+  try {
+    const editor = createEditor(editorElem, _objectSpread2({
+      model,
+      readOnly: true,
+      automaticLayout: true
+    }, getConfiguration$1(model.getLanguageId(), 'editor')));
+    currentEditor = {
+      dispose: () => {
+        editor.dispose();
+        document.body.removeChild(container);
+        currentEditor = null;
+      },
+      model,
+      editor
+    };
+    container.addEventListener('mousedown', event => {
+      var _currentEditor;
+
+      if (event.target !== container) {
+        return;
+      }
+
+      (_currentEditor = currentEditor) === null || _currentEditor === void 0 ? void 0 : _currentEditor.dispose();
+    });
+    return editor;
+  } catch (error) {
+    document.body.removeChild(container);
+    currentEditor = null;
+    throw error;
+  }
+}
+
+class EditorOpenHandlerRegistry {
+  constructor() {
+    _defineProperty(this, "handlers", []);
+
+    _defineProperty(this, "openCodeEditor", async (model, options, sideBySide) => {
+      var _modelEditor$getDomNo;
+
+      let modelEditor;
+
+      for (const handler of this.handlers) {
+        const handlerEditor = await handler(model, options, null, sideBySide);
+
+        if (handlerEditor != null) {
+          modelEditor = handlerEditor;
+          break;
+        }
+      }
+
+      if (modelEditor == null) {
+        modelEditor = openNewCodeEditor(model); // Destroy model ref when we close the editor popup
+
+        const onModelUnmount = () => {
+          model.dispose();
+        };
+
+        const onDidDisposeDisposable = modelEditor.onDidDispose(() => {
+          onModelUnmount();
+        });
+        const onDidChangeModelDisposable = modelEditor.onDidChangeModel(e => {
+          if (e.newModelUrl == null || e.newModelUrl.toString() !== model.uri.toString()) {
+            onModelUnmount();
+            onDidDisposeDisposable.dispose();
+            onDidChangeModelDisposable.dispose();
+          }
+        });
+      }
+
+      modelEditor.focus();
+
+      if (((_modelEditor$getDomNo = modelEditor.getDomNode()) === null || _modelEditor$getDomNo === void 0 ? void 0 : _modelEditor$getDomNo.scrollIntoView) != null) {
+        var _modelEditor$getDomNo2;
+
+        (_modelEditor$getDomNo2 = modelEditor.getDomNode()) === null || _modelEditor$getDomNo2 === void 0 ? void 0 : _modelEditor$getDomNo2.scrollIntoView({
+          block: 'nearest',
+          inline: 'nearest'
+        });
+      }
+
+      return modelEditor;
+    });
+  }
+
+  registerEditorOpenHandler(handler) {
+    this.handlers.push(handler);
+    return {
+      dispose: () => {
+        const index = this.handlers.indexOf(handler);
+
+        if (index >= 0) {
+          this.handlers.splice(index, 1);
+        }
+      }
+    };
+  }
+
+}
+
+const editorOpenHandlerRegistry = new EditorOpenHandlerRegistry();
+monaco$2.extra.StandaloneServices.initialize(_objectSpread2(_objectSpread2({}, getModelEditorServiceOverride((model, input, sideBySide) => {
+  return editorOpenHandlerRegistry.openCodeEditor(model, input, sideBySide);
+})), getMessageServiceOverride(document.body))); // Disable high contrast autodetection because it fallbacks on the hc-black no matter what
 
 monaco$2.extra.StandaloneServices.get(monaco$2.editor.IStandaloneThemeService).setAutoDetectHighContrast(false); // Force EOL to be '\n' even on Windows
 
@@ -4554,8 +4356,7 @@ function registerTextModelContentProvider(scheme, provider) {
 }
 
 function registerEditorOpenHandler(handler) {
-  const codeEditorService = monaco$2.extra.StandaloneServices.get(monaco$2.extra.ICodeEditorService);
-  return codeEditorService.registerEditorOpenHandler(handler);
+  return editorOpenHandlerRegistry.registerEditorOpenHandler(handler);
 }
 
 var lib$1 = {};
@@ -16393,8 +16194,8 @@ function initVimMode(editor, statusBarElement) {
   return lib.initVimMode(editor, statusBarElement);
 }
 
-const keybindingService = monaco$2.extra.StandaloneServices.get(monaco$2.extra.IKeybindingService);
 function updateKeybindings(bindings) {
+  const keybindingService = monaco$2.extra.StandaloneServices.get(monaco$2.extra.IKeybindingService);
   keybindingService.setUserKeybindings(bindings);
 }
 function updateEditorKeybindingsMode(editor) {

package/dist/monaco.d.ts

@@ -1,7 +1,6 @@
 import * as monaco from 'monaco-editor';
 import './languages';
 import './theme';
-import { EditorOpenHandler } from './services/MultiEditorStandaloneCodeEditorService';
 import './worker';
 import 'monaco-editor/esm/vs/editor/editor.all';
 import 'monaco-editor/esm/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp';
@@ -12,6 +11,7 @@ import 'monaco-editor/esm/vs/editor/standalone/browser/quickAccess/standaloneGot
 import 'monaco-editor/esm/vs/editor/standalone/browser/quickAccess/standaloneGotoSymbolQuickAccess';
 import 'monaco-editor/esm/vs/editor/standalone/browser/quickAccess/standaloneCommandsQuickAccess';
 import 'monaco-editor/esm/vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch';
+import { EditorOpenHandler } from './tools/EditorOpenHandlerRegistry';
 declare function createEditor(domElement: HTMLElement, options?: monaco.editor.IStandaloneEditorConstructionOptions): monaco.editor.IStandaloneCodeEditor;
 declare function registerTextModelContentProvider(scheme: string, provider: monaco.extra.ITextModelContentProvider): monaco.IDisposable;
 declare function registerEditorOpenHandler(handler: EditorOpenHandler): monaco.IDisposable;

package/dist/tools/EditorOpenHandlerRegistry.d.ts

@@ -0,0 +1,8 @@
+import * as monaco from 'monaco-editor';
+import { OpenEditor, IEditorOptions } from 'vscode/service-override/modelEditor';
+export declare type EditorOpenHandler = (model: monaco.editor.ITextModel, input: IEditorOptions | undefined, editor: monaco.editor.ICodeEditor | null, sideBySide?: boolean) => Promise<monaco.editor.ICodeEditor | null>;
+export default class EditorOpenHandlerRegistry {
+    private handlers;
+    registerEditorOpenHandler(handler: EditorOpenHandler): monaco.IDisposable;
+    openCodeEditor: OpenEditor;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-editor-wrapper",
-  "version": "1.15.0",
+  "version": "2.0.0",
   "private": false,
   "description": "Enhanced Monaco editor with TextMate grammars and more",
   "scripts": {
@@ -16,6 +16,50 @@
   "moduleResolution": "node",
   "main": "dist/main.js",
   "module": "dist/main.js",
+  "exports": {
+    ".": {
+      "default": "./dist/main.js"
+    },
+    "./features/jsonContribution": {
+      "types": "./dist/features/jsonContribution.d.ts",
+      "default": "./dist/features/jsonContribution.js"
+    },
+    "./features/cssContribution": {
+      "types": "./dist/features/cssContribution.d.ts",
+      "default": "./dist/features/cssContribution.js"
+    },
+    "./features/htmlContribution": {
+      "types": "./dist/features/htmlContribution.d.ts",
+      "default": "./dist/features/htmlContribution.js"
+    },
+    "./features/typescriptContribution": {
+      "types": "./dist/features/typescriptContribution.d.ts",
+      "default": "./dist/features/typescriptContribution.js"
+    },
+    "./features/extensionConfigurations": {
+      "types": "./dist/features/extensionConfigurations.d.ts",
+      "default": "./dist/features/extensionConfigurations.js"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "./features/jsonContribution": [
+        "./dist/features/jsonContribution.d.ts"
+      ],
+      "./features/cssContribution": [
+        "./dist/features/cssContribution.d.ts"
+      ],
+      "./features/htmlContribution": [
+        "./dist/features/htmlContribution.d.ts"
+      ],
+      "./features/typescriptContribution": [
+        "./dist/features/typescriptContribution.d.ts"
+      ],
+      "./features/extensionConfigurations": [
+        "./dist/features/extensionConfigurations.d.ts"
+      ]
+    }
+  },
   "files": [
     "dist/",
     "stats.html"
@@ -23,6 +67,7 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "monaco-editor": "npm:@codingame/monaco-editor@^0.33.6",
+    "vscode": "npm:@codingame/monaco-vscode-api@~1.67.9",
     "vscode-oniguruma": "^1.6.2"
   },
   "devDependencies": {