Skip to content

Commit d314146

Browse files
authored
Merge pull request #736 from CodinGame/lmn/vscode-1.106.2
VSCode 1.106.2
2 parents 69ab9fe + a5f1be9 commit d314146

File tree

5 files changed

+20
-14
lines changed

5 files changed

+20
-14
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
},
3131
"config": {
3232
"vscode": {
33-
"version": "1.106.0",
34-
"ref": "1.106.0",
35-
"commit": "ac4cbdf48759c7d8c3eb91ffe6bb04316e263c57"
33+
"version": "1.106.2",
34+
"ref": "1.106.2",
35+
"commit": "1e3c50d64110be466c0b4a45222e81d2c9352888"
3636
},
3737
"monaco": {
3838
"ref": "v0.54.0",

src/services.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,3 +675,9 @@ export { IAiEditTelemetryService } from 'vs/workbench/contrib/editTelemetry/brow
675675
export { IInlineCompletionsUnificationService } from 'vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.service'
676676
export { IMcpGalleryManifestService } from 'vs/platform/mcp/common/mcpGalleryManifest.service'
677677
export { IDataChannelService } from 'vs/platform/dataChannel/common/dataChannel.service'
678+
export { IProgressService } from 'vs/platform/progress/common/progress.service'
679+
export { IMarkdownRendererService } from 'vs/platform/markdown/browser/markdownRenderer.service'
680+
export { IChatContextService } from 'vs/workbench/contrib/chat/browser/chatContextService.service'
681+
export { ILanguageModelToolsConfirmationService } from 'vs/workbench/contrib/chat/common/languageModelToolsConfirmationService.service'
682+
export { IRandomService } from 'vs/workbench/contrib/editTelemetry/browser/randomService.service'
683+
export { ISCMRepositorySelectionMode } from 'vs/workbench/contrib/scm/common/scm'

vscode-patches/0061-feat-support-shadow-dom.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,10 +1086,10 @@ index 086580f3db6..6f1a92c8e10 100644
10861086

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

10941094
// If the terminal is waiting to reconnect to remote terminals, then there is no TerminalInstance yet that can
10951095
// be focused. So wait for connection to finish, then focus.

vscode-patches/0065-fix-break-cyclic-dependency.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ index 7736c50548e..6e1019eb68b 100644
110110
import { ChatConfirmationWidget, IChatConfirmationButton } from '../chatConfirmationWidget.js';
111111
import { IChatContentPartRenderContext } from '../chatContentParts.js';
112112
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts
113-
index 5b7da63493b..93f79fe21a0 100644
113+
index a3d8966df20..66f8ddce4e7 100644
114114
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts
115115
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts
116116
@@ -35,7 +35,7 @@ import { migrateLegacyTerminalToolSpecificData } from '../../../common/chat.js';
@@ -123,7 +123,7 @@ index 5b7da63493b..93f79fe21a0 100644
123123
import { ICodeBlockRenderOptions } from '../../codeBlockPart.js';
124124
import { ChatCustomConfirmationWidget, IChatConfirmationButton } from '../chatConfirmationWidget.js';
125125
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts
126-
index a01b0e3451a..8f294a2350e 100644
126+
index 425399a1ef4..221b1f748be 100644
127127
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts
128128
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts
129129
@@ -25,7 +25,7 @@ import { IChatToolInvocation, ToolConfirmKind } from '../../../common/chatServic

vscode-patches/0070-feat-centralize-element-creation-to-be-able-to-creat.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3906,7 +3906,7 @@ index d35f2434ad6..be30ab99d17 100644
39063906
note.textContent = localize('chat.terminalOutputTruncated', 'Output truncated to first {0} characters.', CHAT_TERMINAL_OUTPUT_MAX_PREVIEW_LINES);
39073907
container.appendChild(note);
39083908
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts
3909-
index 8f294a2350e..b268326a399 100644
3909+
index 221b1f748be..09ebd082862 100644
39103910
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts
39113911
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts
39123912
@@ -155,7 +155,7 @@ export class ToolConfirmationSubPart extends AbstractToolConfirmationSubPart {
@@ -4823,10 +4823,10 @@ index 5f3ae5f09cd..ec6fb8450cb 100644
48234823
const result = renderLines(source, renderOptions, decorations, domNode);
48244824

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

48504850
if (this._toolbarOptions) {
@@ -5405,10 +5405,10 @@ index 7f80ccf5e95..df18556406a 100644
54055405
}
54065406

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

0 commit comments

Comments
 (0)