Merge pull request #430 from CodinGame/various-fixes

Various fixes

package.json

@@ -31,9 +31,9 @@
   },
   "config": {
     "vscode": {
-      "version": "1.89.0",
-      "ref": "1.89.0",
-      "commit": "9645520c4ae4961f1e927dca9b291f786f11013e"
+      "version": "1.89.1",
+      "ref": "1.89.1",
+      "commit": "dc96b837cf6bb4af9cd736aa3af08cf8279f7685"
     },
     "monaco": {
       "ref": "v0.48.0",

src/lifecycle.ts

@@ -44,6 +44,11 @@ export async function startup (instantiationService: IInstantiationService): Pro
     await Promise.all(serviceInitializePreParticipants.map(participant => participant(accessor)))
   })
 
+  await instantiationService.invokeFunction(async accessor => {
+    setHoverDelegateFactory((placement, enableInstantHover) => instantiationService.createInstance(WorkbenchHoverDelegate, placement, enableInstantHover, {}))
+    setBaseLayerHoverDelegate(accessor.get(IHoverService))
+  })
+
   await instantiationService.invokeFunction(async accessor => {
     const lifecycleService = accessor.get(ILifecycleService)
 
@@ -63,9 +68,6 @@ export async function startup (instantiationService: IInstantiationService): Pro
   void instantiationService.invokeFunction(async accessor => {
     const lifecycleService = accessor.get(ILifecycleService)
 
-    setHoverDelegateFactory((placement, enableInstantHover) => instantiationService.createInstance(WorkbenchHoverDelegate, placement, enableInstantHover, {}))
-    setBaseLayerHoverDelegate(accessor.get(IHoverService))
-
     Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).start(accessor)
     Registry.as<IEditorFactoryRegistry>(EditorExtensions.EditorFactory).start(accessor)
 

src/service-override/tools/editor.ts

@@ -552,7 +552,7 @@ export class MonacoDelegateEditorGroupsService<D extends IEditorGroupsService> e
               this._onDidChangeActiveGroup.fire(this.activeGroup)
             }
           }
-          const remoteActiveGroup = (editor: StandaloneEditor | undefined) => {
+          const removeActiveGroup = (editor: StandaloneEditor | undefined) => {
             if (!emptyDelegate && this.activeGroupOverride === this.additionalGroups.find(group => group.editor === editor)) {
               updateActiveGroup(undefined)
             }
@@ -568,11 +568,11 @@ export class MonacoDelegateEditorGroupsService<D extends IEditorGroupsService> e
             // It happens when the focus goes from the editor itself to the overflow widgets dom node
             timeout = window.setTimeout(() => {
               timeout = undefined
-              remoteActiveGroup(editor)
+              removeActiveGroup(editor)
             }, 100)
           }
           editor.onDidDispose(() => {
-            remoteActiveGroup(editor)
+            removeActiveGroup(editor)
           })
           editor.onDidFocusEditorText(onEditorFocused)
           editor.onDidFocusEditorWidget(onEditorFocused)

src/service-override/tools/views.ts

@@ -12,7 +12,7 @@ import { EditorInputFactoryObject, RegisteredEditorInfo, RegisteredEditorOptions
 import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService.service'
 import { EditorInput, IEditorCloseHandler } from 'vs/workbench/common/editor/editorInput'
 import { EditorExtensions, EditorInputCapabilities, IEditorFactoryRegistry, IEditorOpenContext, IEditorSerializer, Verbosity } from 'vs/workbench/common/editor'
-import { IEditorOptions } from 'vs/platform/editor/common/editor'
+import { IEditorOptions, IResourceEditorInput } from 'vs/platform/editor/common/editor'
 import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions'
 import { Categories } from 'vs/platform/action/common/actionCommonCategories'
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'
@@ -200,6 +200,15 @@ abstract class SimpleEditorInput extends EditorInput {
     this.dirty = dirty
     this._onDidChangeDirty.fire()
   }
+
+  public override toUntyped (): IResourceEditorInput | undefined {
+    if (this.resource == null) {
+      return undefined
+    }
+    return {
+      resource: this.resource
+    }
+  }
 }
 
 function registerEditorPane<Services extends BrandedService[]> (