Merge pull request #200 from CodinGame/fix-and-improvements

Fixes and improvements

Author: CGNonofr

demo/package-lock.json

@@ -30,7 +30,6 @@
   ],
   "dependencies": {
     "@codingame/monaco-vscode-accessibility-service-override": "file:../dist/service-override-accessibility",
-    "@codingame/monaco-vscode-workspace-trust-service-override": "file:../dist/service-override-workspace-trust",
     "@codingame/monaco-vscode-audio-cue-service-override": "file:../dist/service-override-audio-cue",
     "@codingame/monaco-vscode-bat-default-extension": "file:../dist/default-extension-bat",
     "@codingame/monaco-vscode-bulk-edit-service-override": "file:../dist/service-override-bulk-edit",
@@ -142,10 +141,14 @@
     "@codingame/monaco-vscode-typescript-basics-default-extension": "file:../dist/default-extension-typescript-basics",
     "@codingame/monaco-vscode-typescript-language-features-default-extension": "file:../dist/default-extension-typescript-language-features",
     "@codingame/monaco-vscode-vb-default-extension": "file:../dist/default-extension-vb",
+    "@codingame/monaco-vscode-view-banner-service-override": "file:../dist/service-override-view-banner",
+    "@codingame/monaco-vscode-view-status-bar-service-override": "file:../dist/service-override-view-status-bar",
+    "@codingame/monaco-vscode-view-title-bar-service-override": "file:../dist/service-override-view-title-bar",
     "@codingame/monaco-vscode-views-service-override": "file:../dist/service-override-views",
     "@codingame/monaco-vscode-vscode-api-tests-default-extension": "file:../dist/default-extension-vscode-api-tests",
     "@codingame/monaco-vscode-vscode-colorize-tests-default-extension": "file:../dist/default-extension-vscode-colorize-tests",
     "@codingame/monaco-vscode-vscode-test-resolver-default-extension": "file:../dist/default-extension-vscode-test-resolver",
+    "@codingame/monaco-vscode-workspace-trust-service-override": "file:../dist/service-override-workspace-trust",
     "@codingame/monaco-vscode-xml-default-extension": "file:../dist/default-extension-xml",
     "@codingame/monaco-vscode-yaml-default-extension": "file:../dist/default-extension-yaml",
     "ansi-colors": "^4.1.3",

demo/package.json

@@ -16,6 +16,9 @@ import getViewsServiceOverride, {
   isPartVisibile,
   attachPart
 } from '@codingame/monaco-vscode-views-service-override'
+import getBannerServiceOverride from '@codingame/monaco-vscode-view-banner-service-override'
+import getStatusBarServiceOverride from '@codingame/monaco-vscode-view-status-bar-service-override'
+import getTitleBarServiceOverride from '@codingame/monaco-vscode-view-title-bar-service-override'
 import getDebugServiceOverride from '@codingame/monaco-vscode-debug-service-override'
 import getPreferencesServiceOverride from '@codingame/monaco-vscode-preferences-service-override'
 import getSnippetServiceOverride from '@codingame/monaco-vscode-snippets-service-override'
@@ -82,6 +85,9 @@ await initializeMonacoService({
   ...getDebugServiceOverride(),
   ...getPreferencesServiceOverride(),
   ...getViewsServiceOverride(openNewCodeEditor),
+  ...getBannerServiceOverride(),
+  ...getStatusBarServiceOverride(),
+  ...getTitleBarServiceOverride(),
   ...getSnippetServiceOverride(),
   ...getQuickAccessServiceOverride({
     isKeybindingConfigurationVisible: isEditorPartVisible,

demo/src/setup.ts

@@ -52,7 +52,8 @@ export default defineConfig({
       'vscode', 'vscode/extensions', 'vscode/services', 'vscode/monaco', '@codingame/monaco-vscode-model-service-override', '@codingame/monaco-vscode-editor-service-override',
       '@codingame/monaco-vscode-extensions-service-override', '@codingame/monaco-vscode-notifications-service-override', '@codingame/monaco-vscode-bulk-edit-service-override', '@codingame/monaco-vscode-dialogs-service-override', '@codingame/monaco-vscode-configuration-service-override',
       '@codingame/monaco-vscode-keybindings-service-override', '@codingame/monaco-vscode-textmate-service-override', '@codingame/monaco-vscode-theme-service-override', '@codingame/monaco-vscode-languages-service-override',
-      '@codingame/monaco-vscode-audio-cue-service-override', '@codingame/monaco-vscode-views-service-override', '@codingame/monaco-vscode-quickaccess-service-override', '@codingame/monaco-vscode-debug-service-override',
+      '@codingame/monaco-vscode-audio-cue-service-override', '@codingame/monaco-vscode-views-service-override', '@codingame/monaco-vscode-view-banner-service-override', '@codingame/monaco-vscode-view-status-bar-service-override', '@codingame/monaco-vscode-view-title-bar-service-override',
+      '@codingame/monaco-vscode-quickaccess-service-override', '@codingame/monaco-vscode-debug-service-override',
       '@codingame/monaco-vscode-preferences-service-override', '@codingame/monaco-vscode-snippets-service-override', '@codingame/monaco-vscode-files-service-override', '@codingame/monaco-vscode-output-service-override',
       '@codingame/monaco-vscode-terminal-service-override', '@codingame/monaco-vscode-search-service-override', '@codingame/monaco-vscode-markers-service-override', '@codingame/monaco-vscode-accessibility-service-override', '@codingame/monaco-vscode-storage-service-override',
       '@codingame/monaco-vscode-language-detection-worker-service-override', '@codingame/monaco-vscode-remote-agent-service-override', '@codingame/monaco-vscode-environment-service-override', '@codingame/monaco-vscode-lifecycle-service-override',

demo/vite.config.ts

@@ -15,13 +15,14 @@
   },
   "type": "module",
   "scripts": {
-    "build": "npm run clean && npm run generate-types && npm run lint && npm run compile-rollup-plugins && npm run compile-treemending-script && npm run compile && npm run compile-server && npm run compile-default-extensions",
+    "build": "npm run clean && npm run generate-types && npm run lint && npm run compile-rollup-plugins && npm run compile-treemending-script && npm run compile && npm run compile-server && npm run compile-default-extensions && npm run copy-monaco-editor",
     "compile": "NODE_OPTIONS=--max_old_space_size=8192 rollup --config rollup/rollup.config.ts --configPlugin 'typescript={tsconfig: `tsconfig.rollup-config.json`}' --vscode-version ${npm_package_config_vscode_version} --vscode-ref ${npm_package_config_vscode_ref}",
     "compile-default-extensions": "NODE_OPTIONS=--max_old_space_size=8192 rollup --config rollup/rollup.default-extensions.ts --configPlugin 'typescript={tsconfig: `tsconfig.rollup-config-default-extensions.json`}'",
     "clean": "rm -rf dist/",
     "compile-server": "rollup --config rollup/rollup.server.config.ts --configPlugin 'typescript={tsconfig: `tsconfig.rollup-config-server.json`, include: [`./rollup/rollup.server.config.ts`, `./rollup/rollup-metadata-plugin.ts`]}'",
     "compile-treemending-script": "rollup --config rollup/rollup.treemending-script.config.ts --configPlugin 'typescript={tsconfig: `tsconfig.rollup-config-treemending-script.json`, include: [`./rollup/rollup.treemending-script.config.ts`, `./rollup/rollup-metadata-plugin.ts`]}'",
     "compile-rollup-plugins": "rollup --config rollup/rollup.rollup-plugins.config.ts --configPlugin 'typescript={tsconfig: `tsconfig.rollup-config-plugins.json`, include: [`./rollup/rollup.rollup-plugins.config.ts`, `./rollup/rollup-metadata-plugin.ts`]}'",
+    "copy-monaco-editor": "cp -R node_modules/monaco-editor dist/ && (cd dist/monaco-editor; change-package-name \"@codingame/monaco-editor-treemended\")",
     "preprepare": "./scripts/install-vscode && node --loader ts-node/esm src/monaco-treemending.ts && patch-package",
     "lint": "eslint '{src/**/*.ts,rollup/*.ts,*.ts}'",
     "generate-types": "./scripts/generate-types",
@@ -60,6 +61,7 @@
     "@typescript-eslint/parser": "^5.62.0",
     "@vscode/iconv-lite-umd": "^0.7.0",
     "@web/rollup-plugin-import-meta-assets": "^2.1.0",
+    "change-package-name": "^1.0.5",
     "css-url-parser": "^1.1.3",
     "diff": "^5.1.0",
     "eslint": "^8.49.0",
@@ -85,9 +87,9 @@
     "semver": "^7.5.4",
     "ts-morph": "^19.0.0",
     "ts-node": "^10.9.1",
-    "xterm-headless": "^5.3.0",
     "type-fest": "^4.3.1",
     "typescript": "5.2.2",
+    "xterm-headless": "^5.3.0",
     "zx": "^7.2.3"
   },
   "dependencies": {
@@ -98,14 +100,14 @@
     "@vscode/ripgrep": "^1.15.5",
     "@vscode/spdlog": "^0.13.11",
     "@vscode/vscode-languagedetection": "^1.0.22",
-    "monaco-editor": "0.43.0",
-    "vscode-oniguruma": "^2.0.0",
     "@vscode/windows-process-tree": "^0.5.0",
     "cookie": "^0.5.0",
     "kerberos": "^2.0.2",
     "keytar": "^7.9.0",
     "mime-types": "^2.1.35",
+    "monaco-editor": "0.43.0",
     "node-pty": "^1.0.0",
+    "vscode-oniguruma": "^2.0.0",
     "vscode-regexpp": "^3.1.0",
     "vscode-textmate": "^9.0.0",
     "xterm": "5.2.1",

package-lock.json

@@ -146,7 +146,7 @@ import { INotebookKernelService } from 'vs/workbench/contrib/notebook/common/not
 import { INotebookRendererMessagingService } from 'vs/workbench/contrib/notebook/common/notebookRendererMessagingService'
 import { IInteractiveDocumentService } from 'vs/workbench/contrib/interactive/browser/interactiveDocumentService'
 import { IInlineChatService } from 'vs/workbench/contrib/inlineChat/common/inlineChat'
-import { IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat'
+import { IChatWidgetService, IQuickChatService } from 'vs/workbench/contrib/chat/browser/chat'
 import { IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService'
 import { IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication'
 import { ITimelineService } from 'vs/workbench/contrib/timeline/common/timeline'
@@ -1147,12 +1147,12 @@ registerSingleton(IStatusbarService, class StatusbarService implements IStatusba
   })
 
   isEntryVisible = () => false
-  updateEntryVisibility = unsupported
-  focus = unsupported
-  focusNextEntry = unsupported
-  focusPreviousEntry = unsupported
-  isEntryFocused = unsupported
-  overrideStyle = unsupported
+  updateEntryVisibility = () => { /* ignore */ }
+  focus = () => { /* ignore */ }
+  focusNextEntry = () => { /* ignore */ }
+  focusPreviousEntry = () => { /* ignore */ }
+  isEntryFocused = () => false
+  overrideStyle = () => Disposable.None
 }, InstantiationType.Eager)
 
 registerSingleton(IExtensionGalleryService, class ExtensionGalleryService implements IExtensionGalleryService {
@@ -1598,6 +1598,17 @@ registerSingleton(IChatService, class ChatService implements IChatService {
   notifyUserAction = unsupported
 }, InstantiationType.Delayed)
 
+registerSingleton(IQuickChatService, class QuickChatService implements IQuickChatService {
+  _serviceBrand: undefined
+  onDidClose = Event.None
+  enabled = false
+  toggle = unsupported
+  focus = unsupported
+  open = unsupported
+  close = unsupported
+  openInChatView = unsupported
+}, InstantiationType.Delayed)
+
 registerSingleton(IEmbedderTerminalService, class EmbedderTerminalService implements IEmbedderTerminalService {
   _serviceBrand: undefined
   onDidCreateTerminal = Event.None

package.json

@@ -21,10 +21,13 @@ import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/c
 import { IHostService } from 'vs/workbench/services/host/browser/host'
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'
 import { ILogService } from 'vs/platform/log/common/log'
+import { WorkbenchContextKeysHandler } from 'vs/workbench/browser/contextkeys'
 import getFileServiceOverride from './files'
 import { DynamicKeybindingService } from '../monaco'
 import 'vs/workbench/browser/workbench.contribution'
 import 'vs/workbench/contrib/keybindings/browser/keybindings.contribution'
+import { onRenderWorkbench } from '../lifecycle'
+import { IInstantiationService } from '../services'
 
 async function updateUserKeybindings (keybindingsJson: string): Promise<void> {
   const userDataProfilesService: IUserDataProfilesService = StandaloneServices.get(IUserDataProfilesService)
@@ -84,6 +87,10 @@ interface KeybindingsProps {
   shouldUseGlobalKeybindings?: () => boolean
 }
 
+onRenderWorkbench((accessor) => {
+  accessor.get(IInstantiationService).createInstance(WorkbenchContextKeysHandler)
+})
+
 export default function getServiceOverride ({ shouldUseGlobalKeybindings = () => false }: KeybindingsProps = {}): IEditorOverrideServices {
   return {
     ...getFileServiceOverride(),

src/missing-services.ts

@@ -0,0 +1,15 @@
+import '../missing-services'
+import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices'
+import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'
+import { BannerPart } from 'vs/workbench/browser/parts/banner/bannerPart'
+import { IBannerService } from 'vs/workbench/services/banner/browser/bannerService'
+
+export default function getServiceOverride (): IEditorOverrideServices {
+  return {
+    [IBannerService.toString()]: new SyncDescriptor(BannerPart, [], false)
+  }
+}
+
+export {
+  BannerPart
+}

src/service-override/keybindings.ts

@@ -0,0 +1,15 @@
+import '../missing-services'
+import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices'
+import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'
+import { StatusbarPart } from 'vs/workbench/browser/parts/statusbar/statusbarPart'
+import { IStatusbarService } from 'vs/workbench/services/statusbar/browser/statusbar'
+
+export default function getServiceOverride (): IEditorOverrideServices {
+  return {
+    [IStatusbarService.toString()]: new SyncDescriptor(StatusbarPart, [], false)
+  }
+}
+
+export {
+  StatusbarPart
+}