Skip to content

Commit 1b1c82c

Browse files
authored
Merge pull request #675 from CodinGame/lmn/update-vscode-1.103
Update vscode 1.103
2 parents f622702 + 19925f5 commit 1b1c82c

55 files changed

Lines changed: 1695 additions & 1222 deletions

File tree

Some content is hidden

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

.ncurc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"@xterm/xterm",
2525
"cookie",
2626
"jschardet",
27+
"katex",
2728
"kerberos",
2829
"marked",
2930
"node-pty",

demo/package-lock.json

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

demo/package.json

Lines changed: 31 additions & 32 deletions
Large diffs are not rendered by default.

demo/src/setup.common.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ import getTelemetryServiceOverride from '@codingame/monaco-vscode-telemetry-serv
8181
import getMcpServiceOverride from '@codingame/monaco-vscode-mcp-service-override'
8282
import getProcessControllerServiceOverride from '@codingame/monaco-vscode-process-explorer-service-override'
8383
import getExperimentationServiceOverride from '@codingame/monaco-vscode-experimentation-service-override'
84+
import getImageResizeServiceOverride from '@codingame/monaco-vscode-image-resize-service-override'
8485
import { EnvironmentOverride } from '@codingame/monaco-vscode-api/workbench'
8586
import { Worker } from './tools/crossOriginWorker'
8687
import defaultKeybindings from './user/keybindings.json?raw'
@@ -547,5 +548,6 @@ export const commonServices: IEditorOverrideServices = {
547548
...getTelemetryServiceOverride(),
548549
...getMcpServiceOverride(),
549550
...getProcessControllerServiceOverride(),
550-
...getExperimentationServiceOverride()
551+
...getExperimentationServiceOverride(),
552+
...getImageResizeServiceOverride()
551553
}

docs/vscode_monaco_upgrade.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
- Fix errors, adapt code, build, include the `vscode-patches` directory into this commit
2626
- Do not hesitate to run the eslint autofix, it gets rid of the majority of your errors
2727
- Implement missing services. This is easily observable seem when running the demo (see next point)
28+
- you can also use the commmand `git diff <previousTag> <newTag> -G'registerSingleton\('` in the vscode repo to list the changes to the services
2829
- Make sure slightly transformed duplicated files are up to date with VSCode (in `src/assets`)
2930
- Update demo
3031
- Update dependencies

package-lock.json

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

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
},
3131
"config": {
3232
"vscode": {
33-
"version": "1.102.3",
34-
"ref": "1.102.3",
35-
"commit": "488a1f239235055e34e673291fb8d8c810886f81"
33+
"version": "1.103.0",
34+
"ref": "1.103.0",
35+
"commit": "e3550cfac4b63ca4eafca7b601f0d2885817fd1f"
3636
},
3737
"monaco": {
3838
"ref": "v0.52.2",
@@ -114,6 +114,7 @@
114114
"css-url-parser": "^1.1.4",
115115
"dompurify": "^3.2.6",
116116
"jschardet": "3.1.4",
117+
"katex": "^0.16.22",
117118
"kerberos": "2.1.1",
118119
"keytar": "^7.9.0",
119120
"marked": "~14.0.0",

src/extension.api.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@ const api: typeof vscode = {
334334
TextSearchContext2: searchExtTypes.TextSearchContext2,
335335
ChatResponseNotebookEditPart: extHostTypes.ChatResponseNotebookEditPart,
336336
ChatErrorLevel: extHostTypes.ChatErrorLevel,
337-
PreparedTerminalToolInvocation: extHostTypes.PreparedTerminalToolInvocation,
338337
ExtendedLanguageModelToolResult: extHostTypes.ExtendedLanguageModelToolResult,
339338
ChatReferenceDiagnostic: extHostTypes.ChatReferenceDiagnostic,
340339
// eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -352,7 +351,18 @@ const api: typeof vscode = {
352351
McpHttpServerDefinition: extHostTypes.McpHttpServerDefinition,
353352
AISearchKeyword: searchExtTypes.AISearchKeyword,
354353
ChatPrepareToolInvocationPart: extHostTypes.ChatPrepareToolInvocationPart,
355-
InlineCompletionsDisposeReasonKind: extHostTypes.InlineCompletionsDisposeReasonKind
354+
InlineCompletionsDisposeReasonKind: extHostTypes.InlineCompletionsDisposeReasonKind,
355+
ChatToolInvocationPart: extHostTypes.ChatToolInvocationPart,
356+
ChatResponseMultiDiffPart: extHostTypes.ChatResponseMultiDiffPart,
357+
ChatResponsePullRequestPart: extHostTypes.ChatResponsePullRequestPart,
358+
ChatResponseClearToPreviousToolInvocationReason:
359+
extHostTypes.ChatResponseClearToPreviousToolInvocationReason,
360+
LanguageModelToolExtensionSource: extHostTypes.LanguageModelToolExtensionSource,
361+
LanguageModelToolMCPSource: extHostTypes.LanguageModelToolMCPSource,
362+
ChatResponseTurn2: extHostTypes.ChatResponseTurn2,
363+
ToolResultAudience: extHostTypes.ToolResultAudience,
364+
LanguageModelTextPart2: extHostTypes.LanguageModelTextPart,
365+
LanguageModelDataPart2: extHostTypes.LanguageModelDataPart
356366
}
357367

358368
// @ts-expect-error the syntax will be transformed by a typescript transformer in the rollup config

0 commit comments

Comments
 (0)