Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .ncurc.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"@xterm/xterm",
"cookie",
"jschardet",
"katex",
"kerberos",
"marked",
"node-pty",
Expand Down
1,209 changes: 618 additions & 591 deletions demo/package-lock.json

Large diffs are not rendered by default.

63 changes: 31 additions & 32 deletions demo/package.json

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion demo/src/setup.common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ import getTelemetryServiceOverride from '@codingame/monaco-vscode-telemetry-serv
import getMcpServiceOverride from '@codingame/monaco-vscode-mcp-service-override'
import getProcessControllerServiceOverride from '@codingame/monaco-vscode-process-explorer-service-override'
import getExperimentationServiceOverride from '@codingame/monaco-vscode-experimentation-service-override'
import getImageResizeServiceOverride from '@codingame/monaco-vscode-image-resize-service-override'
import { EnvironmentOverride } from '@codingame/monaco-vscode-api/workbench'
import { Worker } from './tools/crossOriginWorker'
import defaultKeybindings from './user/keybindings.json?raw'
Expand Down Expand Up @@ -547,5 +548,6 @@ export const commonServices: IEditorOverrideServices = {
...getTelemetryServiceOverride(),
...getMcpServiceOverride(),
...getProcessControllerServiceOverride(),
...getExperimentationServiceOverride()
...getExperimentationServiceOverride(),
...getImageResizeServiceOverride()
}
1 change: 1 addition & 0 deletions docs/vscode_monaco_upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
- Fix errors, adapt code, build, include the `vscode-patches` directory into this commit
- Do not hesitate to run the eslint autofix, it gets rid of the majority of your errors
- Implement missing services. This is easily observable seem when running the demo (see next point)
- you can also use the commmand `git diff <previousTag> <newTag> -G'registerSingleton\('` in the vscode repo to list the changes to the services
- Make sure slightly transformed duplicated files are up to date with VSCode (in `src/assets`)
- Update demo
- Update dependencies
Expand Down
26 changes: 26 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
},
"config": {
"vscode": {
"version": "1.102.3",
"ref": "1.102.3",
"commit": "488a1f239235055e34e673291fb8d8c810886f81"
"version": "1.103.0",
"ref": "1.103.0",
"commit": "e3550cfac4b63ca4eafca7b601f0d2885817fd1f"
},
"monaco": {
"ref": "v0.52.2",
Expand Down Expand Up @@ -114,6 +114,7 @@
"css-url-parser": "^1.1.4",
"dompurify": "^3.2.6",
"jschardet": "3.1.4",
"katex": "^0.16.22",
"kerberos": "2.1.1",
"keytar": "^7.9.0",
"marked": "~14.0.0",
Expand Down
14 changes: 12 additions & 2 deletions src/extension.api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,6 @@ const api: typeof vscode = {
TextSearchContext2: searchExtTypes.TextSearchContext2,
ChatResponseNotebookEditPart: extHostTypes.ChatResponseNotebookEditPart,
ChatErrorLevel: extHostTypes.ChatErrorLevel,
PreparedTerminalToolInvocation: extHostTypes.PreparedTerminalToolInvocation,
ExtendedLanguageModelToolResult: extHostTypes.ExtendedLanguageModelToolResult,
ChatReferenceDiagnostic: extHostTypes.ChatReferenceDiagnostic,
// eslint-disable-next-line @typescript-eslint/no-explicit-any
Expand All @@ -352,7 +351,18 @@ const api: typeof vscode = {
McpHttpServerDefinition: extHostTypes.McpHttpServerDefinition,
AISearchKeyword: searchExtTypes.AISearchKeyword,
ChatPrepareToolInvocationPart: extHostTypes.ChatPrepareToolInvocationPart,
InlineCompletionsDisposeReasonKind: extHostTypes.InlineCompletionsDisposeReasonKind
InlineCompletionsDisposeReasonKind: extHostTypes.InlineCompletionsDisposeReasonKind,
ChatToolInvocationPart: extHostTypes.ChatToolInvocationPart,
ChatResponseMultiDiffPart: extHostTypes.ChatResponseMultiDiffPart,
ChatResponsePullRequestPart: extHostTypes.ChatResponsePullRequestPart,
ChatResponseClearToPreviousToolInvocationReason:
extHostTypes.ChatResponseClearToPreviousToolInvocationReason,
LanguageModelToolExtensionSource: extHostTypes.LanguageModelToolExtensionSource,
LanguageModelToolMCPSource: extHostTypes.LanguageModelToolMCPSource,
ChatResponseTurn2: extHostTypes.ChatResponseTurn2,
ToolResultAudience: extHostTypes.ToolResultAudience,
LanguageModelTextPart2: extHostTypes.LanguageModelTextPart,
LanguageModelDataPart2: extHostTypes.LanguageModelDataPart
}

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