Skip to content

Commit 87f03d8

Browse files
jriekenjrieken
committed
Merge branch 'main' into joh/issue137884
2 parents d7de53f + 3038b56 commit 87f03d8

File tree

72 files changed

+1114
-748
lines changed

Some content is hidden

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

72 files changed

+1114
-748
lines changed

‎extensions/markdown-language-features/extension.webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ module.exports = withDefaults({
1515
mainFields: ['module', 'main']
1616
},
1717
entry: {
18-
extension: './src/extension.node.ts',
18+
extension: './src/extension.ts',
1919
}
2020
});

‎extensions/markdown-language-features/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"engines": {
1111
"vscode": "^1.20.0"
1212
},
13-
"main": "./out/extension.node",
13+
"main": "./out/extension",
1414
"browser": "./dist/browser/extension",
1515
"categories": [
1616
"Programming Languages"

‎extensions/markdown-language-features/src/extension.node.ts renamed to ‎extensions/markdown-language-features/src/extension.ts

File renamed without changes.

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@
8585
"vscode-proxy-agent": "^0.12.0",
8686
"vscode-regexpp": "^3.1.0",
8787
"vscode-textmate": "7.0.1",
88-
"xterm": "4.20.0-beta.5",
88+
"xterm": "4.20.0-beta.6",
8989
"xterm-addon-search": "0.10.0-beta.1",
9090
"xterm-addon-serialize": "0.8.0-beta.1",
9191
"xterm-addon-unicode11": "0.4.0-beta.3",
92-
"xterm-addon-webgl": "0.13.0-beta.2",
93-
"xterm-headless": "4.20.0-beta.5",
92+
"xterm-addon-webgl": "0.13.0-beta.3",
93+
"xterm-headless": "4.20.0-beta.6",
9494
"yauzl": "^2.9.2",
9595
"yazl": "^2.4.3"
9696
},

‎remote/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
"vscode-proxy-agent": "^0.12.0",
2525
"vscode-regexpp": "^3.1.0",
2626
"vscode-textmate": "7.0.1",
27-
"xterm": "4.20.0-beta.5",
27+
"xterm": "4.20.0-beta.6",
2828
"xterm-addon-search": "0.10.0-beta.1",
2929
"xterm-addon-serialize": "0.8.0-beta.1",
3030
"xterm-addon-unicode11": "0.4.0-beta.3",
31-
"xterm-addon-webgl": "0.13.0-beta.2",
32-
"xterm-headless": "4.20.0-beta.5",
31+
"xterm-addon-webgl": "0.13.0-beta.3",
32+
"xterm-headless": "4.20.0-beta.6",
3333
"yauzl": "^2.9.2",
3434
"yazl": "^2.4.3"
3535
},

‎remote/web/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
"tas-client-umd": "0.1.6",
1212
"vscode-oniguruma": "1.6.1",
1313
"vscode-textmate": "7.0.1",
14-
"xterm": "4.20.0-beta.5",
14+
"xterm": "4.20.0-beta.6",
1515
"xterm-addon-search": "0.10.0-beta.1",
1616
"xterm-addon-unicode11": "0.4.0-beta.3",
17-
"xterm-addon-webgl": "0.13.0-beta.2"
17+
"xterm-addon-webgl": "0.13.0-beta.3"
1818
}
1919
}

‎remote/web/yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ [email protected]:
7878
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.4.0-beta.3.tgz#f350184155fafd5ad0d6fbf31d13e6ca7dea1efa"
7979
integrity sha512-FryZAVwbUjKTmwXnm1trch/2XO60F5JsDvOkZhzobV1hm10sFLVuZpFyHXiUx7TFeeFsvNP+S77LAtWoeT5z+Q==
8080

81-
[email protected].2:
82-
version "0.13.0-beta.2"
83-
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.13.0-beta.2.tgz#f58a7a3641ad7c8ac82dd24cfb0165656ed9ac1c"
84-
integrity sha512-98tX0BkpD402RoCO6SyikUXpzCn9/OQhlXsRmM/kRFCxMWWofStWTXzCPhN0MjIx2IdGueDjCmnShhidwihErg==
85-
86-
[email protected].5:
87-
version "4.20.0-beta.5"
88-
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.20.0-beta.5.tgz#d707b0dcb477a554135fb767b24003fced079866"
89-
integrity sha512-KBWfk9UPBKRy662DVGGTZEcW1becEjYvlyWbn2hLj9h2gy6Q4EEEEbggJh8I7SGwdFizl+apHQGhEOZmFCA70w==
81+
[email protected].3:
82+
version "0.13.0-beta.3"
83+
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.13.0-beta.3.tgz#2b456c3105238e64b40a30787d6335f5f6f85abb"
84+
integrity sha512-DFGcXAolA0VTsOLIKcORxUOp/FTJdD/YiRzKVLARjgOycwVRKvW2L5Tge8Z7ysZ16sKfnV2vCXyonXYfUWozXw==
85+
86+
[email protected].6:
87+
version "4.20.0-beta.6"
88+
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.20.0-beta.6.tgz#3ed87ba383a5cf44284098278f714df7113e3e3c"
89+
integrity sha512-xJd6vyOuYo4Ht/hTY3DyXGIj0U6kHjr2vWQ1lRmearo3t7QKf7uqOAAfTLeWt/g1P8qe/r0DnsNTeag6vI9RVw==

