Merge pull request #595 from CodinGame/vscode-1.98

VSCode 1.98

package.json

@@ -30,26 +30,26 @@
   },
   "config": {
     "vscode": {
-      "version": "1.97.2",
-      "ref": "1.97.2",
-      "commit": "e54c774e0add60467559eb0d1e229c6452cf8447"
+      "version": "1.98.0",
+      "ref": "1.98.0",
+      "commit": "6609ac3d66f4eade5cf376d1cb76f13985724bcb"
     },
     "monaco": {
       "ref": "v0.52.2",
       "version": "0.52.2"
     }
   },
   "devDependencies": {
-    "@babel/core": "^7.26.8",
+    "@babel/core": "^7.26.9",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-decorators": "^7.25.9",
-    "@babel/preset-env": "^7.26.8",
+    "@babel/preset-env": "^7.26.9",
     "@babel/preset-typescript": "^7.26.0",
     "@codingame/commitlint-config-codingame": "^1.1.1",
     "@codingame/semantic-release-config-github": "^2.0.0",
     "@codingame/tsconfig": "^1.1.1",
-    "@commitlint/cli": "^19.7.1",
-    "@rollup/plugin-commonjs": "^28.0.2",
+    "@commitlint/cli": "^19.8.0",
+    "@rollup/plugin-commonjs": "^28.0.3",
     "@rollup/plugin-dynamic-import-vars": "^2.1.5",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.0",
@@ -65,52 +65,52 @@
     "chalk": "^5.4.1",
     "change-case": "^5.4.4",
     "change-package-name": "^1.0.5",
-    "eslint": "^9.20.0",
+    "eslint": "^9.21.0",
     "fast-glob": "^3.3.3",
     "graceful-fs": "^4.2.11",
     "js-cleanup": "^1.2.0",
     "package-json": "^10.0.1",
     "patch-package": "^8.0.0",
-    "prettier": "^3.5.0",
-    "recast": "^0.23.9",
-    "rollup": "^4.34.6",
+    "prettier": "^3.5.3",
+    "recast": "^0.23.11",
+    "rollup": "^4.34.9",
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-dts": "^6.1.1",
     "rollup-plugin-styles": "^4.0.0",
-    "semantic-release": "24.2.2",
+    "semantic-release": "24.2.3",
     "semver": "^7.7.1",
-    "tsx": "^4.19.2",
-    "type-fest": "^4.34.1",
-    "typescript": "^5.7.3",
-    "typescript-eslint": "^8.23.0",
-    "uuid": "^11.0.5",
+    "tsx": "^4.19.3",
+    "type-fest": "^4.37.0",
+    "typescript": "^5.8.2",
+    "typescript-eslint": "^8.26.0",
+    "uuid": "^11.1.0",
     "vscode-semver": "npm:semver@=5.5.0",
     "yargs": "^17.7.2",
-    "zx": "^8.3.2"
+    "zx": "^8.4.0"
   },
   "dependencies": {
     "@microsoft/1ds-core-js": "^3.2.13",
     "@microsoft/1ds-post-js": "^3.2.13",
-    "@parcel/watcher": "2.5.0",
+    "@parcel/watcher": "2.5.1",
     "@rollup/pluginutils": "^5.1.4",
     "@vscode/iconv-lite-umd": "0.7.0",
-    "@vscode/proxy-agent": "^0.31.0",
+    "@vscode/proxy-agent": "^0.32.0",
     "@vscode/ripgrep": "^1.15.10",
     "@vscode/spdlog": "^0.15.0",
-    "@vscode/tree-sitter-wasm": "^0.0.5",
+    "@vscode/tree-sitter-wasm": "^0.1.3",
     "@vscode/vscode-languagedetection": "npm:@codingame/[email protected]",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
-    "@xterm/addon-clipboard": "^0.2.0-beta.80",
-    "@xterm/addon-image": "^0.9.0-beta.97",
-    "@xterm/addon-ligatures": "^0.10.0-beta.97",
-    "@xterm/addon-progress": "^0.2.0-beta.3",
-    "@xterm/addon-search": "^0.16.0-beta.97",
-    "@xterm/addon-serialize": "^0.14.0-beta.97",
-    "@xterm/addon-unicode11": "^0.9.0-beta.97",
-    "@xterm/addon-webgl": "^0.19.0-beta.97",
-    "@xterm/headless": "^5.6.0-beta.97",
-    "@xterm/xterm": "^5.6.0-beta.97",
+    "@xterm/addon-clipboard": "^0.2.0-beta.81",
+    "@xterm/addon-image": "^0.9.0-beta.98",
+    "@xterm/addon-ligatures": "^0.10.0-beta.98",
+    "@xterm/addon-progress": "^0.2.0-beta.4",
+    "@xterm/addon-search": "^0.16.0-beta.98",
+    "@xterm/addon-serialize": "^0.14.0-beta.98",
+    "@xterm/addon-unicode11": "^0.9.0-beta.98",
+    "@xterm/addon-webgl": "^0.19.0-beta.98",
+    "@xterm/headless": "^5.6.0-beta.98",
+    "@xterm/xterm": "^5.6.0-beta.98",
     "cookie": "^0.7.2",
     "css-url-parser": "^1.1.4",
     "jschardet": "3.1.4",
@@ -119,7 +119,7 @@
     "marked": "~14.0.0",
     "memfs": "^4.17.0",
     "mime-types": "^2.1.35",
-    "node-pty": "^1.1.0-beta22",
+    "node-pty": "1.1.0-beta30",
     "tas-client-umd": "0.2.0",
     "thenby": "^1.3.4",
     "vscode-oniguruma": "1.7.0",
@@ -132,7 +132,7 @@
     "typescript": "$typescript",
     "rollup": "$rollup",
     "recast": "$recast",
-    "@xterm/xterm": "^5.6.0-beta.97",
+    "@xterm/xterm": "^5.6.0-beta.98",
     "cross-spawn": "7.0.6"
   },
   "volta": {

src/extension.api.ts

@@ -189,8 +189,7 @@ const api: typeof vscode = {
   TerminalLocation: extHostTypes.TerminalLocation,
   TerminalProfile: extHostTypes.TerminalProfile,
   TerminalExitReason: extHostTypes.TerminalExitReason,
-  TerminalShellExecutionCommandLineConfidence:
-    extHostTypes.TerminalShellExecutionCommandLineConfidence,
+  TerminalShellExecutionCommandLineConfidence: extHostTypes.TerminalShellExecutionCommandLineConfidence,
   TextDocumentSaveReason: extHostTypes.TextDocumentSaveReason,
   TextEdit: extHostTypes.TextEdit,
   SnippetTextEdit: extHostTypes.SnippetTextEdit,
@@ -298,10 +297,8 @@ const api: typeof vscode = {
   ChatResponseCodeCitationPart: extHostTypes.ChatResponseCodeCitationPart,
   ChatResponseWarningPart: extHostTypes.ChatResponseWarningPart,
   ChatResponseTextEditPart: extHostTypes.ChatResponseTextEditPart,
-  ChatResponseMarkdownWithVulnerabilitiesPart:
-    extHostTypes.ChatResponseMarkdownWithVulnerabilitiesPart,
+  ChatResponseMarkdownWithVulnerabilitiesPart: extHostTypes.ChatResponseMarkdownWithVulnerabilitiesPart,
   ChatResponseCommandButtonPart: extHostTypes.ChatResponseCommandButtonPart,
-  ChatResponseDetectedParticipantPart: extHostTypes.ChatResponseDetectedParticipantPart,
   ChatResponseConfirmationPart: extHostTypes.ChatResponseConfirmationPart,
   ChatResponseReferencePartStatusKind: extHostTypes.ChatResponseReferencePartStatusKind,
   ChatRequestTurn: extHostTypes.ChatRequestTurn,
@@ -335,7 +332,12 @@ const api: typeof vscode = {
   TextEditorChangeKind: extHostTypes.TextEditorChangeKind,
   TextSearchMatch2: searchExtTypes.TextSearchMatch2,
   TextSearchContext2: searchExtTypes.TextSearchContext2,
-  TerminalShellType: extHostTypes.TerminalShellType
+  TerminalShellType: extHostTypes.TerminalShellType,
+  ChatResponseNotebookEditPart: extHostTypes.ChatResponseNotebookEditPart,
+  ChatErrorLevel: extHostTypes.ChatErrorLevel,
+  PreparedTerminalToolInvocation: extHostTypes.PreparedTerminalToolInvocation,
+  ExtendedLanguageModelToolResult: extHostTypes.ExtendedLanguageModelToolResult,
+  ChatReferenceDiagnostic: extHostTypes.ChatReferenceDiagnostic
 }
 
 // @ts-expect-error the syntax will be transformed by a typescript transformer in the rollup config

src/lifecycle.ts

@@ -58,7 +58,7 @@ export async function startup(instantiationService: IInstantiationService): Prom
 
   await instantiationService.invokeFunction(async (accessor) => {
     setHoverDelegateFactory((placement, enableInstantHover) =>
-      instantiationService.createInstance(WorkbenchHoverDelegate, placement, enableInstantHover, {})
+      instantiationService.createInstance(WorkbenchHoverDelegate, placement, { instantHover: enableInstantHover }, {})
     )
     setBaseLayerHoverDelegate(accessor.get(IHoverService))
   })

src/localExtensionHost.ts

@@ -208,7 +208,6 @@ class LocalExtensionHost implements IExtensionHost {
         appHost: this._productService.embedderIdentifier ?? (platform.isWeb ? 'web' : 'desktop'),
         appUriScheme: this._productService.urlProtocol,
         appLanguage: platform.language,
-        extensionTelemetryLogResource: this._environmentService.extHostTelemetryLogFile,
         isExtensionTelemetryLoggingOnly: isLoggingOnly(
           this._productService,
           this._environmentService

src/missing-services.ts

@@ -9,10 +9,10 @@ import { ResourceSet } from 'vs/base/common/map'
 import { OS } from 'vs/base/common/platform'
 import { joinPath } from 'vs/base/common/resources'
 import { URI } from 'vs/base/common/uri'
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'
-import { ITreeSitterTokenizationStoreService } from 'vs/editor/common/model/treeSitterTokenStoreService'
-import { IModelService } from 'vs/editor/common/services/model'
-import { ITreeViewsDnDService } from 'vs/editor/common/services/treeViewsDndService'
+import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService.service'
+import { ITreeSitterTokenizationStoreService } from 'vs/editor/common/model/treeSitterTokenStoreService.service'
+import { IModelService } from 'vs/editor/common/services/model.service'
+import { ITreeViewsDnDService } from 'vs/editor/common/services/treeViewsDndService.service'
 import { StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices'
 import { IAccessibleViewService } from 'vs/platform/accessibility/browser/accessibleView.service'
 import { IActionViewItemService } from 'vs/platform/actions/browser/actionViewItemService.service'
@@ -120,7 +120,7 @@ import {
   IChatWidgetService,
   IQuickChatService
 } from 'vs/workbench/contrib/chat/browser/chat.service'
-import { IChatQuotasService } from 'vs/workbench/contrib/chat/browser/chatQuotasService.service'
+import { IChatQuotasService } from 'vs/workbench/contrib/chat/common/chatQuotasService.service'
 import {
   IChatAgentNameService,
   IChatAgentService
@@ -342,6 +342,9 @@ import { IWorkspaceIdentityService } from 'vs/workbench/services/workspaces/comm
 import { IChatMarkdownAnchorService } from 'vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.service'
 import { getBuiltInExtensionTranslationsUris, getExtensionIdProvidingCurrentLocale } from './l10n'
 import { unsupported } from './tools'
+import { ITreeSitterImporter } from 'vs/editor/common/services/treeSitterParserService.service'
+import { IChatEntitlementsService } from 'vs/workbench/contrib/chat/common/chatEntitlementsService.service'
+import { IPromptsService } from 'vs/workbench/contrib/chat/common/promptSyntax/service/types.service'
 
 function Unsupported(target: object, propertyKey: string, descriptor: PropertyDescriptor) {
   function unsupported() {
@@ -446,6 +449,12 @@ registerSingleton(IUriIdentityService, UriIdentityService, InstantiationType.Del
 
 class TextFileService implements ITextFileService {
   _serviceBrand: undefined
+
+  @Unsupported
+  getEncoding(): never {
+    unsupported()
+  }
+
   @Unsupported
   get files() {
     return unsupported()
@@ -2220,9 +2229,11 @@ class HistoryService implements IHistoryService {
 registerSingleton(IHistoryService, HistoryService, InstantiationType.Eager)
 
 class TaskService implements ITaskService {
+  _serviceBrand: undefined
+
   onDidChangeTaskProviders = Event.None
   getKnownTasks = async () => []
-  _serviceBrand: undefined
+
   onDidChangeTaskConfig = Event.None
   onDidStateChange = Event.None
   supportsMultipleTaskExecutions = false
@@ -2231,6 +2242,11 @@ class TaskService implements ITaskService {
     unsupported()
   }
 
+  @Unsupported
+  rerun(): never {
+    unsupported()
+  }
+
   @Unsupported
   run(): never {
     unsupported()
@@ -2901,6 +2917,11 @@ class ExtensionsScannerService implements IExtensionsScannerService {
   initializeDefaultProfileExtensions(): never {
     unsupported()
   }
+
+  @Unsupported
+  updateManifestMetadata(): never {
+    unsupported()
+  }
 }
 registerSingleton(IExtensionsScannerService, ExtensionsScannerService, InstantiationType.Eager)
 
@@ -3800,6 +3821,7 @@ registerSingleton(IExtensionGalleryService, ExtensionGalleryService, Instantiati
 class TerminalService implements ITerminalService {
   _serviceBrand: undefined
 
+  onAnyInstanceAddedCapabilityType = Event.None
   onAnyInstanceShellTypeChanged = Event.None
 
   @Unsupported
@@ -4993,6 +5015,8 @@ class ChatService implements IChatService {
   notifyUserAction(): never {
     unsupported()
   }
+
+  onDidSubmitRequest = Event.None
 }
 registerSingleton(IChatService, ChatService, InstantiationType.Delayed)
 
@@ -5669,8 +5693,10 @@ registerSingleton(
 
 class RemoteExtensionsScannerService implements IRemoteExtensionsScannerService {
   _serviceBrand: undefined
-  whenExtensionsReady(): Promise<void> {
-    throw new Error('Method not implemented.')
+
+  @Unsupported
+  whenExtensionsReady(): never {
+    unsupported()
   }
 
   async scanExtensions(): Promise<Readonly<IRelaxedExtensionDescription>[]> {
@@ -8285,7 +8311,7 @@ class ChatEditingService implements IChatEditingService {
     unsupported()
   }
 
-  getEditingSession = () => null
+  getEditingSession = () => undefined
 
   @Unsupported
   createSnapshot(): never {
@@ -8304,10 +8330,20 @@ class ChatEditingService implements IChatEditingService {
 
   onDidCreateEditingSession = Event.None
   currentEditingSession = null
+
   @Unsupported
   startOrContinueEditingSession(): never {
     unsupported()
   }
+
+  @Unsupported
+  startOrContinueGlobalEditingSession(): never {
+    unsupported()
+  }
+  @Unsupported
+  createEditingSession(): never {
+    unsupported()
+  }
 }
 registerSingleton(IChatEditingService, ChatEditingService, InstantiationType.Delayed)
 
@@ -8357,6 +8393,12 @@ class TreeSitterTokenizationStoreService implements ITreeSitterTokenizationStore
 
   hasTokens = () => false
   getTokens = () => undefined
+
+
+  @Unsupported
+  rangeHasTokens(): never {
+    unsupported()
+  }
 }
 
 registerSingleton(
@@ -8394,6 +8436,8 @@ class ChatQuotasService implements IChatQuotasService {
   _serviceBrand: undefined
 
   onDidChangeQuotas = Event.None
+  onDidChangeQuotaExceeded = Event.None
+  onDidChangeQuotaRemaining = Event.None
 
   @Unsupported
   get quotas() {
@@ -8497,3 +8541,42 @@ class TerminalCompletionService implements ITerminalCompletionService {
   }
 }
 registerSingleton(ITerminalCompletionService, TerminalCompletionService, InstantiationType.Delayed)
+
+class TreeSitterImporter implements ITreeSitterImporter {
+  _serviceBrand: undefined
+  parserClass = undefined
+
+  @Unsupported
+  getParserClass(): never {
+    unsupported()
+  }
+  @Unsupported
+  getLanguageClass(): never {
+    unsupported()
+  }
+  @Unsupported
+  getQueryClass(): never {
+    unsupported()
+  }
+}
+registerSingleton(ITreeSitterImporter, TreeSitterImporter, InstantiationType.Eager);
+
+class ChatEntitlementsService implements IChatEntitlementsService {
+  _serviceBrand: undefined
+
+  resolve = async () => undefined
+}
+registerSingleton(IChatEntitlementsService, ChatEntitlementsService, InstantiationType.Eager);
+class PromptsService implements IPromptsService {
+  _serviceBrand: undefined
+
+  @Unsupported
+  getSyntaxParserFor(): never {
+    unsupported()
+  }
+  listPromptFiles = async () => []
+  getSourceFolders = () => []
+  dispose(): void {
+  }
+}
+registerSingleton(IPromptsService, PromptsService, InstantiationType.Eager);