Merge pull request #152 from CodinGame/language-detection-worker

Language detection worker

Author: CGNonofr

README.md

@@ -120,7 +120,7 @@ await initialize({
 })
 ```
 
-Additionally, this library exposes 21 modules that include the vscode version of some services (with some glue to make it work with monaco):
+Additionally, this library exposes 22 modules that include the vscode version of some services (with some glue to make it work with monaco):
 
 - Extensions (included by default): `vscode/service-override/extensions`
 - Notifications: `vscode/service-override/notifications`
@@ -143,6 +143,7 @@ Additionally, this library exposes 21 modules that include the vscode version of
 - Terminal: `vscode/service-override/terminal`
 - Search: `vscode/service-override/search`
 - Markers: `vscode/service-override/markers`
+- Language detection worker: `vscode/service-override/languageDetectionWorker`
 
 Usage:
 

demo/index.html

@@ -19,6 +19,7 @@ <h1>Editor</h1>
 
           <button id="run">Run with debugger</button>
           <button id="filesystem">Attach filesystem</button>
+          <button id="customEditorPanel">Open custom editor panel</button>
         </div>
       </div>
 

demo/package-lock.json

@@ -1,5 +1,5 @@
 import { IDialogService } from 'vscode/services'
-import { registerCustomView, ViewContainerLocation } from 'vscode/service-override/views'
+import { registerCustomView, registerEditorPane, ViewContainerLocation } from 'vscode/service-override/views'
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js'
 import iconUrl from '../Visual_Studio_Code_1.35_icon.svg?url'
 
@@ -42,3 +42,21 @@ registerCustomView({
     }
   }]
 })
+
+const { CustomEditorInput } = registerEditorPane({
+  id: 'custom-editor-pane',
+  name: 'Custom editor pane',
+  renderBody (container) {
+    container.style.display = 'flex'
+    container.style.alignItems = 'center'
+    container.style.justifyContent = 'center'
+    container.innerHTML = 'This is a custom editor pane<br />You can render anything you want here'
+
+    return {
+      dispose () {
+      }
+    }
+  }
+})
+
+export { CustomEditorInput }

demo/src/features/customView.ts

@@ -3,8 +3,8 @@ import ansiColors from 'ansi-colors'
 import * as vscode from 'vscode'
 
 export class TerminalBackend extends SimpleTerminalBackend {
-  getDefaultSystemShell = async (): Promise<string> => 'fake'
-  createProcess = async (): Promise<ITerminalChildProcess> => {
+  override getDefaultSystemShell = async (): Promise<string> => 'fake'
+  override createProcess = async (): Promise<ITerminalChildProcess> => {
     const dataEmitter = new vscode.EventEmitter<string>()
     const propertyEmitter = new vscode.EventEmitter<{
       type: string
@@ -23,13 +23,13 @@ export class TerminalBackend extends SimpleTerminalBackend {
         return undefined
       }
 
-      onDidChangeProperty = propertyEmitter.event
+      override onDidChangeProperty = propertyEmitter.event
 
-      shutdown (immediate: boolean): void {
+      override shutdown (immediate: boolean): void {
         console.log('shutdown', immediate)
       }
 
-      input (data: string): void {
+      override input (data: string): void {
         for (const c of data) {
           if (c.charCodeAt(0) === 13) {
             dataEmitter.fire(`\r\n${ansiColors.green('$')} `)
@@ -49,6 +49,9 @@ export class TerminalBackend extends SimpleTerminalBackend {
       resize (cols: number, rows: number): void {
         console.log('resize', cols, rows)
       }
+
+      override clearBuffer (): void | Promise<void> {
+      }
     }
     return new FakeTerminalProcess(1, 1, '/tmp', dataEmitter.event)
   }

demo/src/features/terminal.ts

@@ -6,8 +6,9 @@ import './setup'
 import { createConfiguredEditor, createModelReference } from 'vscode/monaco'
 import { registerFileSystemOverlay, HTMLFileSystemProvider } from 'vscode/service-override/files'
 import * as vscode from 'vscode'
-import { ILogService, StandaloneServices, IPreferencesService } from 'vscode/services'
-import './features/customView'
+import { ILogService, StandaloneServices, IPreferencesService, IEditorService, IDialogService } from 'vscode/services'
+import { ConfirmResult } from 'vscode/service-override/views'
+import { CustomEditorInput } from './features/customView'
 import './features/debugger'
 import './features/search'
 import { anotherFakeOutputChannel } from './features/output'
@@ -16,21 +17,47 @@ import './features/intellisense'
 import './features/notifications'
 import './features/terminal'
 
-import 'vscode/default-extensions/theme-defaults'
+import 'vscode/default-extensions/clojure'
+import 'vscode/default-extensions/coffeescript'
+import 'vscode/default-extensions/cpp'
+import 'vscode/default-extensions/csharp'
+import 'vscode/default-extensions/css'
+import 'vscode/default-extensions/diff'
+import 'vscode/default-extensions/fsharp'
+import 'vscode/default-extensions/go'
+import 'vscode/default-extensions/groovy'
+import 'vscode/default-extensions/html'
+import 'vscode/default-extensions/java'
 import 'vscode/default-extensions/javascript'
-import 'vscode/default-extensions/typescript-basics'
 import 'vscode/default-extensions/json'
-import 'vscode/default-extensions/html'
-import 'vscode/default-extensions/css'
+import 'vscode/default-extensions/julia'
+import 'vscode/default-extensions/lua'
+import 'vscode/default-extensions/markdown-basics'
+import 'vscode/default-extensions/objective-c'
+import 'vscode/default-extensions/perl'
+import 'vscode/default-extensions/php'
+import 'vscode/default-extensions/powershell'
+import 'vscode/default-extensions/python'
+import 'vscode/default-extensions/r'
+import 'vscode/default-extensions/ruby'
+import 'vscode/default-extensions/rust'
+import 'vscode/default-extensions/scss'
+import 'vscode/default-extensions/shellscript'
+import 'vscode/default-extensions/sql'
+import 'vscode/default-extensions/swift'
+import 'vscode/default-extensions/typescript-basics'
+import 'vscode/default-extensions/vb'
+import 'vscode/default-extensions/xml'
+import 'vscode/default-extensions/yaml'
 
+import 'vscode/default-extensions/theme-defaults'
 import 'vscode/default-extensions/theme-seti'
 import 'vscode/default-extensions/references-view'
 import 'vscode/default-extensions/search-result'
 import 'vscode/default-extensions/configuration-editing'
 import 'vscode/default-extensions/markdown-math'
 import 'vscode/default-extensions/npm'
 import 'vscode/default-extensions/media-preview'
-import 'vscode/default-extensions/markdown-basics'
 
 const modelRef = await createModelReference(monaco.Uri.file('/tmp/test.js'), `// import anotherfile
 let variable = 1
