Merge pull request #163 from CodinGame/import-all-editor-features

Fix 1.81 introduced issues

Author: CGNonofr

README.md

@@ -120,9 +120,10 @@ await initialize({
 })
 ```
 
-Additionally, this library exposes 22 modules that include the vscode version of some services (with some glue to make it work with monaco):
+Additionally, this library exposes 23 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`
+- Files (included by default): `vscode/service-override/files`
 - Notifications: `vscode/service-override/notifications`
 - Dialogs: `vscode/service-override/dialogs`
 - Model: `vscode/service-override/model`
@@ -135,7 +136,6 @@ Additionally, this library exposes 22 modules that include the vscode version of
 - VSCode themes: `vscode/service-override/theme`
 - Audio cue: `vscode/service-override/audioCue`
 - Debug: `vscode/service-override/debug`
-- Files: `vscode/service-override/files`
 - Preferences: `vscode/service-override/preferences`
 - Views: `vscode/service-override/views` (Is exclusive with `editor`, do not use both at the same time)
 - QuickAccess: `vscode/service-override/quickaccess`
@@ -144,6 +144,7 @@ Additionally, this library exposes 22 modules that include the vscode version of
 - Search: `vscode/service-override/search`
 - Markers: `vscode/service-override/markers`
 - Language detection worker: `vscode/service-override/languageDetectionWorker`
+- Storage: `vscode/service-override/storage`
 
 Usage:
 
@@ -295,8 +296,6 @@ It includes:
 - Keybinding service, with user keybindings editor
 - Debuggers
 
