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
88 changes: 44 additions & 44 deletions package-lock.json

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

28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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<void> {
const state = this.contextService.getWorkbenchState();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down