lib: update VSCode to 1.94

Author: Loïc Mangeonjean

package-lock.json

@@ -31,36 +31,36 @@
   },
   "config": {
     "vscode": {
-      "version": "1.93.1",
-      "ref": "1.93.1",
-      "commit": "38c31bc77e0dd6ae88a4e9cc93428cc27a56ba40"
+      "version": "1.94.0",
+      "ref": "1.94.0",
+      "commit": "d78a74bcdfad14d5d3b1b782f87255d802b57511"
     },
     "monaco": {
       "ref": "v0.52.0",
       "version": "0.52.0"
     }
   },
   "devDependencies": {
-    "@babel/core": "^7.25.2",
+    "@babel/core": "^7.25.7",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.24.7",
-    "@babel/preset-env": "^7.25.4",
-    "@babel/preset-typescript": "^7.24.7",
+    "@babel/plugin-proposal-decorators": "^7.25.7",
+    "@babel/preset-env": "^7.25.7",
+    "@babel/preset-typescript": "^7.25.7",
     "@codingame/commitlint-config-codingame": "^1.1.1",
     "@codingame/eslint-config": "^1.2.1",
     "@codingame/semantic-release-config-github": "^1.0.0",
     "@codingame/tsconfig": "^1.1.1",
     "@commitlint/cli": "^19.5.0",
-    "@rollup/plugin-commonjs": "^26.0.1",
-    "@rollup/plugin-dynamic-import-vars": "^2.1.2",
+    "@rollup/plugin-commonjs": "^28.0.0",
+    "@rollup/plugin-dynamic-import-vars": "^2.1.3",
     "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-replace": "^5.0.7",
-    "@rollup/plugin-typescript": "^11.1.6",
+    "@rollup/plugin-node-resolve": "^15.3.0",
+    "@rollup/plugin-replace": "^6.0.1",
+    "@rollup/plugin-typescript": "^12.1.0",
     "@types/mime-types": "^2.1.4",
     "@types/node": "18.19.8",
     "@types/semver": "^7.5.8",
-    "@types/vscode": "~1.93.0",
+    "@types/vscode": "~1.94.0",
     "@types/vscode-semver": "npm:@types/semver@=5.5.0",
     "@types/yargs": "^17.0.33",
     "@types/yauzl": "^2.10.3",
@@ -82,7 +82,7 @@
     "pascal-case": "^3.1.2",
     "patch-package": "^8.0.0",
     "recast": "^0.23.9",
-    "rollup": "^4.21.3",
+    "rollup": "^4.24.0",
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-dts": "^6.1.1",
     "rollup-plugin-styles": "^4.0.0",
@@ -94,35 +94,36 @@
     "typescript": "^5.6.2",
     "vscode-semver": "npm:semver@=5.5.0",
     "yargs": "^17.7.2",
-    "zx": "^8.1.6"
+    "zx": "^8.1.9"
   },
   "dependencies": {
     "@microsoft/1ds-core-js": "^3.2.13",
     "@microsoft/1ds-post-js": "^3.2.13",
     "@parcel/watcher": "2.1.0",
-    "@rollup/pluginutils": "^5.1.0",
+    "@rollup/pluginutils": "^5.1.2",
     "@vscode/iconv-lite-umd": "0.7.0",
-    "@vscode/proxy-agent": "^0.23.0",
+    "@vscode/proxy-agent": "^0.22.0",
     "@vscode/ripgrep": "^1.15.9",
     "@vscode/spdlog": "^0.15.0",
+    "@vscode/tree-sitter-wasm": "^0.0.4",
     "@vscode/vscode-languagedetection": "1.0.21",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
-    "@xterm/addon-clipboard": "0.2.0-beta.39",
-    "@xterm/addon-image": "0.9.0-beta.56",
-    "@xterm/addon-search": "0.16.0-beta.56",
-    "@xterm/addon-serialize": "0.14.0-beta.56",
-    "@xterm/addon-unicode11": "0.9.0-beta.56",
-    "@xterm/addon-webgl": "0.19.0-beta.56",
-    "@xterm/headless": "5.6.0-beta.56",
-    "@xterm/xterm": "5.6.0-beta.56",
+    "@xterm/addon-clipboard": "^0.2.0-beta.47",
+    "@xterm/addon-image": "^0.9.0-beta.64",
+    "@xterm/addon-search": "^0.16.0-beta.64",
+    "@xterm/addon-serialize": "^0.14.0-beta.64",
+    "@xterm/addon-unicode11": "^0.9.0-beta.64",
+    "@xterm/addon-webgl": "^0.19.0-beta.64",
+    "@xterm/headless": "^5.6.0-beta.64",
+    "@xterm/xterm": "^5.6.0-beta.64",
     "cookie": "^0.4.0",
     "css-url-parser": "^1.1.4",
     "jschardet": "3.1.3",
     "kerberos": "2.1.1",
     "keytar": "^7.9.0",
     "marked": "~14.0.0",
-    "memfs": "^4.11.1",
+    "memfs": "^4.12.0",
     "mime-types": "^2.1.35",
     "node-pty": "1.1.0-beta21",
     "vscode-oniguruma": "1.7.0",

package.json

@@ -324,6 +324,9 @@ function transformVSCodeCode (id: string, code: string) {
 }
 
 function resolveVscode (importee: string, importer?: string) {
+  if (importee.endsWith('.js')) {
+    importee = importee.slice(0, -3)
+  }
   if (importer != null && importee.startsWith('.')) {
     importee = nodePath.resolve(nodePath.dirname(importer), importee)
   }

rollup/rollup.config.ts

@@ -315,7 +315,8 @@ const api: typeof vscode = {
   InlineEditTriggerKind: extHostTypes.InlineEditTriggerKind,
   ExcludeSettingOptions: searchExtTypes.ExcludeSettingOptions,
   TextSearchContextNew: searchExtTypes.TextSearchContextNew,
-  TextSearchMatchNew: searchExtTypes.TextSearchMatchNew
+  TextSearchMatchNew: searchExtTypes.TextSearchMatchNew,
+  ChatResponseCodeblockUriPart: extHostTypes.ChatResponseCodeblockUriPart
 }
 
 // @ts-ignore the syntax will be transformed by a typescript transformer in the rollup config

src/extension.api.ts

@@ -226,6 +226,11 @@ import { IIntegrityService } from 'vs/workbench/services/integrity/common/integr
 import { IntegrityTestResult } from 'vs/workbench/services/integrity/common/integrity'
 import { ITrustedDomainService } from 'vs/workbench/contrib/url/browser/trustedDomainService.service'
 import { ILanguageModelToolsService } from 'vs/workbench/contrib/chat/common/languageModelToolsService.service'
+import { PortsEnablement } from 'vs/workbench/services/remote/common/remoteExplorerService'
+import { ICodeMapperService } from 'vs/workbench/contrib/chat/common/chatCodeMapperService.service'
+import { IChatEditingService } from 'vs/workbench/contrib/chat/common/chatEditingService.service'
+import { IActionViewItemService } from 'vs/platform/actions/browser/actionViewItemService.service'
+import { ITreeSitterTokenizationFeature } from 'vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.service'
 import { getBuiltInExtensionTranslationsUris, getExtensionIdProvidingCurrentLocale } from './l10n'
 import { unsupported } from './tools'
 
@@ -969,9 +974,10 @@ registerSingleton(IExtensionHostDebugService, class ExtensionHostDebugService im
 }, InstantiationType.Eager)
 
 registerSingleton(IViewsService, class ViewsService implements IViewsService {
+  _serviceBrand: undefined
+  isViewContainerActive = () => false
   getFocusedViewName = unsupported
   onDidChangeFocusedView = Event.None
-  _serviceBrand: undefined
   onDidChangeViewContainerVisibility = Event.None
   isViewContainerVisible = () => false
   openViewContainer = unsupported
@@ -1106,6 +1112,7 @@ registerSingleton(ICustomEndpointTelemetryService, NullEndpointTelemetryService,
 class MonacoSearchService implements ISearchService {
   _serviceBrand: undefined
   constructor (@IModelService private modelService: IModelService) {}
+  getAIName = async () => undefined
   aiTextSearch = unsupported
   textSearchSplitSyncAsync = unsupported
 
@@ -1166,6 +1173,11 @@ registerSingleton(ITimerService, class TimerService implements ITimerService {
 
 registerSingleton(IExtensionsWorkbenchService, class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
   _serviceBrand: undefined
+  updateAutoUpdateForAllExtensions = unsupported
+  openSearch = unsupported
+  getExtensionRuntimeStatus = () => undefined
+  onDidChangeExtensionsNotification = Event.None
+  getExtensionsNotification = () => undefined
   shouldRequireConsentToUpdate = async () => undefined
   updateAutoUpdateValue = unsupported
   getResourceExtensions = unsupported
@@ -2315,6 +2327,9 @@ registerSingleton(IAccessibleViewInformationService, class AccessibleViewInforma
 
 registerSingleton(IWorkbenchExtensionManagementService, class WorkbenchExtensionManagementService implements IWorkbenchExtensionManagementService {
   _serviceBrand: undefined
+  onProfileAwareDidInstallExtensions = Event.None
+  onProfileAwareDidUninstallExtension = Event.None
+  onProfileAwareDidUpdateExtensionMetadata = Event.None
   uninstallExtensions = unsupported
   resetPinnedStateForAllUserExtensions = unsupported
   getInstalledWorkspaceExtensionLocations = () => []
@@ -2435,6 +2450,7 @@ registerSingleton(IExtensionUrlHandler, class ExtensionUrlHandler implements IEx
 
 registerSingleton(ICommentService, class CommentService implements ICommentService {
   _serviceBrand: undefined
+  lastActiveCommentcontroller = undefined
 
   get commentsModel () {
     return unsupported()
@@ -2605,7 +2621,7 @@ registerSingleton(IRemoteExplorerService, class RemoteExplorerService implements
   restore = unsupported
   enablePortsFeatures = unsupported
   onEnabledPortsFeatures = Event.None
-  portsFeaturesEnabled = false
+  portsFeaturesEnabled = PortsEnablement.Disabled
   namedProcesses = new Map()
 }, InstantiationType.Delayed)
 
@@ -2640,6 +2656,10 @@ registerSingleton(IAuthenticationAccessService, class AuthenticationAccessServic
 
 registerSingleton(IAuthenticationExtensionsService, class AuthenticationExtensionsService implements IAuthenticationExtensionsService {
   _serviceBrand: undefined
+  onDidChangeAccountPreference = Event.None
+  getAccountPreference = () => undefined
+  updateAccountPreference = unsupported
+  removeAccountPreference = unsupported
   updateSessionPreference = unsupported
   getSessionPreference = () => undefined
   removeSessionPreference = unsupported
@@ -2650,6 +2670,8 @@ registerSingleton(IAuthenticationExtensionsService, class AuthenticationExtensio
 
 registerSingleton(IAuthenticationUsageService, class AuthenticationUsageService implements IAuthenticationUsageService {
   _serviceBrand: undefined
+  initializeExtensionUsageCache = unsupported
+  extensionUsesAuth = async () => false
   readAccountUsages = unsupported
   removeAccountUsage = unsupported
   addAccountUsage = unsupported
@@ -2744,6 +2766,10 @@ registerSingleton(IWorkbenchIssueService, class WorkbenchIssueService implements
 
 registerSingleton(ISCMViewService, class SCMViewService implements ISCMViewService {
   _serviceBrand: undefined
+  get activeRepository () {
+    return unsupported()
+  }
+
   get menus () {
     return unsupported()
   }
@@ -3200,6 +3226,7 @@ registerSingleton(IUserDataSyncUtilService, class UserDataSyncUtilService implem
 
 registerSingleton(IUserDataProfileManagementService, class UserDataProfileManagementService implements IUserDataProfileManagementService {
   _serviceBrand: undefined
+  getDefaultProfileToUse = unsupported
   createProfile = unsupported
   createAndEnterProfile = unsupported
   createAndEnterTransientProfile = unsupported
@@ -3371,3 +3398,27 @@ registerSingleton(IIssueFormService, class IssueFormService implements IIssueFor
   sendReporterMenu = unsupported
   closeReporter = unsupported
 }, InstantiationType.Delayed)
+
+registerSingleton(ICodeMapperService, class CodeMapperService implements ICodeMapperService {
+  _serviceBrand: undefined
+  registerCodeMapperProvider = unsupported
+  mapCode = async () => undefined
+}, InstantiationType.Delayed)
+
+registerSingleton(IChatEditingService, class ChatEditingService implements IChatEditingService {
+  _serviceBrand: undefined
+  onDidCreateEditingSession = Event.None
+  currentEditingSession = null
+  startOrContinueEditingSession = unsupported
+}, InstantiationType.Delayed)
+
+registerSingleton(IActionViewItemService, class ActionViewItemService implements IActionViewItemService {
+  _serviceBrand: undefined
+  onDidChange = Event.None
+  register = unsupported
+  lookUp = () => undefined
+}, InstantiationType.Delayed)
+
+registerSingleton(ITreeSitterTokenizationFeature, class TreeSitterTokenizationFeature implements ITreeSitterTokenizationFeature {
+  _serviceBrand: undefined
+}, InstantiationType.Delayed)

src/missing-services.ts

@@ -27,7 +27,10 @@ import 'vs/workbench/contrib/chat/browser/chat.contribution'
 import 'vs/workbench/contrib/inlineChat/browser/inlineChat.contribution'
 import { ILanguageModelToolsService } from 'vs/workbench/contrib/chat/common/languageModelToolsService.service'
 import { LanguageModelToolsService } from 'vs/workbench/contrib/chat/common/languageModelToolsService'
-
+import { ICodeMapperService } from 'vs/workbench/contrib/chat/common/chatCodeMapperService.service'
+import { CodeMapperService } from 'vs/workbench/contrib/chat/common/chatCodeMapperService'
+import { IChatEditingService } from 'vs/workbench/contrib/chat/common/chatEditingService.service'
+import { ChatEditingService } from 'vs/workbench/contrib/chat/browser/chatEditingService'
 export default function getServiceOverride (): IEditorOverrideServices {
   return {
     [IChatService.toString()]: new SyncDescriptor(ChatService, [], true),
@@ -44,6 +47,8 @@ export default function getServiceOverride (): IEditorOverrideServices {
     [IChatCodeBlockContextProviderService.toString()]: new SyncDescriptor(ChatCodeBlockContextProviderService, [], true),
     [ILanguageModelStatsService.toString()]: new SyncDescriptor(LanguageModelStatsService, [], true),
     [IChatAgentNameService.toString()]: new SyncDescriptor(ChatAgentNameService, [], true),
-    [ILanguageModelToolsService.toString()]: new SyncDescriptor(LanguageModelToolsService, [], true)
+    [ILanguageModelToolsService.toString()]: new SyncDescriptor(LanguageModelToolsService, [], true),
+    [ICodeMapperService.toString()]: new SyncDescriptor(CodeMapperService, [], true),
+    [IChatEditingService.toString()]: new SyncDescriptor(ChatEditingService, [], true)
   }
 }

src/service-override/chat.ts

@@ -38,6 +38,8 @@ import { IEditorPaneService } from 'vs/workbench/services/editor/common/editorPa
 import { EditorPaneService } from 'vs/workbench/services/editor/browser/editorPaneService'
 import { CustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService'
 import { ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService.service'
+import { ActionViewItemService } from 'vs/platform/actions/browser/actionViewItemService'
+import { IActionViewItemService } from 'vs/platform/actions/browser/actionViewItemService.service'
 import getBulkEditServiceOverride from './bulkEdit'
 import { changeUrlDomain } from './tools/url'
 import { registerAssets } from '../assets'
@@ -101,7 +103,8 @@ function getServiceOverride (_webviewIframeAlternateDomains?: string): IEditorOv
     [IProgressService.toString()]: new SyncDescriptor(ProgressService, [], true),
     [IAuxiliaryWindowService.toString()]: new SyncDescriptor(BrowserAuxiliaryWindowService, [], true),
     [IEditorPaneService.toString()]: new SyncDescriptor(EditorPaneService, [], true),
-    [ICustomEditorLabelService.toString()]: new SyncDescriptor(CustomEditorLabelService, [], true)
+    [ICustomEditorLabelService.toString()]: new SyncDescriptor(CustomEditorLabelService, [], true),
+    [IActionViewItemService.toString()]: new SyncDescriptor(ActionViewItemService, [], true)
   }
 }
 

src/service-override/viewCommon.ts

@@ -8,10 +8,10 @@ Subject: [PATCH] fix: allow importing vscode-oniguruma
  1 file changed, 1 insertion(+)
 
 diff --git a/.eslintrc.json b/.eslintrc.json
-index 1deaf02985b..889ddcd4d3d 100644
+index 879d547f9b5..6282847cafb 100644
 --- a/.eslintrc.json
 +++ b/.eslintrc.json
-@@ -673,6 +673,7 @@
+@@ -731,6 +731,7 @@
  							"v8-inspect-profiler",
  							"vscode-regexpp",
  							"vscode-textmate",

vscode-paches/0001-fix-allow-importing-vscode-oniguruma.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] fix: fix editor api types
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js
-index 088748b8356..324514d04b5 100644
+index 0d55982a8aa..debdf037393 100644
 --- a/build/gulpfile.editor.js
 +++ b/build/gulpfile.editor.js
-@@ -277,7 +277,16 @@ function toExternalDTS(contents) {
+@@ -239,7 +239,16 @@ function toExternalDTS(contents) {
  		}
 
  		if (line.indexOf('declare let MonacoEnvironment') === 0) {

vscode-paches/0002-fix-fix-editor-api-types.patch

@@ -4,14 +4,14 @@ Date: Mon, 11 Mar 2024 16:44:07 +0100
 Subject: [PATCH] cleanup: remove amd build to speed up editor build
 
 ---
- build/gulpfile.editor.js | 15 ++++-----------
- 1 file changed, 4 insertions(+), 11 deletions(-)
+ build/gulpfile.editor.js | 13 +++----------
+ 1 file changed, 3 insertions(+), 10 deletions(-)
 
 diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js
-index 324514d04b5..0cc0fd8b806 100644
+index debdf037393..a5951d21d34 100644
 --- a/build/gulpfile.editor.js
 +++ b/build/gulpfile.editor.js
-@@ -413,17 +413,10 @@ gulp.task('editor-distro',
+@@ -375,16 +375,9 @@ gulp.task('editor-distro',
  			util.rimraf('out-editor-min')
  		),
  		extractEditorSrcTask,
@@ -24,12 +24,10 @@ index 324514d04b5..0cc0fd8b806 100644
 -			task.series(
 -				createESMSourcesAndResourcesTask,
 -				compileEditorESMTask,
--				appendJSToESMImportsTask
 -			)
 +		task.series(
 +			createESMSourcesAndResourcesTask,
 +			compileEditorESMTask,
-+			appendJSToESMImportsTask
  		),
  		finalEditorResourcesTask
  	)