Merge pull request #426 from CodinGame/update-vscode-1.89

Update to VSCode 1.89 (and some fixes)

demo/src/features/customView.views.ts

@@ -1,4 +1,4 @@
-import { IDialogService, EditorInput, createInstance, IInstantiationService } from 'vscode/services'
+import { IDialogService, EditorInput, createInstance, IInstantiationService, IEditorGroup } from 'vscode/services'
 import { IEditorCloseHandler, IEditorSerializer, registerCustomView, registerEditorPane, registerEditor, registerEditorSerializer, ViewContainerLocation, SimpleEditorPane, SimpleEditorInput, RegisteredEditorPriority, ConfirmResult } from '@codingame/monaco-vscode-views-service-override'
 import * as monaco from 'monaco-editor'
 
@@ -45,8 +45,8 @@ registerCustomView({
 class CustomEditorPane extends SimpleEditorPane {
   static readonly ID = 'workbench.editors.customEditor'
 
-  constructor () {
-    super(CustomEditorPane.ID)
+  constructor (group: IEditorGroup) {
+    super(CustomEditorPane.ID, group)
   }
 
   initialize (): HTMLElement {

demo/src/features/customView.workbench.ts

@@ -1,4 +1,4 @@
-import { IDialogService, EditorInput, createInstance, IInstantiationService } from 'vscode/services'
+import { IDialogService, EditorInput, createInstance, IInstantiationService, IEditorGroup } from 'vscode/services'
 import { IEditorCloseHandler, IEditorSerializer, registerCustomView, registerEditorPane, registerEditor, registerEditorSerializer, ViewContainerLocation, SimpleEditorPane, SimpleEditorInput, RegisteredEditorPriority, ConfirmResult } from '@codingame/monaco-vscode-workbench-service-override'
 import * as monaco from 'monaco-editor'
 
@@ -45,8 +45,8 @@ registerCustomView({
 class CustomEditorPane extends SimpleEditorPane {
   static readonly ID = 'workbench.editors.customEditor'
 
-  constructor () {
-    super(CustomEditorPane.ID)
+  constructor (group: IEditorGroup) {
+    super(CustomEditorPane.ID, group)
   }
 
   initialize (): HTMLElement {

package.json

@@ -31,9 +31,9 @@
   },
   "config": {
     "vscode": {
-      "version": "1.88.1",
-      "ref": "1.88.1",
-      "commit": "e170252f762678dec6ca2cc69aba1570769a5d39"
+      "version": "1.89.0",
+      "ref": "1.89.0",
+      "commit": "9645520c4ae4961f1e927dca9b291f786f11013e"
     },
     "monaco": {
       "ref": "v0.48.0",
@@ -60,7 +60,7 @@
     "@types/mime-types": "^2.1.4",
     "@types/node": "18.19.8",
     "@types/semver": "^7.5.8",
-    "@types/vscode": "~1.88.0",
+    "@types/vscode": "~1.89.0",
     "@types/vscode-marked": "npm:@types/marked@^3.0.2",
     "@types/vscode-semver": "npm:@types/semver@=5.5.0",
     "@types/yargs": "^17.0.32",
@@ -106,17 +106,17 @@
     "@vscode/proxy-agent": "^0.19.0",
     "@vscode/ripgrep": "^1.15.9",
     "@vscode/spdlog": "^0.15.0",
-    "@vscode/vscode-languagedetection": "npm:@codingame/vscode-languagedetection@1.0.23",
+    "@vscode/vscode-languagedetection": "1.0.21",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
-    "@xterm/addon-canvas": "0.7.0-beta.12",
-    "@xterm/addon-image": "0.8.0-beta.12",
-    "@xterm/addon-search": "0.15.0-beta.12",
-    "@xterm/addon-serialize": "0.13.0-beta.12",
-    "@xterm/addon-unicode11": "0.8.0-beta.12",
-    "@xterm/addon-webgl": "0.18.0-beta.12",
-    "@xterm/headless": "5.5.0-beta.12",
-    "@xterm/xterm": "5.5.0-beta.12",
+    "@xterm/addon-canvas": "0.8.0-beta.17",
+    "@xterm/addon-image": "0.9.0-beta.17",
+    "@xterm/addon-search": "0.16.0-beta.17",
+    "@xterm/addon-serialize": "0.14.0-beta.17",
+    "@xterm/addon-unicode11": "0.9.0-beta.17",
+    "@xterm/addon-webgl": "0.19.0-beta.17",
+    "@xterm/headless": "5.6.0-beta.17",
+    "@xterm/xterm": "5.6.0-beta.17",
     "cookie": "^0.4.0",
     "css-url-parser": "^1.1.3",
     "kerberos": "^2.0.1",
@@ -136,7 +136,7 @@
     "typescript": "$typescript",
     "rollup": "$rollup",
     "recast": "$recast",
-    "@xterm/xterm": "5.5.0-beta.12",
+    "@xterm/xterm": "5.6.0-beta.17",
     "eslint-plugin-n": "$eslint-plugin-n"
   },
   "volta": {

scripts/install-vscode

@@ -58,6 +58,12 @@ BUILD_SOURCEVERSION=$vscodeRef NODE_OPTIONS=--max-old-space-size=8192 yarn gulp
 rm -rf $extension_output_directory
 cp -R .build/web/extensions "$extension_output_directory"
 
+# Remove useless files
+cd src
+rm -rf `find . -name '*.test.ts' -o -name 'test' -o -name 'electron-browser'`
+rm -rf vs/code
+cd ..
+
 # transform to relative imports, replace ESM comments and vs/css! imports
 cat << EOF | node -
 	require('./build/lib/standalone').createESMSourcesAndResources2({
@@ -80,10 +86,6 @@ cd ..
 
 cd src
 
-# Remove useless files
-rm -rf `find . -name '*.test.ts' -o -name 'test' -o -name 'electron-browser'`
-rm -rf vs/code
-
 mkdir -p $output_directory
 echo $vscodeRef > $version_info
 

src/lifecycle.ts

@@ -9,6 +9,10 @@ import { EditorExtensions, IEditorFactoryRegistry } from 'vs/workbench/common/ed
 import { StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices'
 import { Disposable } from 'vs/base/common/lifecycle'
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService.service'
+import { setHoverDelegateFactory } from 'vs/base/browser/ui/hover/hoverDelegateFactory'
+import { setBaseLayerHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate2'
+import { WorkbenchHoverDelegate } from 'vs/platform/hover/browser/hover'
+import { IHoverService } from 'vs/platform/hover/browser/hover.service'
 
 const layoutEmitter = new Emitter<ServicesAccessor>()
 export const onLayout = layoutEmitter.event
@@ -59,6 +63,9 @@ 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/localExtensionHost.ts

@@ -221,7 +221,7 @@ class LocalExtensionHost implements IExtensionHost {
     }
   }
 
-  getInspectPort (): number | undefined {
+  getInspectPort (): { port: number, host: string } | undefined {
     return undefined
   }