Merge pull request #44 from CodinGame/use-vscode-services

Use vscode services

Author: CGNonofr

package-lock.json

@@ -16,13 +16,58 @@
   "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"
   ],
   "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": {

package.json

@@ -36,7 +36,7 @@ export default rollup.defineConfig({
     if ([/\?worker$/].some(reg => reg.test(source))) {
       return false
     }
-    return externals.some(external => source.startsWith(external))
+    return externals.some(external => source === external || source.startsWith(`${external}/`))
   },
   output: [{
     chunkFileNames: '[name].js',

rollup.config.ts

@@ -2,9 +2,8 @@ import * as monaco from 'monaco-editor'
 import EmacsExtension from 'monaco-emacs'
 import { initVimMode } from './vim'
 
-const keybindingService = monaco.extra.StandaloneServices.get(monaco.extra.IKeybindingService) as monaco.extra.StandaloneKeybindingService
-
 export function updateKeybindings (bindings: monaco.extra.IUserFriendlyKeybinding[]): void {
+  const keybindingService = monaco.extra.StandaloneServices.get(monaco.extra.IKeybindingService) as monaco.extra.StandaloneKeybindingService
   keybindingService.setUserKeybindings(bindings)
 }
 

src/keybindings/index.ts

@@ -1,11 +1,10 @@
 import * as monaco from 'monaco-editor'
 import './languages'
 import './theme'
-import MultiEditorStandaloneCodeEditorServiceImpl, { EditorOpenHandler } from './services/MultiEditorStandaloneCodeEditorService'
-import TextModelService from './services/TextModelService'
+import getModelEditorServiceOverride from 'vscode/service-override/modelEditor'
+import getMessageServiceOverride from 'vscode/service-override/messages'
 import './worker'
 import setupExtensions from './extensions'
-
 import 'monaco-editor/esm/vs/editor/editor.all'
 import 'monaco-editor/esm/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp'
 import 'monaco-editor/esm/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard'
@@ -15,18 +14,15 @@ 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 EditorOpenHandlerRegistry, { EditorOpenHandler } from './tools/EditorOpenHandlerRegistry'
+
+const editorOpenHandlerRegistry = new EditorOpenHandlerRegistry()
 
 monaco.extra.StandaloneServices.initialize({
-  get textModelService () {
-    return new TextModelService(monaco.extra.StandaloneServices.get(monaco.extra.IModelService))
-  },
-  get codeEditorService () {
-    return new MultiEditorStandaloneCodeEditorServiceImpl(
-      monaco.extra.StandaloneServices.get(monaco.extra.IContextKeyService),
-      monaco.extra.StandaloneServices.get(monaco.editor.IStandaloneThemeService),
-      monaco.extra.StandaloneServices.get(monaco.extra.ITextModelService)
-    )
-  }
+  ...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.extra.StandaloneServices.get(monaco.editor.IStandaloneThemeService).setAutoDetectHighContrast(false)
@@ -57,8 +53,7 @@ function registerTextModelContentProvider (scheme: string, provider: monaco.extr
 }
 
 function registerEditorOpenHandler (handler: EditorOpenHandler): monaco.IDisposable {
-  const codeEditorService = monaco.extra.StandaloneServices.get(monaco.extra.ICodeEditorService)
-  return (codeEditorService as MultiEditorStandaloneCodeEditorServiceImpl).registerEditorOpenHandler(handler)
+  return editorOpenHandlerRegistry.registerEditorOpenHandler(handler)
 }
 
 export {