@@ -135,3 +162,32 @@ document.querySelector('#keybindingsui')!.addEventListener('click', async () =>
   await StandaloneServices.get(IPreferencesService).openGlobalKeybindingSettings(false)
   window.scrollTo({ top: 0, behavior: 'smooth' })
 })
+
+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
+    }
+  })
+  let toggle = false
+  const interval = window.setInterval(() => {
+    const title = toggle ? 'Awesome editor pane' : 'Incredible editor pane'
+    input.setTitle(title)
+    input.setName(title)
+    input.setDescription(title)
+    toggle = !toggle
+  }, 1000)
+  input.onWillDispose(() => {
+    window.clearInterval(interval)
+  })
+
+  await StandaloneServices.get(IEditorService).openEditor(input, {
+    pinned: true
+  })
+})

demo/src/main.ts

@@ -19,11 +19,13 @@ import getTerminalServiceOverride from 'vscode/service-override/terminal'
 import getSearchAccessServiceOverride from 'vscode/service-override/search'
 import getMarkersAccessServiceOverride from 'vscode/service-override/markers'
 import getAccessibilityAccessServiceOverride from 'vscode/service-override/accessibility'
+import getLanguageDetectionWorkerServiceOverride from 'vscode/service-override/languageDetectionWorker'
 import getExtensionServiceOverride from 'vscode/service-override/extensions'
 import EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker.js?worker'
 import TextMateWorker from 'vscode/workers/textMate.worker?worker'
 import OutputLinkComputerWorker from 'vscode/workers/outputLinkComputer.worker?worker'
 import ExtensionHostWorker from 'vscode/workers/extensionHost.worker?worker'
+import LanguageDetectionWorker from 'vscode/workers/languageDetection.worker?worker'
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js'
 import { TerminalBackend } from './features/terminal'
 import { openNewCodeEditor } from './features/editor'
