Skip to content

Commit 0751bc9

Browse files
author
Loïc Mangeonjean
committed
lib: update VSCode to 1.94
1 parent 61752f5 commit 0751bc9

File tree

65 files changed

+1985
-2163
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1985
-2163
lines changed

‎package-lock.json

Lines changed: 768 additions & 1100 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,36 +31,36 @@
3131
},
3232
"config": {
3333
"vscode": {
34-
"version": "1.93.1",
35-
"ref": "1.93.1",
36-
"commit": "38c31bc77e0dd6ae88a4e9cc93428cc27a56ba40"
34+
"version": "1.94.0",
35+
"ref": "1.94.0",
36+
"commit": "d78a74bcdfad14d5d3b1b782f87255d802b57511"
3737
},
3838
"monaco": {
3939
"ref": "v0.52.0",
4040
"version": "0.52.0"
4141
}
4242
},
4343
"devDependencies": {
44-
"@babel/core": "^7.25.2",
44+
"@babel/core": "^7.25.7",
4545
"@babel/plugin-proposal-class-properties": "^7.18.6",
46-
"@babel/plugin-proposal-decorators": "^7.24.7",
47-
"@babel/preset-env": "^7.25.4",
48-
"@babel/preset-typescript": "^7.24.7",
46+
"@babel/plugin-proposal-decorators": "^7.25.7",
47+
"@babel/preset-env": "^7.25.7",
48+
"@babel/preset-typescript": "^7.25.7",
4949
"@codingame/commitlint-config-codingame": "^1.1.1",
5050
"@codingame/eslint-config": "^1.2.1",
5151
"@codingame/semantic-release-config-github": "^1.0.0",
5252
"@codingame/tsconfig": "^1.1.1",
5353
"@commitlint/cli": "^19.5.0",
54-
"@rollup/plugin-commonjs": "^26.0.1",
55-
"@rollup/plugin-dynamic-import-vars": "^2.1.2",
54+
"@rollup/plugin-commonjs": "^28.0.0",
55+
"@rollup/plugin-dynamic-import-vars": "^2.1.3",
5656
"@rollup/plugin-json": "^6.1.0",
57-
"@rollup/plugin-node-resolve": "^15.2.3",
58-
"@rollup/plugin-replace": "^5.0.7",
59-
"@rollup/plugin-typescript": "^11.1.6",
57+
"@rollup/plugin-node-resolve": "^15.3.0",
58+
"@rollup/plugin-replace": "^6.0.1",
59+
"@rollup/plugin-typescript": "^12.1.0",
6060
"@types/mime-types": "^2.1.4",
6161
"@types/node": "18.19.8",
6262
"@types/semver": "^7.5.8",
63-
"@types/vscode": "~1.93.0",
63+
"@types/vscode": "~1.94.0",
6464
"@types/vscode-semver": "npm:@types/semver@=5.5.0",
6565
"@types/yargs": "^17.0.33",
6666
"@types/yauzl": "^2.10.3",
@@ -82,7 +82,7 @@
8282
"pascal-case": "^3.1.2",
8383
"patch-package": "^8.0.0",
8484
"recast": "^0.23.9",
85-
"rollup": "^4.21.3",
85+
"rollup": "^4.24.0",
8686
"rollup-plugin-copy": "^3.5.0",
8787
"rollup-plugin-dts": "^6.1.1",
8888
"rollup-plugin-styles": "^4.0.0",
@@ -94,35 +94,36 @@
9494
"typescript": "^5.6.2",
9595
"vscode-semver": "npm:semver@=5.5.0",
9696
"yargs": "^17.7.2",
97-
"zx": "^8.1.6"
97+
"zx": "^8.1.9"
9898
},
9999
"dependencies": {
100100
"@microsoft/1ds-core-js": "^3.2.13",
101101
"@microsoft/1ds-post-js": "^3.2.13",
102102
"@parcel/watcher": "2.1.0",
103-
"@rollup/pluginutils": "^5.1.0",
103+
"@rollup/pluginutils": "^5.1.2",
104104
"@vscode/iconv-lite-umd": "0.7.0",
105-
"@vscode/proxy-agent": "^0.23.0",
105+
"@vscode/proxy-agent": "^0.22.0",
106106
"@vscode/ripgrep": "^1.15.9",
107107
"@vscode/spdlog": "^0.15.0",
108+
"@vscode/tree-sitter-wasm": "^0.0.4",
108109
"@vscode/vscode-languagedetection": "1.0.21",
109110
"@vscode/windows-process-tree": "^0.6.0",
110111
"@vscode/windows-registry": "^1.1.0",
111-
"@xterm/addon-clipboard": "0.2.0-beta.39",
112-
"@xterm/addon-image": "0.9.0-beta.56",
113-
"@xterm/addon-search": "0.16.0-beta.56",
114-
"@xterm/addon-serialize": "0.14.0-beta.56",
115-
"@xterm/addon-unicode11": "0.9.0-beta.56",
116-
"@xterm/addon-webgl": "0.19.0-beta.56",
117-
"@xterm/headless": "5.6.0-beta.56",
118-
"@xterm/xterm": "5.6.0-beta.56",
112+
"@xterm/addon-clipboard": "^0.2.0-beta.47",
113+
"@xterm/addon-image": "^0.9.0-beta.64",
114+
"@xterm/addon-search": "^0.16.0-beta.64",
115+
"@xterm/addon-serialize": "^0.14.0-beta.64",
116+
"@xterm/addon-unicode11": "^0.9.0-beta.64",
117+
"@xterm/addon-webgl": "^0.19.0-beta.64",
118+
"@xterm/headless": "^5.6.0-beta.64",
119+
"@xterm/xterm": "^5.6.0-beta.64",
119120
"cookie": "^0.4.0",
120121
"css-url-parser": "^1.1.4",
121122
"jschardet": "3.1.3",
122123
"kerberos": "2.1.1",
123124
"keytar": "^7.9.0",
124125
"marked": "~14.0.0",
125-
"memfs": "^4.11.1",
126+
"memfs": "^4.12.0",
126127
"mime-types": "^2.1.35",
127128
"node-pty": "1.1.0-beta21",
128129
"vscode-oniguruma": "1.7.0",

‎rollup/rollup.config.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,9 @@ function transformVSCodeCode (id: string, code: string) {
324324
}
325325

326326
function resolveVscode (importee: string, importer?: string) {
327+
if (importee.endsWith('.js')) {
328+
importee = importee.slice(0, -3)
329+
}
327330
if (importer != null && importee.startsWith('.')) {
328331
importee = nodePath.resolve(nodePath.dirname(importer), importee)
329332
}

‎src/extension.api.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,8 @@ const api: typeof vscode = {
315315
InlineEditTriggerKind: extHostTypes.InlineEditTriggerKind,
316316
ExcludeSettingOptions: searchExtTypes.ExcludeSettingOptions,
317317
TextSearchContextNew: searchExtTypes.TextSearchContextNew,
318-
TextSearchMatchNew: searchExtTypes.TextSearchMatchNew
318+
TextSearchMatchNew: searchExtTypes.TextSearchMatchNew,
319+
ChatResponseCodeblockUriPart: extHostTypes.ChatResponseCodeblockUriPart
319320
}
320321

321322
// @ts-ignore the syntax will be transformed by a typescript transformer in the rollup config

‎src/missing-services.ts

Lines changed: 53 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,11 @@ import { IIntegrityService } from 'vs/workbench/services/integrity/common/integr
226226
import { IntegrityTestResult } from 'vs/workbench/services/integrity/common/integrity'
227227
import { ITrustedDomainService } from 'vs/workbench/contrib/url/browser/trustedDomainService.service'
228228
import { ILanguageModelToolsService } from 'vs/workbench/contrib/chat/common/languageModelToolsService.service'
229+
import { PortsEnablement } from 'vs/workbench/services/remote/common/remoteExplorerService'
230+
import { ICodeMapperService } from 'vs/workbench/contrib/chat/common/chatCodeMapperService.service'
231+
import { IChatEditingService } from 'vs/workbench/contrib/chat/common/chatEditingService.service'
232+
import { IActionViewItemService } from 'vs/platform/actions/browser/actionViewItemService.service'
233+
import { ITreeSitterTokenizationFeature } from 'vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.service'
229234
import { getBuiltInExtensionTranslationsUris, getExtensionIdProvidingCurrentLocale } from './l10n'
230235
import { unsupported } from './tools'
231236

@@ -969,9 +974,10 @@ registerSingleton(IExtensionHostDebugService, class ExtensionHostDebugService im
969974
}, InstantiationType.Eager)
970975

971976
registerSingleton(IViewsService, class ViewsService implements IViewsService {
977+
_serviceBrand: undefined
978+
isViewContainerActive = () => false
972979
getFocusedViewName = unsupported
973980
onDidChangeFocusedView = Event.None
974-
_serviceBrand: undefined
975981
onDidChangeViewContainerVisibility = Event.None
976982
isViewContainerVisible = () => false
977983
openViewContainer = unsupported
@@ -1106,6 +1112,7 @@ registerSingleton(ICustomEndpointTelemetryService, NullEndpointTelemetryService,
11061112
class MonacoSearchService implements ISearchService {
11071113
_serviceBrand: undefined
11081114
constructor (@IModelService private modelService: IModelService) {}
1115+
getAIName = async () => undefined
11091116
aiTextSearch = unsupported
11101117
textSearchSplitSyncAsync = unsupported
11111118

@@ -1166,6 +1173,11 @@ registerSingleton(ITimerService, class TimerService implements ITimerService {
11661173

11671174
registerSingleton(IExtensionsWorkbenchService, class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
11681175
_serviceBrand: undefined
1176+
updateAutoUpdateForAllExtensions = unsupported
1177+
openSearch = unsupported
1178+
getExtensionRuntimeStatus = () => undefined
1179+
onDidChangeExtensionsNotification = Event.None
1180+
getExtensionsNotification = () => undefined
11691181
shouldRequireConsentToUpdate = async () => undefined
11701182
updateAutoUpdateValue = unsupported
11711183
getResourceExtensions = unsupported
@@ -2315,6 +2327,9 @@ registerSingleton(IAccessibleViewInformationService, class AccessibleViewInforma
23152327

23162328
registerSingleton(IWorkbenchExtensionManagementService, class WorkbenchExtensionManagementService implements IWorkbenchExtensionManagementService {
23172329
_serviceBrand: undefined
2330+
onProfileAwareDidInstallExtensions = Event.None
2331+
onProfileAwareDidUninstallExtension = Event.None
2332+
onProfileAwareDidUpdateExtensionMetadata = Event.None
23182333
uninstallExtensions = unsupported
23192334
resetPinnedStateForAllUserExtensions = unsupported
23202335
getInstalledWorkspaceExtensionLocations = () => []
@@ -2435,6 +2450,7 @@ registerSingleton(IExtensionUrlHandler, class ExtensionUrlHandler implements IEx
24352450

24362451
registerSingleton(ICommentService, class CommentService implements ICommentService {
24372452
_serviceBrand: undefined
2453+
lastActiveCommentcontroller = undefined
24382454

24392455
get commentsModel () {
24402456
return unsupported()
@@ -2605,7 +2621,7 @@ registerSingleton(IRemoteExplorerService, class RemoteExplorerService implements
26052621
restore = unsupported
26062622
enablePortsFeatures = unsupported
26072623
onEnabledPortsFeatures = Event.None
2608-
portsFeaturesEnabled = false
2624+
portsFeaturesEnabled = PortsEnablement.Disabled
26092625
namedProcesses = new Map()
26102626
}, InstantiationType.Delayed)
26112627

@@ -2640,6 +2656,10 @@ registerSingleton(IAuthenticationAccessService, class AuthenticationAccessServic
26402656

26412657
registerSingleton(IAuthenticationExtensionsService, class AuthenticationExtensionsService implements IAuthenticationExtensionsService {
26422658
_serviceBrand: undefined
2659+
onDidChangeAccountPreference = Event.None
2660+
getAccountPreference = () => undefined
2661+
updateAccountPreference = unsupported
2662+
removeAccountPreference = unsupported
26432663
updateSessionPreference = unsupported
26442664
getSessionPreference = () => undefined
26452665
removeSessionPreference = unsupported
@@ -2650,6 +2670,8 @@ registerSingleton(IAuthenticationExtensionsService, class AuthenticationExtensio
26502670

26512671
registerSingleton(IAuthenticationUsageService, class AuthenticationUsageService implements IAuthenticationUsageService {
26522672
_serviceBrand: undefined
2673+
initializeExtensionUsageCache = unsupported
2674+
extensionUsesAuth = async () => false
26532675
readAccountUsages = unsupported
26542676
removeAccountUsage = unsupported
26552677
addAccountUsage = unsupported
@@ -2744,6 +2766,10 @@ registerSingleton(IWorkbenchIssueService, class WorkbenchIssueService implements
27442766

27452767
registerSingleton(ISCMViewService, class SCMViewService implements ISCMViewService {
27462768
_serviceBrand: undefined
2769+
get activeRepository () {
2770+
return unsupported()
2771+
}
2772+
27472773
get menus () {
27482774
return unsupported()
27492775
}
@@ -3200,6 +3226,7 @@ registerSingleton(IUserDataSyncUtilService, class UserDataSyncUtilService implem
32003226

32013227
registerSingleton(IUserDataProfileManagementService, class UserDataProfileManagementService implements IUserDataProfileManagementService {
32023228
_serviceBrand: undefined
3229+
getDefaultProfileToUse = unsupported
32033230
createProfile = unsupported
32043231
createAndEnterProfile = unsupported
32053232
createAndEnterTransientProfile = unsupported
@@ -3371,3 +3398,27 @@ registerSingleton(IIssueFormService, class IssueFormService implements IIssueFor
33713398
sendReporterMenu = unsupported
33723399
closeReporter = unsupported
33733400
}, InstantiationType.Delayed)
3401+
3402+
registerSingleton(ICodeMapperService, class CodeMapperService implements ICodeMapperService {
3403+
_serviceBrand: undefined
3404+
registerCodeMapperProvider = unsupported
3405+
mapCode = async () => undefined
3406+
}, InstantiationType.Delayed)
3407+
3408+
registerSingleton(IChatEditingService, class ChatEditingService implements IChatEditingService {
3409+
_serviceBrand: undefined
3410+
onDidCreateEditingSession = Event.None
3411+
currentEditingSession = null
3412+
startOrContinueEditingSession = unsupported
3413+
}, InstantiationType.Delayed)
3414+
3415+
registerSingleton(IActionViewItemService, class ActionViewItemService implements IActionViewItemService {
3416+
_serviceBrand: undefined
3417+
onDidChange = Event.None
3418+
register = unsupported
3419+
lookUp = () => undefined
3420+
}, InstantiationType.Delayed)
3421+
3422+
registerSingleton(ITreeSitterTokenizationFeature, class TreeSitterTokenizationFeature implements ITreeSitterTokenizationFeature {
3423+
_serviceBrand: undefined
3424+
}, InstantiationType.Delayed)

‎src/service-override/chat.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ import 'vs/workbench/contrib/chat/browser/chat.contribution'
2727
import 'vs/workbench/contrib/inlineChat/browser/inlineChat.contribution'
2828
import { ILanguageModelToolsService } from 'vs/workbench/contrib/chat/common/languageModelToolsService.service'
2929
import { LanguageModelToolsService } from 'vs/workbench/contrib/chat/common/languageModelToolsService'
30-
30+
import { ICodeMapperService } from 'vs/workbench/contrib/chat/common/chatCodeMapperService.service'
31+
import { CodeMapperService } from 'vs/workbench/contrib/chat/common/chatCodeMapperService'
32+
import { IChatEditingService } from 'vs/workbench/contrib/chat/common/chatEditingService.service'
33+
import { ChatEditingService } from 'vs/workbench/contrib/chat/browser/chatEditingService'
3134
export default function getServiceOverride (): IEditorOverrideServices {
3235
return {
3336
[IChatService.toString()]: new SyncDescriptor(ChatService, [], true),
@@ -44,6 +47,8 @@ export default function getServiceOverride (): IEditorOverrideServices {
4447
[IChatCodeBlockContextProviderService.toString()]: new SyncDescriptor(ChatCodeBlockContextProviderService, [], true),
4548
[ILanguageModelStatsService.toString()]: new SyncDescriptor(LanguageModelStatsService, [], true),
4649
[IChatAgentNameService.toString()]: new SyncDescriptor(ChatAgentNameService, [], true),
47-
[ILanguageModelToolsService.toString()]: new SyncDescriptor(LanguageModelToolsService, [], true)
50+
[ILanguageModelToolsService.toString()]: new SyncDescriptor(LanguageModelToolsService, [], true),
51+
[ICodeMapperService.toString()]: new SyncDescriptor(CodeMapperService, [], true),
52+
[IChatEditingService.toString()]: new SyncDescriptor(ChatEditingService, [], true)
4853
}
4954
}

‎src/service-override/viewCommon.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ import { IEditorPaneService } from 'vs/workbench/services/editor/common/editorPa
3838
import { EditorPaneService } from 'vs/workbench/services/editor/browser/editorPaneService'
3939
import { CustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService'
4040
import { ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService.service'
41+
import { ActionViewItemService } from 'vs/platform/actions/browser/actionViewItemService'
42+
import { IActionViewItemService } from 'vs/platform/actions/browser/actionViewItemService.service'
4143
import getBulkEditServiceOverride from './bulkEdit'
4244
import { changeUrlDomain } from './tools/url'
4345
import { registerAssets } from '../assets'
@@ -101,7 +103,8 @@ function getServiceOverride (_webviewIframeAlternateDomains?: string): IEditorOv
101103
[IProgressService.toString()]: new SyncDescriptor(ProgressService, [], true),
102104
[IAuxiliaryWindowService.toString()]: new SyncDescriptor(BrowserAuxiliaryWindowService, [], true),
103105
[IEditorPaneService.toString()]: new SyncDescriptor(EditorPaneService, [], true),
104-
[ICustomEditorLabelService.toString()]: new SyncDescriptor(CustomEditorLabelService, [], true)
106+
[ICustomEditorLabelService.toString()]: new SyncDescriptor(CustomEditorLabelService, [], true),
107+
[IActionViewItemService.toString()]: new SyncDescriptor(ActionViewItemService, [], true)
105108
}
106109
}
107110

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] fix: allow importing vscode-oniguruma
88
1 file changed, 1 insertion(+)
99

1010
diff --git a/.eslintrc.json b/.eslintrc.json
11-
index 1deaf02985b..889ddcd4d3d 100644
11+
index 879d547f9b5..6282847cafb 100644
1212
--- a/.eslintrc.json
1313
+++ b/.eslintrc.json
14-
@@ -673,6 +673,7 @@
14+
@@ -731,6 +731,7 @@
1515
"v8-inspect-profiler",
1616
"vscode-regexpp",
1717
"vscode-textmate",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] fix: fix editor api types
88
1 file changed, 10 insertions(+), 1 deletion(-)
99

1010
diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js
11-
index 088748b8356..324514d04b5 100644
11+
index 0d55982a8aa..debdf037393 100644
1212
--- a/build/gulpfile.editor.js
1313
+++ b/build/gulpfile.editor.js
14-
@@ -277,7 +277,16 @@ function toExternalDTS(contents) {
14+
@@ -239,7 +239,16 @@ function toExternalDTS(contents) {
1515
}
1616

1717
if (line.indexOf('declare let MonacoEnvironment') === 0) {

‎vscode-paches/0004-cleanup-remove-amd-build-to-speed-up-editor-build.patch renamed to ‎vscode-paches/0003-cleanup-remove-amd-build-to-speed-up-editor-build.patch

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ Date: Mon, 11 Mar 2024 16:44:07 +0100
44
Subject: [PATCH] cleanup: remove amd build to speed up editor build
55

66
---
7-
build/gulpfile.editor.js | 15 ++++-----------
8-
1 file changed, 4 insertions(+), 11 deletions(-)
7+
build/gulpfile.editor.js | 13 +++----------
8+
1 file changed, 3 insertions(+), 10 deletions(-)
99

1010
diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js
11-
index 324514d04b5..0cc0fd8b806 100644
11+
index debdf037393..a5951d21d34 100644
1212
--- a/build/gulpfile.editor.js
1313
+++ b/build/gulpfile.editor.js
14-
@@ -413,17 +413,10 @@ gulp.task('editor-distro',
14+
@@ -375,16 +375,9 @@ gulp.task('editor-distro',
1515
util.rimraf('out-editor-min')
1616
),
1717
extractEditorSrcTask,
@@ -24,12 +24,10 @@ index 324514d04b5..0cc0fd8b806 100644
2424
- task.series(
2525
- createESMSourcesAndResourcesTask,
2626
- compileEditorESMTask,
27-
- appendJSToESMImportsTask
2827
- )
2928
+ task.series(
3029
+ createESMSourcesAndResourcesTask,
3130
+ compileEditorESMTask,
32-
+ appendJSToESMImportsTask
3331
),
3432
finalEditorResourcesTask
3533
)

0 commit comments

Comments
 (0)