diff --git a/package-lock.json b/package-lock.json index a20d8e76..d4fcfaac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,16 +21,16 @@ "@vscode/vscode-languagedetection": "npm:@codingame/vscode-languagedetection@1.0.23", "@vscode/windows-process-tree": "^0.6.0", "@vscode/windows-registry": "^1.1.0", - "@xterm/addon-clipboard": "^0.2.0-beta.79", - "@xterm/addon-image": "^0.9.0-beta.96", - "@xterm/addon-ligatures": "^0.10.0-beta.96", - "@xterm/addon-progress": "^0.2.0-beta.2", - "@xterm/addon-search": "^0.16.0-beta.96", - "@xterm/addon-serialize": "^0.14.0-beta.96", - "@xterm/addon-unicode11": "^0.9.0-beta.96", - "@xterm/addon-webgl": "^0.19.0-beta.96", - "@xterm/headless": "^5.6.0-beta.96", - "@xterm/xterm": "^5.6.0-beta.96", + "@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", "cookie": "^0.7.2", "css-url-parser": "^1.1.4", "jschardet": "3.1.4", @@ -4765,30 +4765,30 @@ } }, "node_modules/@xterm/addon-clipboard": { - "version": "0.2.0-beta.79", - "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.79.tgz", - "integrity": "sha512-zpwf43fzBG01fA8E75JQ/jsm/85bHCtFMOcURNAEbCoj0RSpZaq4rE5cPoy49IhYnctPZdYNxEU/+PzgtsSQ6Q==", + "version": "0.2.0-beta.80", + "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.80.tgz", + "integrity": "sha512-uiZHaLzaV/10FctgD7+52fHWcnz3rnWX2F+JvuVDnnu+pIQWRpvCHJaAPGxf0Vhc4L+BjHnuM4JfoAZ6wZvj0A==", "license": "MIT", "dependencies": { "js-base64": "^3.7.5" }, "peerDependencies": { - "@xterm/xterm": "^5.6.0-beta.96" + "@xterm/xterm": "^5.6.0-beta.97" } }, "node_modules/@xterm/addon-image": { - "version": "0.9.0-beta.96", - "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.96.tgz", - "integrity": "sha512-LDA03uA5gTBfFeEIUdHXoCpxGHuPIke03aSXZc6cllRRp9jCaOK2kbWwTOoXfzRvjreKK6pxD0vJcepwdKaNcw==", + "version": "0.9.0-beta.97", + "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.97.tgz", + "integrity": "sha512-FLMB2q5gjOc91V9oo/+3sCPzGRbqZafpA2TN5CwLJsWEtUgk3p4P9x4owdUegIgWtLQCy1rUV6MLBNiOHKdU/g==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^5.6.0-beta.96" + "@xterm/xterm": "^5.6.0-beta.97" } }, "node_modules/@xterm/addon-ligatures": { - "version": "0.10.0-beta.96", - "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.96.tgz", - "integrity": "sha512-uI86EDxCab345YR/Piwzs3R82DptKp/PC+sMKSX24hehhvWVAkpZus0toGhYwLZxF1r0U6yw4Oq0aCEzW362dQ==", + "version": "0.10.0-beta.97", + "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.97.tgz", + "integrity": "sha512-nDBZeDWh2yarAD/KxonpL4N2LCo3t4MyMvAI53V4e2jhUbXGLtBnfDJzJ1/OWiUIBJ96EOwfmfwRUxDaELIebA==", "license": "MIT", "dependencies": { "font-finder": "^1.1.0", @@ -4798,7 +4798,7 @@ "node": ">8.0.0" }, "peerDependencies": { - "@xterm/xterm": "^5.6.0-beta.96" + "@xterm/xterm": "^5.6.0-beta.97" } }, "node_modules/@xterm/addon-progress": { @@ -4811,51 +4811,51 @@ } }, "node_modules/@xterm/addon-search": { - "version": "0.16.0-beta.96", - "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.96.tgz", - "integrity": "sha512-AEEXqxkT6OgDOII4SxQJFKn7NhM7PnFeMLxQwrRQzZyrtFPg5peCesA07xHYvYzh0aKQ1PVvgycfrPgbPEeQDQ==", + "version": "0.16.0-beta.97", + "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.97.tgz", + "integrity": "sha512-h5wxTg9VghWdFSfbCJmtgKR2sdFRFH6CVrqtNXX5C5UwkuokDpollzzKh5s7UVrsQe1V2SeYq92Ea9IEd7DFYA==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^5.6.0-beta.96" + "@xterm/xterm": "^5.6.0-beta.97" } }, "node_modules/@xterm/addon-serialize": { - "version": "0.14.0-beta.96", - "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.96.tgz", - "integrity": "sha512-+00J2K3WsbMPy02UlehNumen//Opmr5B0MBrS4KFqhRwVaO8RD0hMPfr8IuhY3YqPaVny4HMOU88yaWtscxl7A==", + "version": "0.14.0-beta.97", + "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.97.tgz", + "integrity": "sha512-l/fcjN84uNUi9OG7n2dpaMjbmbGSEXIZGnoah0bppEDom/a3vpwHsPiEIvKqmtv7i57q5Hc/nJggQEEsvsY2ZA==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^5.6.0-beta.96" + "@xterm/xterm": "^5.6.0-beta.97" } }, "node_modules/@xterm/addon-unicode11": { - "version": "0.9.0-beta.96", - "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.96.tgz", - "integrity": "sha512-jBUSErJtrf6Jhz3itT5JXLeIIl5BkJ1ii8/YdzZQMh9602ZLYvqwS+7ih2FzYYjk0pZ+E1y4sYbT5FpBlVOM5w==", + "version": "0.9.0-beta.97", + "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.97.tgz", + "integrity": "sha512-gwfilsl1m/PvAykA5ryB5QPXunKJWNNCV1l6x0/8e4Zk0LfJASM2UY7XmpSb0mLSzc9sEC2Bw2C4dSKOEVXa+A==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^5.6.0-beta.96" + "@xterm/xterm": "^5.6.0-beta.97" } }, "node_modules/@xterm/addon-webgl": { - "version": "0.19.0-beta.96", - "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.96.tgz", - "integrity": "sha512-iAno2CMYRBHasr5aE3I7WN6DZ0mlHsEAIYAhvdhH+be1YxX4/DceBAtN0Ak7nFcQ70ZbtYzs1aNLTVKtli2TKA==", + "version": "0.19.0-beta.97", + "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.97.tgz", + "integrity": "sha512-xZqYfEccqXDKNzxrI+hbQKag8PVrq5boBL9C0k591glXmgKhZ5MOWU52hPKTpHQ7O2mAnRps2oacM8UcwwH48w==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^5.6.0-beta.96" + "@xterm/xterm": "^5.6.0-beta.97" } }, "node_modules/@xterm/headless": { - "version": "5.6.0-beta.96", - "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.6.0-beta.96.tgz", - "integrity": "sha512-lLumuO7sQbPNIxQkXa3CxwQWNlO4C5XF80VRgQ4PzjUcwPWGkGtkJJG9jcucHAKymQnH6AokCW171mcveU8cgg==", + "version": "5.6.0-beta.97", + "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.6.0-beta.97.tgz", + "integrity": "sha512-YD2pNzCL35JrIuSNblusuBzwYzIt4Z68SVYJdxxZC+iIRHch1oZWiIzmhbZg+sX/acKopAFQuhK1iMgYHS1igQ==", "license": "MIT" }, "node_modules/@xterm/xterm": { - "version": "5.6.0-beta.96", - "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.96.tgz", - "integrity": "sha512-XdOZyAaqOW67J3kJGJDgVb5skTD2nDQLmBICyhQ0cEqThTKrX5CzB11RswG6rZE8dI+nDE+pc93NjAMXSrQgFg==", + "version": "5.6.0-beta.97", + "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.97.tgz", + "integrity": "sha512-saXE3oWoTX68js+h/2TMCF6xllCZIM0aJeC28ZJiotjNufXL903P2IST8uTrHxfpJu3w+D665upyawORTclKrw==", "license": "MIT" }, "node_modules/@yarnpkg/lockfile": { diff --git a/package.json b/package.json index 580788cd..4591d457 100644 --- a/package.json +++ b/package.json @@ -30,9 +30,9 @@ }, "config": { "vscode": { - "version": "1.97.1", - "ref": "1.97.1", - "commit": "e249dada235c2083c83813bd65b7f4707fb97b76" + "version": "1.97.2", + "ref": "1.97.2", + "commit": "e54c774e0add60467559eb0d1e229c6452cf8447" }, "monaco": { "ref": "v0.52.2", @@ -101,16 +101,16 @@ "@vscode/vscode-languagedetection": "npm:@codingame/vscode-languagedetection@1.0.23", "@vscode/windows-process-tree": "^0.6.0", "@vscode/windows-registry": "^1.1.0", - "@xterm/addon-clipboard": "^0.2.0-beta.79", - "@xterm/addon-image": "^0.9.0-beta.96", - "@xterm/addon-ligatures": "^0.10.0-beta.96", - "@xterm/addon-progress": "^0.2.0-beta.2", - "@xterm/addon-search": "^0.16.0-beta.96", - "@xterm/addon-serialize": "^0.14.0-beta.96", - "@xterm/addon-unicode11": "^0.9.0-beta.96", - "@xterm/addon-webgl": "^0.19.0-beta.96", - "@xterm/headless": "^5.6.0-beta.96", - "@xterm/xterm": "^5.6.0-beta.96", + "@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", "cookie": "^0.7.2", "css-url-parser": "^1.1.4", "jschardet": "3.1.4", @@ -132,7 +132,7 @@ "typescript": "$typescript", "rollup": "$rollup", "recast": "$recast", - "@xterm/xterm": "^5.6.0-beta.96", + "@xterm/xterm": "^5.6.0-beta.97", "cross-spawn": "7.0.6" }, "volta": { diff --git a/vscode-patches/0035-fix-allow-adding-a-local-folder-even-when-there-is-a.patch b/vscode-patches/0035-fix-allow-adding-a-local-folder-even-when-there-is-a.patch index d1abeaca..e640f932 100644 --- a/vscode-patches/0035-fix-allow-adding-a-local-folder-even-when-there-is-a.patch +++ b/vscode-patches/0035-fix-allow-adding-a-local-folder-even-when-there-is-a.patch @@ -9,7 +9,7 @@ Subject: [PATCH] fix: allow adding a local folder even when there is a remote 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts b/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts -index 25fd78863cb..adc23e4e539 100644 +index be885f55a7d..6f5495a8a09 100644 --- a/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts +++ b/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts @@ -14,7 +14,7 @@ import { ConfigurationScope, IConfigurationRegistry, Extensions as Configuration @@ -21,7 +21,7 @@ index 25fd78863cb..adc23e4e539 100644 import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js'; import { IFileService } from '../../../../platform/files/common/files.js'; import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js'; -@@ -172,11 +172,6 @@ export abstract class AbstractWorkspaceEditingService extends Disposable impleme +@@ -171,11 +171,6 @@ export abstract class AbstractWorkspaceEditingService extends Disposable impleme private async doAddFolders(foldersToAdd: IWorkspaceFolderCreationData[], index?: number, donotNotifyError: boolean = false): Promise { const state = this.contextService.getWorkbenchState(); diff --git a/vscode-patches/0055-fix-extract-constants-into-separate-module.patch b/vscode-patches/0055-fix-extract-constants-into-separate-module.patch index bda28b21..d461cc5a 100644 --- a/vscode-patches/0055-fix-extract-constants-into-separate-module.patch +++ b/vscode-patches/0055-fix-extract-constants-into-separate-module.patch @@ -6,14 +6,13 @@ Subject: [PATCH] fix: extract constants into separate module so that only the constant is pulled from the root instead of the whole module graph --- src/vs/workbench/api/browser/mainThreadChatAgents2.ts | 5 +++-- - .../contrib/chat/browser/actions/chatActions.ts | 1 - .../contrib/chat/browser/actions/chatConstants.ts | 10 ++++++++++ .../chat/browser/actions/chatQuickInputActions.ts | 3 ++- .../chat/browser/contrib/chatDynamicVariables.ts | 3 ++- .../browser/contrib/chatDynamicVariablesConstant.ts | 6 ++++++ .../contrib/quickaccess/browser/commandsQuickAccess.ts | 3 +-- .../contrib/search/browser/anythingQuickAccess.ts | 2 +- - 8 files changed, 25 insertions(+), 8 deletions(-) + 7 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 src/vs/workbench/contrib/chat/browser/actions/chatConstants.ts create mode 100644 src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant.ts @@ -47,18 +46,6 @@ index eb2d7e2a9fd..5f46176cb1f 100644 } satisfies CompletionItem; }); -diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts -index d7532a3514b..0566f286ee7 100644 ---- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts -+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts -@@ -49,7 +49,6 @@ import { ChatEditorInput } from '../chatEditorInput.js'; - import { ChatViewPane } from '../chatViewPane.js'; - import { convertBufferToScreenshotVariable } from '../contrib/screenshot.js'; - import { clearChatEditor } from './chatClear.js'; -- - export const CHAT_CATEGORY = localize2('chat.category', 'Chat'); - export const CHAT_OPEN_ACTION_ID = 'workbench.action.chat.open'; - diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatConstants.ts b/src/vs/workbench/contrib/chat/browser/actions/chatConstants.ts new file mode 100644 index 00000000000..6ce67486a58