@@ -34,7 +36,8 @@ export type WorkerLoader = () => Worker
 const workerLoaders: Partial<Record<string, WorkerLoader>> = {
   editorWorkerService: () => new (toCrossOriginWorker(EditorWorker))(),
   textMateWorker: () => new (toCrossOriginWorker(TextMateWorker))(),
-  outputLinkComputer: () => new (toCrossOriginWorker(OutputLinkComputerWorker))()
+  outputLinkComputer: () => new (toCrossOriginWorker(OutputLinkComputerWorker))(),
+  languageDetectionWorkerService: () => new (toCrossOriginWorker(LanguageDetectionWorker))()
 }
 window.MonacoEnvironment = {
   getWorker: function (moduleId, label) {
@@ -70,7 +73,8 @@ await initializeMonacoService({
   ...getTerminalServiceOverride(new TerminalBackend()),
   ...getSearchAccessServiceOverride(),
   ...getMarkersAccessServiceOverride(),
-  ...getAccessibilityAccessServiceOverride()
+  ...getAccessibilityAccessServiceOverride(),
+  ...getLanguageDetectionWorkerServiceOverride()
 })
 StandaloneServices.get(ILogService).setLevel(LogLevel.Off)
 

demo/src/setup.ts

@@ -22,18 +22,18 @@ body {
 #editors {
   position: relative;
   min-width: 0;
-  height: 600px;
+  height: 55vh;
   border: 1px solid var(--vscode-editorWidget-border);
 }
 
 #panel {
   display: flex;
   flex: none;
   border: 1px solid var(--vscode-editorWidget-border);
-  height: 400px;
+  height: 30vh;
 }
 
 .editor {
   width: 100%;
-  height: 600px;
+  height: 55vh;
 }

demo/src/style.css

@@ -43,13 +43,21 @@ export default defineConfig({
       'vscode/service-override/audioCue', 'vscode/service-override/views', 'vscode/service-override/quickaccess', 'vscode/service-override/debug',
       'vscode/service-override/preferences', 'vscode/service-override/snippets', 'vscode/service-override/files', 'vscode/service-override/output',
       'vscode/service-override/terminal', 'vscode/service-override/search', 'vscode/service-override/markers', 'vscode/service-override/accessibility',
-      'vscode/default-extensions/theme-defaults', 'vscode/default-extensions/javascript', 'vscode/default-extensions/json', 'vscode/default-extensions/theme-seti',
+      'vscode/service-override/languageDetectionWorker', 'vscode/default-extensions/clojure', 'vscode/default-extensions/coffeescript', 'vscode/default-extensions/cpp',
+      'vscode/default-extensions/csharp', 'vscode/default-extensions/css', 'vscode/default-extensions/diff', 'vscode/default-extensions/fsharp', 'vscode/default-extensions/go',
+      'vscode/default-extensions/groovy', 'vscode/default-extensions/html', 'vscode/default-extensions/java', 'vscode/default-extensions/javascript',
+      'vscode/default-extensions/json', 'vscode/default-extensions/julia', 'vscode/default-extensions/lua', 'vscode/default-extensions/markdown-basics',
+      'vscode/default-extensions/objective-c', 'vscode/default-extensions/perl', 'vscode/default-extensions/php', 'vscode/default-extensions/powershell',
+      'vscode/default-extensions/python', 'vscode/default-extensions/r', 'vscode/default-extensions/ruby', 'vscode/default-extensions/rust',
+      'vscode/default-extensions/scss', 'vscode/default-extensions/shellscript', 'vscode/default-extensions/sql', 'vscode/default-extensions/swift',
+      'vscode/default-extensions/typescript-basics', 'vscode/default-extensions/vb', 'vscode/default-extensions/xml', 'vscode/default-extensions/yaml',
+      'vscode/default-extensions/theme-defaults', 'vscode/default-extensions/theme-seti',
       'vscode/default-extensions/references-view', 'vscode/default-extensions/typescript-basics', 'vscode/default-extensions/search-result',
       'vscode/default-extensions/typescript-language-features', 'vscode/default-extensions/markdown-language-features',
       'vscode/default-extensions/json-language-features', 'vscode/default-extensions/css-language-features',
       'vscode/default-extensions/npm', 'vscode/default-extensions/css', 'vscode/default-extensions/markdown-basics', 'vscode/default-extensions/html',
       'vscode/default-extensions/html-language-features', 'vscode/default-extensions/configuration-editing', 'vscode/default-extensions/media-preview', 'vscode/default-extensions/markdown-math',
-      'vscode/workers/extensionHost.worker'
+      'vscode/workers/extensionHost.worker', 'vscode/workers/languageDetection.worker'
     ],
     esbuildOptions: {
       plugins: [{