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
6 changes: 3 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.106.0",
"ref": "1.106.0",
"commit": "ac4cbdf48759c7d8c3eb91ffe6bb04316e263c57"
"version": "1.106.2",
"ref": "1.106.2",
"commit": "1e3c50d64110be466c0b4a45222e81d2c9352888"
},
"monaco": {
"ref": "v0.54.0",
Expand Down
6 changes: 6 additions & 0 deletions src/services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -675,3 +675,9 @@ export { IAiEditTelemetryService } from 'vs/workbench/contrib/editTelemetry/brow
export { IInlineCompletionsUnificationService } from 'vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.service'
export { IMcpGalleryManifestService } from 'vs/platform/mcp/common/mcpGalleryManifest.service'
export { IDataChannelService } from 'vs/platform/dataChannel/common/dataChannel.service'
export { IProgressService } from 'vs/platform/progress/common/progress.service'
export { IMarkdownRendererService } from 'vs/platform/markdown/browser/markdownRenderer.service'
export { IChatContextService } from 'vs/workbench/contrib/chat/browser/chatContextService.service'
export { ILanguageModelToolsConfirmationService } from 'vs/workbench/contrib/chat/common/languageModelToolsConfirmationService.service'
export { IRandomService } from 'vs/workbench/contrib/editTelemetry/browser/randomService.service'
export { ISCMRepositorySelectionMode } from 'vs/workbench/contrib/scm/common/scm'
4 changes: 2 additions & 2 deletions vscode-patches/0061-feat-support-shadow-dom.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1086,10 +1086,10 @@ index 086580f3db6..6f1a92c8e10 100644

private refreshSingleElement(element: SettingsTreeSettingElement): void {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
index 95b836afefb..69562b1cbfa 100644
index 6346712e164..f94c072156c 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
@@ -597,7 +597,7 @@ export class TerminalTabbedView extends Disposable {
@@ -595,7 +595,7 @@ export class TerminalTabbedView extends Disposable {

// If the terminal is waiting to reconnect to remote terminals, then there is no TerminalInstance yet that can
// be focused. So wait for connection to finish, then focus.
Expand Down
4 changes: 2 additions & 2 deletions vscode-patches/0065-fix-break-cyclic-dependency.patch
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ index 7736c50548e..6e1019eb68b 100644
import { ChatConfirmationWidget, IChatConfirmationButton } from '../chatConfirmationWidget.js';
import { IChatContentPartRenderContext } from '../chatContentParts.js';
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts
index 5b7da63493b..93f79fe21a0 100644
index a3d8966df20..66f8ddce4e7 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts
@@ -35,7 +35,7 @@ import { migrateLegacyTerminalToolSpecificData } from '../../../common/chat.js';
Expand All @@ -123,7 +123,7 @@ index 5b7da63493b..93f79fe21a0 100644
import { ICodeBlockRenderOptions } from '../../codeBlockPart.js';
import { ChatCustomConfirmationWidget, IChatConfirmationButton } from '../chatConfirmationWidget.js';
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts
index a01b0e3451a..8f294a2350e 100644
index 425399a1ef4..221b1f748be 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts
@@ -25,7 +25,7 @@ import { IChatToolInvocation, ToolConfirmKind } from '../../../common/chatServic
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3906,7 +3906,7 @@ index d35f2434ad6..be30ab99d17 100644
note.textContent = localize('chat.terminalOutputTruncated', 'Output truncated to first {0} characters.', CHAT_TERMINAL_OUTPUT_MAX_PREVIEW_LINES);
container.appendChild(note);
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts
index 8f294a2350e..b268326a399 100644
index 221b1f748be..09ebd082862 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts
@@ -155,7 +155,7 @@ export class ToolConfirmationSubPart extends AbstractToolConfirmationSubPart {
Expand Down Expand Up @@ -4823,10 +4823,10 @@ index 5f3ae5f09cd..ec6fb8450cb 100644
const result = renderLines(source, renderOptions, decorations, domNode);

diff --git a/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.ts b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.ts
index 9666f98016a..3014ca5ef3c 100644
index 5467d4cf9c6..045b2649a2c 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.ts
@@ -112,7 +112,7 @@ export class NotebookDeletedCellDecorator extends Disposable implements INoteboo
@@ -113,7 +113,7 @@ export class NotebookDeletedCellDecorator extends Disposable implements INoteboo
this._createWidgetImpl(index, cells);
}
private async _createWidgetImpl(index: number, cells: { cell: NotebookCellTextModel; originalIndex: number; previousIndex: number }[]) {
Expand All @@ -4835,7 +4835,7 @@ index 9666f98016a..3014ca5ef3c 100644
const widgets: NotebookDeletedCellWidget[] = [];
const heights = await Promise.all(cells.map(async cell => {
const widget = new NotebookDeletedCellWidget(this._notebookEditor, this.toolbar, cell.cell.getValue(), cell.cell.language, rootContainer, cell.originalIndex, this.languageService, this.instantiationService);
@@ -187,7 +187,7 @@ export class NotebookDeletedCellWidget extends Disposable {
@@ -188,7 +188,7 @@ export class NotebookDeletedCellWidget extends Disposable {
@IInstantiationService private readonly instantiationService: IInstantiationService,
) {
super();
Expand All @@ -4844,7 +4844,7 @@ index 9666f98016a..3014ca5ef3c 100644
this._register(toDisposable(() => {
container.removeChild(this.container);
}));
@@ -219,7 +219,7 @@ export class NotebookDeletedCellWidget extends Disposable {
@@ -220,7 +220,7 @@ export class NotebookDeletedCellWidget extends Disposable {
rootContainer.classList.add('code-cell-row');

if (this._toolbarOptions) {
Expand Down Expand Up @@ -5405,10 +5405,10 @@ index 7f80ccf5e95..df18556406a 100644
}

diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
index 69562b1cbfa..8a160c4f292 100644
index f94c072156c..22c9d9bb747 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
@@ -236,7 +236,7 @@ export class TerminalTabbedView extends Disposable {
@@ -234,7 +234,7 @@ export class TerminalTabbedView extends Disposable {
private _handleOnDidSashReset(): void {
// Calculate ideal size of list to display all text based on its contents
let idealWidth = TerminalTabsListSizes.WideViewMinimumWidth;
Expand Down