Skip to content

Commit

Permalink
Merge pull request #290 from CodinGame/update-monaco-0.45
Browse files Browse the repository at this point in the history
Update to monaco 0.45
  • Loading branch information
CGNonofr authored Jan 3, 2024
2 parents d25a893 + 576b108 commit aa1dbe1
Show file tree
Hide file tree
Showing 29 changed files with 1,749 additions and 1,014 deletions.
481 changes: 202 additions & 279 deletions demo/package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@types/ws": "^8.5.10",
"fast-glob": "^3.3.2",
"ts-node": "^10.9.1",
"typescript": "~5.3.2",
"typescript": "~5.3.3",
"vite": "~4.4.12"
},
"dependencies": {
Expand Down Expand Up @@ -171,7 +171,7 @@
"ansi-colors": "^4.1.3",
"dockerode": "^4.0.0",
"express": "^4.18.2",
"monaco-editor": "^0.44.0",
"monaco-editor": "^0.45.0",
"vscode": "file:../dist/main",
"ws": "^8.14.2"
},
Expand Down
2 changes: 1 addition & 1 deletion demo/src/features/testing.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import '../setup' // import setup file to wait for services initialization

await import('./testProviderExample/extension')
void import('./testProviderExample/extension')
13 changes: 12 additions & 1 deletion demo/src/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import getMarkersServiceOverride from '@codingame/monaco-vscode-markers-service-
import getAccessibilityServiceOverride from '@codingame/monaco-vscode-accessibility-service-override'
import getLanguageDetectionWorkerServiceOverride from '@codingame/monaco-vscode-language-detection-worker-service-override'
import getStorageServiceOverride, { BrowserStorageService } from '@codingame/monaco-vscode-storage-service-override'
import getExtensionServiceOverride from '@codingame/monaco-vscode-extensions-service-override'
import getExtensionServiceOverride, { ExtensionHostKind } from '@codingame/monaco-vscode-extensions-service-override'
import getRemoteAgentServiceOverride from '@codingame/monaco-vscode-remote-agent-service-override'
import getEnvironmentServiceOverride from '@codingame/monaco-vscode-environment-service-override'
import getLifecycleServiceOverride from '@codingame/monaco-vscode-lifecycle-service-override'
Expand All @@ -42,6 +42,7 @@ import { createIndexedDBProviders, initFile } from '@codingame/monaco-vscode-fil
import getWorkingCopyServiceOverride from '@codingame/monaco-vscode-working-copy-service-override'
import getTestingServiceOverride from '@codingame/monaco-vscode-testing-service-override'
import * as monaco from 'monaco-editor'
import { registerExtension } from 'vscode/extensions'
import { TerminalBackend } from './features/terminal'
import { openNewCodeEditor } from './features/editor'
import defaultConfiguration from './user/configuration.json?raw'
Expand Down Expand Up @@ -211,3 +212,13 @@ for (const { part, element } of [
el.style.display = visible ? 'block' : 'none'
})
}

await registerExtension({
name: 'demo',
publisher: 'codingame',
version: '1.0.0',
engines: {
vscode: '*'
},
enabledApiProposals: ['testCoverage']
}, ExtensionHostKind.LocalProcess).setAsDefaultApi()
Loading

0 comments on commit aa1dbe1

Please sign in to comment.