‎remote/yarn.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -803,20 +803,20 @@ [email protected]:
803803
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.4.0-beta.3.tgz#f350184155fafd5ad0d6fbf31d13e6ca7dea1efa"
804804
integrity sha512-FryZAVwbUjKTmwXnm1trch/2XO60F5JsDvOkZhzobV1hm10sFLVuZpFyHXiUx7TFeeFsvNP+S77LAtWoeT5z+Q==
805805

806-
[email protected].2:
807-
version "0.13.0-beta.2"
808-
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.13.0-beta.2.tgz#f58a7a3641ad7c8ac82dd24cfb0165656ed9ac1c"
809-
integrity sha512-98tX0BkpD402RoCO6SyikUXpzCn9/OQhlXsRmM/kRFCxMWWofStWTXzCPhN0MjIx2IdGueDjCmnShhidwihErg==
810-
811-
[email protected].5:
812-
version "4.20.0-beta.5"
813-
resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.20.0-beta.5.tgz#edcff27eb6437d158e6aea2ed7658e783bee5641"
814-
integrity sha512-8SnVUsuNUrQ5P0XU/9Iau3uK7Tf8q/p0KHHwkwJXVxZDIlaDH9XKSs91U9BjJJE3sJgRxH4NSiDYR3vFLSFpxw==
815-
816-
[email protected].5:
817-
version "4.20.0-beta.5"
818-
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.20.0-beta.5.tgz#d707b0dcb477a554135fb767b24003fced079866"
819-
integrity sha512-KBWfk9UPBKRy662DVGGTZEcW1becEjYvlyWbn2hLj9h2gy6Q4EEEEbggJh8I7SGwdFizl+apHQGhEOZmFCA70w==
806+
[email protected].3:
807+
version "0.13.0-beta.3"
808+
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.13.0-beta.3.tgz#2b456c3105238e64b40a30787d6335f5f6f85abb"
809+
integrity sha512-DFGcXAolA0VTsOLIKcORxUOp/FTJdD/YiRzKVLARjgOycwVRKvW2L5Tge8Z7ysZ16sKfnV2vCXyonXYfUWozXw==
810+
811+
[email protected].6:
812+
version "4.20.0-beta.6"
813+
resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.20.0-beta.6.tgz#bd016379e9fac47e5b8870d567cdf330cf6f49fc"
814+
integrity sha512-EV0V7pxMKI0OEcOCD+6vdXq6rBARr7dSN3PovTsZnDWg5dmvUb2eEmz6BTejJj3UVd/JXNEmEXM+tCh97rDCDg==
815+
816+
[email protected].6:
817+
version "4.20.0-beta.6"
818+
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.20.0-beta.6.tgz#3ed87ba383a5cf44284098278f714df7113e3e3c"
819+
integrity sha512-xJd6vyOuYo4Ht/hTY3DyXGIj0U6kHjr2vWQ1lRmearo3t7QKf7uqOAAfTLeWt/g1P8qe/r0DnsNTeag6vI9RVw==
820820

821821
yallist@^4.0.0:
822822
version "4.0.0"

‎src/vs/base/browser/ui/button/button.css

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,13 @@
4242
outline-offset: -1px !important;
4343
}
4444

45-
.monaco-button-dropdown > .monaco-dropdown-button {
46-
margin-left: 1px;
45+
.monaco-button-dropdown .monaco-button-dropdown-separator {
46+
padding: 4px 0;
47+
}
48+
49+
.monaco-button-dropdown .monaco-button-dropdown-separator > div {
50+
height: 100%;
51+
width: 1px;
4752
}
4853

4954
.monaco-description-button {

‎src/vs/base/browser/ui/button/button.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,8 @@ export class ButtonWithDropdown extends Disposable implements IButton {
247247
private readonly button: Button;
248248
private readonly action: Action;
249249
private readonly dropdownButton: Button;
250+
private readonly separatorContainer: HTMLDivElement;
251+
private readonly separator: HTMLDivElement;
250252

251253
readonly element: HTMLElement;
252254
private readonly _onDidClick = this._register(new Emitter<Event | undefined>());
@@ -263,6 +265,13 @@ export class ButtonWithDropdown extends Disposable implements IButton {
263265
this._register(this.button.onDidClick(e => this._onDidClick.fire(e)));
264266
this.action = this._register(new Action('primaryAction', this.button.label, undefined, true, async () => this._onDidClick.fire(undefined)));
265267

268+
this.separatorContainer = document.createElement('div');
269+
this.separatorContainer.classList.add('monaco-button-dropdown-separator');
270+
271+
this.separator = document.createElement('div');
272+
this.separatorContainer.appendChild(this.separator);
273+
this.element.appendChild(this.separatorContainer);
274+
266275
this.dropdownButton = this._register(new Button(this.element, { ...options, title: false, supportIcons: true }));
267276
this.dropdownButton.element.title = localize("button dropdown more actions", 'More Actions...');
268277
this.dropdownButton.element.classList.add('monaco-dropdown-button');
@@ -299,6 +308,10 @@ export class ButtonWithDropdown extends Disposable implements IButton {
299308
style(styles: IButtonStyles): void {
300309
this.button.style(styles);
301310
this.dropdownButton.style(styles);
311+
312+
// Separator
313+
this.separatorContainer.style.backgroundColor = styles.buttonBackground?.toString() ?? '';
314+
this.separator.style.backgroundColor = styles.buttonForeground?.toString() ?? '';
302315
}
303316

304317
focus(): void {

0 commit comments

Comments
 (0)