-It also uses the `synchronizeJsonSchemas` function to register them on the monaco json worker and have autocomplete/hover on settings and keybindings.
-
 From CLI run:
 
 ```bash

demo/index.html

@@ -20,6 +20,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>
+          <button id="clearStorage">Clear storage</button>
         </div>
       </div>
 
@@ -29,10 +30,10 @@ <h1>Editor</h1>
 
       <h1>Settings</h1>
       <button id="settingsui">Open settings UI</button>
-      <div id="settings-editor" class="editor"></div>
+      <div id="settings-editor" class="standalone-editor"></div>
       <h1>Keybindings</h1>
       <button id="keybindingsui">Open keybindings UI</button>
-      <div id="keybindings-editor" class="editor"></div>
+      <div id="keybindings-editor" class="standalone-editor"></div>
     </div>
     <script type="module" src="/src/main.ts"></script>
   </body>

demo/package-lock.json

@@ -1,8 +1,17 @@
-import * as vscode from 'vscode'
-import { onExtHostInitialized } from 'vscode/extensions'
+import { ExtensionHostKind, onExtHostInitialized, registerExtension } from 'vscode/extensions'
 
 await new Promise<void>(resolve => onExtHostInitialized(resolve))
 
+const { getApi } = registerExtension({
+  name: 'outputDemo',
+  publisher: 'codingame',
+  version: '1.0.0',
+  engines: {
+    vscode: '*'
+  }
+}, ExtensionHostKind.LocalProcess)
+
+const vscode = await getApi()
 const fakeOutputChannel = vscode.window.createOutputChannel('Fake output')
 const anotherFakeOutputChannel = vscode.window.createOutputChannel('Your code', 'javascript')
 

demo/src/features/output.ts

@@ -1,13 +1,11 @@
 import './style.css'
-import 'monaco-editor/esm/vs/editor/editor.all.js'
-import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js'
-import 'monaco-editor/esm/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.js'
-import './setup'
+import * as monaco from 'monaco-editor'
 import { createConfiguredEditor, createModelReference } from 'vscode/monaco'
 import { registerFileSystemOverlay, HTMLFileSystemProvider } from 'vscode/service-override/files'
 import * as vscode from 'vscode'
 import { ILogService, StandaloneServices, IPreferencesService, IEditorService, IDialogService } from 'vscode/services'
 import { ConfirmResult } from 'vscode/service-override/views'
+import { clearStorage } from './setup'
 import { CustomEditorInput } from './features/customView'
 import './features/debugger'
 import './features/search'
@@ -80,7 +78,7 @@ await vscode.window.showTextDocument(mainDocument, {
 
 anotherFakeOutputChannel.replace(mainDocument.getText())
 vscode.workspace.onDidChangeTextDocument((e) => {
-  if (e.document === mainDocument) {
+  if (e.document === mainDocument && e.contentChanges.length > 0) {
     anotherFakeOutputChannel.replace(e.document.getText())
   }
 })
@@ -191,3 +189,7 @@ document.querySelector('#customEditorPanel')!.addEventListener('click', async ()
     pinned: true
   })
 })
+
+document.querySelector('#clearStorage')!.addEventListener('click', async () => {
+  clearStorage()
+})

demo/src/main.ts

@@ -16,10 +16,11 @@ import getSnippetServiceOverride from 'vscode/service-override/snippets'
 import getQuickAccessServiceOverride from 'vscode/service-override/quickaccess'
 import getOutputServiceOverride from 'vscode/service-override/output'
 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 getSearchServiceOverride from 'vscode/service-override/search'
+import getMarkersServiceOverride from 'vscode/service-override/markers'
+import getAccessibilityServiceOverride from 'vscode/service-override/accessibility'
 import getLanguageDetectionWorkerServiceOverride from 'vscode/service-override/languageDetectionWorker'
+import getStorageServiceOverride, { IStorageItemsChangeEvent, StorageScope } from 'vscode/service-override/storage'
 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'
@@ -49,6 +50,8 @@ window.MonacoEnvironment = {
   }
 }
 
+const onStorageChange = new monaco.Emitter<IStorageItemsChangeEvent>()
+
 // Override services
 await initializeMonacoService({
   ...getExtensionServiceOverride(toWorkerConfig(ExtensionHostWorker)),
@@ -71,13 +74,33 @@ await initializeMonacoService({
   }),
   ...getOutputServiceOverride(),
   ...getTerminalServiceOverride(new TerminalBackend()),
-  ...getSearchAccessServiceOverride(),
-  ...getMarkersAccessServiceOverride(),
-  ...getAccessibilityAccessServiceOverride(),
-  ...getLanguageDetectionWorkerServiceOverride()
+  ...getSearchServiceOverride(),
+  ...getMarkersServiceOverride(),
+  ...getAccessibilityServiceOverride(),
+  ...getLanguageDetectionWorkerServiceOverride(),
+  ...getStorageServiceOverride({
+    read (scope) {
+      return new Map(Object.entries(JSON.parse(localStorage.getItem(`storage-${scope}`) ?? '{}')))
+    },
+    async write (scope, data) {
+      localStorage.setItem(`storage-${scope}`, JSON.stringify(Object.fromEntries(data.entries())))
+    },
+    onDidChange: onStorageChange.event
+  })
 })
 StandaloneServices.get(ILogService).setLevel(LogLevel.Off)
 
+export function clearStorage (): void {
+  const allKeys = new Set([StorageScope.APPLICATION, StorageScope.PROFILE, StorageScope.WORKSPACE].flatMap(scope => Object.keys(JSON.parse(localStorage.getItem(`storage-${scope}`) ?? '{}'))))
+  localStorage.removeItem(`storage-${StorageScope.APPLICATION}`)
+  localStorage.removeItem(`storage-${StorageScope.PROFILE}`)
+  localStorage.removeItem(`storage-${StorageScope.WORKSPACE}`)
+  onStorageChange.fire({
+    deleted: allKeys,
+    changed: new Map()
+  })
+}
+
 await initializeVscodeExtensions()
 
 renderSidebarPart(document.querySelector<HTMLDivElement>('#sidebar')!)

demo/src/setup.ts

@@ -33,7 +33,7 @@ body {
   height: 30vh;
 }
 
-.editor {
+.standalone-editor {
   width: 100%;
   height: 55vh;
 }

demo/src/style.css

@@ -42,7 +42,7 @@ export default defineConfig({
       'vscode/service-override/keybindings', 'vscode/service-override/textmate', 'vscode/service-override/theme', 'vscode/service-override/languages',
       '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/service-override/terminal', 'vscode/service-override/search', 'vscode/service-override/markers', 'vscode/service-override/accessibility', 'vscode/service-override/storage',
       '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',

demo/vite.config.ts

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "1.81.0-next.0",
+  "version": "0.0.0-semantic-release",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],