Skip to content

Commit d4a0a85

Browse files
author
Loïc Mangeonjean
committed
lib!: update to vscode 1.105 and monaco 0.54
1 parent 1836074 commit d4a0a85

File tree

86 files changed

+950
-512
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+950
-512
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
},
3131
"config": {
3232
"vscode": {
33-
"version": "1.104.2",
34-
"ref": "1.104.2",
35-
"commit": "e3a5acfb517a443235981655413d566533107e92"
33+
"version": "1.105.0",
34+
"ref": "1.105.0",
35+
"commit": "03c265b1adee71ac88f833e065f7bb956b60550a"
3636
},
3737
"monaco": {
38-
"ref": "v0.53.0",
39-
"version": "0.53.0"
38+
"ref": "v0.54.0",
39+
"version": "0.54.0"
4040
}
4141
},
4242
"devDependencies": {

vscode-patches/0001-feat-output-es2022.patch

Lines changed: 0 additions & 24 deletions
This file was deleted.

vscode-patches/0006-feat-add-static-asset-url-mechanism.patch renamed to vscode-patches/0005-feat-add-static-asset-url-mechanism.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ index faf19a0dce2..e83837db2db 100644
9595

9696
class ExtensionHostProxy implements IExtensionHostProxy {
9797
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
98-
index 24cc89970b7..d5d41c84143 100644
98+
index 2359a09ee3d..d8f64f815af 100644
9999
--- a/src/vs/workbench/api/common/extHost.protocol.ts
100100
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
101-
@@ -1591,6 +1591,7 @@ export interface MainThreadExtensionServiceShape extends IDisposable {
101+
@@ -1575,6 +1575,7 @@ export interface MainThreadExtensionServiceShape extends IDisposable {
102102
$onExtensionRuntimeError(extensionId: ExtensionIdentifier, error: SerializedError): void;
103103
$setPerformanceMarks(marks: performance.PerformanceMark[]): Promise<void>;
104104
$asBrowserUri(uri: UriComponents): Promise<UriComponents>;

vscode-patches/0008-fix-apply-style-only-on-standalone-editors.patch renamed to vscode-patches/0007-fix-apply-style-only-on-standalone-editors.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ index a770f47d708..985d6e217e6 100644
116116
* Contributions to instantiate.
117117
* When provided, only the contributions included will be instantiated.
118118
diff --git a/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts
119-
index a733efc443a..fbc898a0a10 100644
119+
index 8fd39f2945d..ce453f45816 100644
120120
--- a/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts
121121
+++ b/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts
122-
@@ -51,6 +51,12 @@ import { CSSStyle, ObservableElementSizeObserver, RefCounted, applyStyle, applyV
122+
@@ -52,6 +52,12 @@ import { CSSStyle, ObservableElementSizeObserver, RefCounted, applyStyle, applyV
123123
export interface IDiffCodeEditorWidgetOptions {
124124
originalEditor?: ICodeEditorWidgetOptions;
125125
modifiedEditor?: ICodeEditorWidgetOptions;
@@ -132,7 +132,7 @@ index a733efc443a..fbc898a0a10 100644
132132
}
133133

134134
export class DiffEditorWidget extends DelegatingEditor implements IDiffEditor {
135-
@@ -183,6 +189,8 @@ export class DiffEditorWidget extends DelegatingEditor implements IDiffEditor {
135+
@@ -184,6 +190,8 @@ export class DiffEditorWidget extends DelegatingEditor implements IDiffEditor {
136136

137137
this._contextKeyService.createKey('isInDiffEditor', true);
138138

vscode-patches/0009-fix-use-existing-method.patch renamed to vscode-patches/0008-fix-use-existing-method.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] fix: use existing method
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts
11-
index b64fa042aac..6ab8664b775 100644
11+
index 220776c7154..47364bdd034 100644
1212
--- a/src/vs/editor/standalone/browser/standaloneServices.ts
1313
+++ b/src/vs/editor/standalone/browser/standaloneServices.ts
14-
@@ -558,7 +558,7 @@ export class StandaloneKeybindingService extends AbstractKeybindingService {
14+
@@ -557,7 +557,7 @@ export class StandaloneKeybindingService extends AbstractKeybindingService {
1515
// This might be a removal keybinding item in user settings => accept it
1616
result[resultLen++] = new ResolvedKeybindingItem(undefined, item.command, item.commandArgs, when, isDefault, null, false);
1717
} else {

0 commit comments

Comments
 (0)