Skip to content

Commit 35d1b2d

Browse files
aiday-maraiday-mar
committed
Merge branch 'main' into aiday/toggleDiffAsSetting
2 parents a015a64 + 1e2f0c3 commit 35d1b2d

File tree

29 files changed

+321
-508
lines changed

29 files changed

+321
-508
lines changed

‎build/filters.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ module.exports.unicodeFilter = [
3232
'**',
3333

3434
'!**/ThirdPartyNotices.txt',
35+
'!**/ThirdPartyNotices.cli.txt',
3536
'!**/LICENSE.{txt,rtf}',
3637
'!LICENSES.chromium.html',
3738
'!**/LICENSE',

‎extensions/shellscript/cgmanifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"git": {
77
"name": "jeff-hykin/better-shell-syntax",
88
"repositoryUrl": "https://github.com/jeff-hykin/better-shell-syntax",
9-
"commitHash": "1bad17d8badf6283125aaa7c31be06ba64146a0f"
9+
"commitHash": "ce62ea59e8e522f8a07d8d8a2d1f992c6c600b91"
1010
}
1111
},
1212
"license": "MIT",
13-
"version": "1.5.4"
13+
"version": "1.6.2"
1414
}
1515
],
1616
"version": 1

‎extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/jeff-hykin/better-shell-syntax/commit/1bad17d8badf6283125aaa7c31be06ba64146a0f",
7+
"version": "https://github.com/jeff-hykin/better-shell-syntax/commit/ce62ea59e8e522f8a07d8d8a2d1f992c6c600b91",
88
"name": "Shell Script",
99
"scopeName": "source.shell",
1010
"patterns": [
@@ -14,7 +14,7 @@
1414
],
1515
"repository": {
1616
"alias_statement": {
17-
"begin": "(alias)[ \\t]*+[ \\t]*+(?:((?<=^|;|&|[ \\t])(?:export|declare|typeset|local|readonly)(?=[ \\t]|;|&|$))[ \\t]*+)?((?<!\\w)[a-zA-Z_0-9-]+(?!\\w))(?:(\\[)((?:(?:(?:\\$)?(?<!\\w)[a-zA-Z_0-9-]+(?!\\w)|@)|\\*))(\\]))?(?:(?:(\\=)|(\\+\\=))|(\\-\\=))",
17+
"begin": "(alias)[ \\t]*+[ \\t]*+(?:((?<=^|;|&|[ \\t])(?:readonly|declare|typeset|export|local)(?=[ \\t]|;|&|$))[ \\t]*+)?((?<!\\w)[a-zA-Z_0-9-]+(?!\\w))(?:(\\[)((?:(?:(?:\\$)?(?<!\\w)[a-zA-Z_0-9-]+(?!\\w)|@)|\\*))(\\]))?(?:(?:(\\=)|(\\+\\=))|(\\-\\=))",
1818
"end": "(?:(?= |\\t|$)|(?:(?:(?:(?:(;)|(&&))|(\\|\\|))|(&))|\\n))",
1919
"beginCaptures": {
2020
"1": {
@@ -119,7 +119,7 @@
119119
"assignment": {
120120
"patterns": [
121121
{
122-
"begin": "[ \\t]*+(?:((?<=^|;|&|[ \\t])(?:export|declare|typeset|local|readonly)(?=[ \\t]|;|&|$))[ \\t]*+)?((?<!\\w)[a-zA-Z_0-9-]+(?!\\w))(?:(\\[)((?:(?:(?:\\$)?(?<!\\w)[a-zA-Z_0-9-]+(?!\\w)|@)|\\*))(\\]))?(?:(?:(\\=)|(\\+\\=))|(\\-\\=))[ \\t]*+(\\()",
122+
"begin": "[ \\t]*+(?:((?<=^|;|&|[ \\t])(?:readonly|declare|typeset|export|local)(?=[ \\t]|;|&|$))[ \\t]*+)?((?<!\\w)[a-zA-Z_0-9-]+(?!\\w))(?:(\\[)((?:(?:(?:\\$)?(?<!\\w)[a-zA-Z_0-9-]+(?!\\w)|@)|\\*))(\\]))?(?:(?:(\\=)|(\\+\\=))|(\\-\\=))[ \\t]*+(\\()",
123123
"end": "\\)",
124124
"beginCaptures": {
125125
"1": {
@@ -166,7 +166,7 @@
166166
]
167167
},
168168
{
169-
"begin": "[ \\t]*+(?:((?<=^|;|&|[ \\t])(?:export|declare|typeset|local|readonly)(?=[ \\t]|;|&|$))[ \\t]*+)?((?<!\\w)[a-zA-Z_0-9-]+(?!\\w))(?:(\\[)((?:(?:(?:\\$)?(?<!\\w)[a-zA-Z_0-9-]+(?!\\w)|@)|\\*))(\\]))?(?:(?:(\\=)|(\\+\\=))|(\\-\\=))",
169+
"begin": "[ \\t]*+(?:((?<=^|;|&|[ \\t])(?:readonly|declare|typeset|export|local)(?=[ \\t]|;|&|$))[ \\t]*+)?((?<!\\w)[a-zA-Z_0-9-]+(?!\\w))(?:(\\[)((?:(?:(?:\\$)?(?<!\\w)[a-zA-Z_0-9-]+(?!\\w)|@)|\\*))(\\]))?(?:(?:(\\=)|(\\+\\=))|(\\-\\=))",
170170
"end": "(?:(?= |\\t|$)|(?:(?:(?:(?:(;)|(&&))|(\\|\\|))|(&))|\\n))",
171171
"beginCaptures": {
172172
"1": {
@@ -221,7 +221,7 @@
221221
]
222222
},
223223
"basic_command_name": {
224-
"match": "(?!(?:!|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|[ \\t]))(?!foreach\\b(?!\\/)|select\\b(?!\\/)|repeat\\b(?!\\/)|until\\b(?!\\/)|while\\b(?!\\/)|case\\b(?!\\/)|done\\b(?!\\/)|elif\\b(?!\\/)|else\\b(?!\\/)|esac\\b(?!\\/)|then\\b(?!\\/)|for\\b(?!\\/)|end\\b(?!\\/)|in\\b(?!\\/)|fi\\b(?!\\/)|do\\b(?!\\/)|if\\b(?!\\/))(?:((?<=^|;|&|[ \\t])(?:export|declare|typeset|local|readonly)(?=[ \\t]|;|&|$))|((?!\"|'|\\\\\\n?$)[^!'\" \\t\\n\\r]+?))(?:(?= |\\t)|(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\))",
224+
"match": "(?!(?:!|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|[ \\t]))(?!foreach\\b(?!\\/)|select\\b(?!\\/)|repeat\\b(?!\\/)|until\\b(?!\\/)|while\\b(?!\\/)|case\\b(?!\\/)|done\\b(?!\\/)|elif\\b(?!\\/)|else\\b(?!\\/)|esac\\b(?!\\/)|then\\b(?!\\/)|for\\b(?!\\/)|end\\b(?!\\/)|in\\b(?!\\/)|fi\\b(?!\\/)|do\\b(?!\\/)|if\\b(?!\\/))(?:((?<=^|;|&|[ \\t])(?:readonly|declare|typeset|export|local)(?=[ \\t]|;|&|$))|((?!\"|'|\\\\\\n?$)[^!'\" \\t\\n\\r]+?))(?:(?= |\\t)|(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\))",
225225
"captures": {
226226
"1": {
227227
"name": "storage.modifier.$1.shell"
@@ -230,11 +230,11 @@
230230
"name": "entity.name.function.call.shell entity.name.command.shell",
231231
"patterns": [
232232
{
233-
"match": "(?<!\\w)(?:return|break)(?!\\w)",
233+
"match": "(?<!\\w)(?:continue|return|break)(?!\\w)",
234234
"name": "keyword.control.$0.shell"
235235
},
236236
{
237-
"match": "(?<!\\w)(?:unfunction|unsetopt|autoload|suspend|bindkey|builtin|getopts|command|declare|unalias|history|unlimit|typeset|source|printf|unhash|disown|ulimit|return|which|alias|break|false|print|shift|times|umask|umask|unset|read|type|exec|eval|wait|echo|dirs|jobs|kill|hash|stat|exit|test|trap|true|let|set|pwd|cd|fg|bg|fc|:|\\.)(?!\\/)(?!\\w)",
237+
"match": "(?<!\\w)(?:unfunction|continue|autoload|unsetopt|bindkey|builtin|getopts|command|declare|unalias|history|unlimit|typeset|suspend|source|printf|unhash|disown|ulimit|return|which|alias|break|false|print|shift|times|umask|umask|unset|read|type|exec|eval|wait|echo|dirs|jobs|kill|hash|stat|exit|test|trap|true|let|set|pwd|cd|fg|bg|fc|:|\\.)(?!\\/)(?!\\w)",
238238
"name": "support.function.builtin.shell"
239239
},
240240
{
@@ -952,7 +952,7 @@
952952
"keyword": {
953953
"patterns": [
954954
{
955-
"match": "(?<=^|;|&| |\\t)(?:then|else|elif|fi|for|in|do|done|select|case|continue|esac|while|until|return)(?= |\\t|;|&|$)",
955+
"match": "(?<=^|;|&| |\\t)(?:continue|foreach|return|select|repeat|break|until|while|case|done|elif|else|esac|then|for|end|do|if|fi|in)(?= |\\t|;|&|$)",
956956
"name": "keyword.control.$0.shell"
957957
}
958958
]
@@ -1342,11 +1342,11 @@
13421342
]
13431343
},
13441344
"modifiers": {
1345-
"match": "(?<=^|;|&|[ \\t])(?:export|declare|typeset|local|readonly)(?=[ \\t]|;|&|$)",
1345+
"match": "(?<=^|;|&|[ \\t])(?:readonly|declare|typeset|export|local)(?=[ \\t]|;|&|$)",
13461346
"name": "storage.modifier.$0.shell"
13471347
},
13481348
"normal_statement": {
1349-
"begin": "(?!^[ \\t]*+$)(?:(?<=^if | if |\\tif |^elif | elif |\\telif |^then | then |\\tthen |^else | else |\\telse |^while | while |\\twhile |^do | do |\\tdo )|(?<=(?:^|;|\\||&|!|\\(|\\{|\\`)))[ \\t]*+(?!nocorrect\\W|nocorrect\\$|function\\W|function\\$|foreach\\W|foreach\\$|repeat\\W|repeat\\$|logout\\W|logout\\$|coproc\\W|coproc\\$|select\\W|select\\$|while\\W|while\\$|pushd\\W|pushd\\$|until\\W|until\\$|case\\W|case\\$|done\\W|done\\$|elif\\W|elif\\$|else\\W|else\\$|esac\\W|esac\\$|popd\\W|popd\\$|then\\W|then\\$|time\\W|time\\$|for\\W|for\\$|end\\W|end\\$|fi\\W|fi\\$|do\\W|do\\$|in\\W|in\\$|if\\W|if\\$)",
1349+
"begin": "(?!^[ \\t]*+$)(?:(?<=^until | until |\\tuntil |^while | while |\\twhile |^elif | elif |\\telif |^else | else |\\telse |^then | then |\\tthen |^do | do |\\tdo |^if | if |\\tif )|(?<=(?:^|;|\\||&|!|\\(|\\{|\\`)))[ \\t]*+(?!nocorrect\\W|nocorrect\\$|function\\W|function\\$|foreach\\W|foreach\\$|repeat\\W|repeat\\$|logout\\W|logout\\$|coproc\\W|coproc\\$|select\\W|select\\$|while\\W|while\\$|pushd\\W|pushd\\$|until\\W|until\\$|case\\W|case\\$|done\\W|done\\$|elif\\W|elif\\$|else\\W|else\\$|esac\\W|esac\\$|popd\\W|popd\\$|then\\W|then\\$|time\\W|time\\$|for\\W|for\\$|end\\W|end\\$|fi\\W|fi\\$|do\\W|do\\$|in\\W|in\\$|if\\W|if\\$)",
13501350
"end": "(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\)",
13511351
"beginCaptures": {},
13521352
"endCaptures": {},
@@ -1376,11 +1376,11 @@
13761376
"include": "#modifiers"
13771377
},
13781378
{
1379-
"match": "(?<!\\w)(?:return|break)(?!\\w)",
1379+
"match": "(?<!\\w)(?:continue|return|break)(?!\\w)",
13801380
"name": "entity.name.function.call.shell entity.name.command.shell keyword.control.$0.shell"
13811381
},
13821382
{
1383-
"match": "(?<!\\w)(?:unfunction|unsetopt|autoload|suspend|bindkey|builtin|getopts|command|declare|unalias|history|unlimit|typeset|source|printf|unhash|disown|ulimit|return|which|alias|break|false|print|shift|times|umask|umask|unset|read|type|exec|eval|wait|echo|dirs|jobs|kill|hash|stat|exit|test|trap|true|let|set|pwd|cd|fg|bg|fc|:|\\.)(?!\\/)(?!\\w)",
1383+
"match": "(?<!\\w)(?:unfunction|continue|autoload|unsetopt|bindkey|builtin|getopts|command|declare|unalias|history|unlimit|typeset|suspend|source|printf|unhash|disown|ulimit|return|which|alias|break|false|print|shift|times|umask|umask|unset|read|type|exec|eval|wait|echo|dirs|jobs|kill|hash|stat|exit|test|trap|true|let|set|pwd|cd|fg|bg|fc|:|\\.)(?!\\/)(?!\\w)",
13841384
"name": "entity.name.function.call.shell entity.name.command.shell support.function.builtin.shell"
13851385
},
13861386
{

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "code-oss-dev",
33
"version": "1.81.0",
4-
"distro": "bed7b201bc6ebbfc63268cb4c390d788a86b0192",
4+
"distro": "97db68abc58fce4ef0a70cdaa6255836e6a8d085",
55
"author": {
66
"name": "Microsoft Corporation"
77
},
@@ -231,4 +231,4 @@
231231
"optionalDependencies": {
232232
"windows-foreground-love": "0.5.0"
233233
}
234-
}
234+
}

‎src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,16 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
136136
this._register(autorunWithStore2('DiffEditorDecorations', (reader, store) => {
137137
store.add(new (readHotReloadableExport(DiffEditorDecorations, reader))(this._editors, this._diffModel, this._options));
138138
}));
139-
140-
this._register(this._instantiationService.createInstance(
141-
ViewZoneManager,
142-
this._editors,
143-
this._diffModel,
144-
this._options,
145-
this,
146-
() => this.unchangedRangesFeature.isUpdatingViewZones,
147-
));
139+
this._register(autorunWithStore2('ViewZoneManager', (reader, store) => {
140+
store.add(this._instantiationService.createInstance(
141+
readHotReloadableExport(ViewZoneManager, reader),
142+
this._editors,
143+
this._diffModel,
144+
this._options,
145+
this,
146+
() => this.unchangedRangesFeature.isUpdatingViewZones,
147+
));
148+
}));
148149

149150
this._register(autorunWithStore2('OverviewRulerPart', (reader, store) => {
150151
store.add(this._instantiationService.createInstance(readHotReloadableExport(OverviewRulerPart, reader), this._editors,

‎src/vs/editor/browser/widget/diffEditorWidget2/lineAlignment.ts‎

Lines changed: 58 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { $ } from 'vs/base/browser/dom';
77
import { ArrayQueue } from 'vs/base/common/arrays';
88
import { RunOnceScheduler } from 'vs/base/common/async';
99
import { Codicon } from 'vs/base/common/codicons';
10-
import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
10+
import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
1111
import { IObservable, derived, observableFromEvent, observableValue } from 'vs/base/common/observable';
1212
import { autorun, autorunWithStore2 } from 'vs/base/common/observableImpl/autorun';
1313
import { ThemeIcon } from 'vs/base/common/themables';
@@ -340,6 +340,17 @@ export class ViewZoneManager extends Disposable {
340340
scrollState.restore(this._editors.modified);
341341
}));
342342

343+
this._register(toDisposable(() => {
344+
this._editors.original.changeViewZones((a) => {
345+
for (const id of alignmentViewZoneIdsOrig) { a.removeZone(id); }
346+
alignmentViewZoneIdsOrig.clear();
347+
});
348+
this._editors.modified.changeViewZones((a) => {
349+
for (const id of alignmentViewZoneIdsMod) { a.removeZone(id); }
350+
alignmentViewZoneIdsMod.clear();
351+
});
352+
}));
353+
343354
let ignoreChange = false;
344355
this._register(this._editors.original.onDidScrollChange(e => {
345356
if (e.scrollLeftChanged && !ignoreChange) {
@@ -504,20 +515,52 @@ function computeRangeAlignment(
504515
const c = m.lineRangeMapping;
505516
handleAlignmentsOutsideOfDiffs(c.originalRange.startLineNumber, c.modifiedRange.startLineNumber);
506517

507-
const originalAdditionalHeight = originalLineHeightOverrides
508-
.takeWhile(v => v.lineNumber < c.originalRange.endLineNumberExclusive)
509-
?.reduce((p, c) => p + c.heightInPx, 0) ?? 0;
510-
const modifiedAdditionalHeight = modifiedLineHeightOverrides
511-
.takeWhile(v => v.lineNumber < c.modifiedRange.endLineNumberExclusive)
512-
?.reduce((p, c) => p + c.heightInPx, 0) ?? 0;
513-
514-
result.push({
515-
originalRange: c.originalRange,
516-
modifiedRange: c.modifiedRange,
517-
originalHeightInPx: c.originalRange.length * origLineHeight + originalAdditionalHeight,
518-
modifiedHeightInPx: c.modifiedRange.length * modLineHeight + modifiedAdditionalHeight,
519-
diff: m.lineRangeMapping,
520-
});
518+
let first = true;
519+
let lastModLineNumber = c.modifiedRange.startLineNumber;
520+
let lastOrigLineNumber = c.originalRange.startLineNumber;
521+
522+
function emitAlignment(origLineNumberExclusive: number, modLineNumberExclusive: number) {
523+
if (origLineNumberExclusive < lastOrigLineNumber || modLineNumberExclusive < lastModLineNumber) {
524+
return;
525+
}
526+
if (first) {
527+
first = false;
528+
} else if (origLineNumberExclusive === lastOrigLineNumber || modLineNumberExclusive === lastModLineNumber) {
529+
return;
530+
}
531+
const originalRange = new LineRange(lastOrigLineNumber, origLineNumberExclusive);
532+
const modifiedRange = new LineRange(lastModLineNumber, modLineNumberExclusive);
533+
if (originalRange.isEmpty && modifiedRange.isEmpty) {
534+
return;
535+
}
536+
537+
const originalAdditionalHeight = originalLineHeightOverrides
538+
.takeWhile(v => v.lineNumber < origLineNumberExclusive)
539+
?.reduce((p, c) => p + c.heightInPx, 0) ?? 0;
540+
const modifiedAdditionalHeight = modifiedLineHeightOverrides
541+
.takeWhile(v => v.lineNumber < modLineNumberExclusive)
542+
?.reduce((p, c) => p + c.heightInPx, 0) ?? 0;
543+
544+
result.push({
545+
originalRange,
546+
modifiedRange,
547+
originalHeightInPx: originalRange.length * origLineHeight + originalAdditionalHeight,
548+
modifiedHeightInPx: modifiedRange.length * modLineHeight + modifiedAdditionalHeight,
549+
});
550+
551+
lastOrigLineNumber = origLineNumberExclusive;
552+
lastModLineNumber = modLineNumberExclusive;
553+
}
554+
555+
for (const i of c.innerChanges || []) {
556+
if (i.originalRange.startColumn > 1 && i.modifiedRange.startColumn > 1) {
557+
// There is some unmodified text on this line
558+
emitAlignment(i.originalRange.startLineNumber, i.modifiedRange.startLineNumber);
559+
}
560+
emitAlignment(i.originalRange.endLineNumber, i.modifiedRange.endLineNumber);
561+
}
562+
563+
emitAlignment(c.originalRange.endLineNumberExclusive, c.modifiedRange.endLineNumberExclusive);
521564

522565
lastOriginalLineNumber = c.originalRange.endLineNumberExclusive;
523566
lastModifiedLineNumber = c.modifiedRange.endLineNumberExclusive;

‎src/vs/editor/contrib/colorPicker/browser/colorPicker.css‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,19 @@
4848
cursor: pointer;
4949
color: white;
5050
flex: 1;
51+
white-space: nowrap;
52+
overflow: hidden;
53+
}
54+
55+
.colorpicker-header .picked-color .picked-color-presentation {
56+
white-space: nowrap;
57+
margin-left: 5px;
58+
margin-right: 5px;
5159
}
5260

5361
.colorpicker-header .picked-color .codicon {
5462
color: inherit;
5563
font-size: 14px;
56-
position: absolute;
57-
left: 8px;
5864
}
5965

6066
.colorpicker-header .picked-color.light {

‎src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export class ColorPickerHeader extends Disposable {
2626

2727
private readonly _domNode: HTMLElement;
2828
private readonly _pickedColorNode: HTMLElement;
29+
private readonly _pickedColorPresentation: HTMLElement;
2930
private readonly _originalColorNode: HTMLElement;
3031
private readonly _closeButton: CloseButton | null = null;
3132
private backgroundColor: Color;
@@ -37,6 +38,9 @@ export class ColorPickerHeader extends Disposable {
3738
dom.append(container, this._domNode);
3839

3940
this._pickedColorNode = dom.append(this._domNode, $('.picked-color'));
41+
dom.append(this._pickedColorNode, $('span.codicon.codicon-color-mode'));
42+
this._pickedColorPresentation = dom.append(this._pickedColorNode, document.createElement('span'));
43+
this._pickedColorPresentation.classList.add('picked-color-presentation');
4044

4145
const tooltip = localize('clickToToggleColorOptions', "Click to toggle color options (rgb/hsl/hex)");
4246
this._pickedColorNode.setAttribute('title', tooltip);
@@ -91,8 +95,7 @@ export class ColorPickerHeader extends Disposable {
9195
}
9296

9397
private onDidChangePresentation(): void {
94-
this._pickedColorNode.textContent = this.model.presentation ? this.model.presentation.label : '';
95-
this._pickedColorNode.prepend($('.codicon.codicon-color-mode'));
98+
this._pickedColorPresentation.textContent = this.model.presentation ? this.model.presentation.label : '';
9699
}
97100
}
98101

‎src/vs/workbench/contrib/comments/browser/media/review.css‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,12 @@
349349
outline-width: 1px;
350350
}
351351

352+
.review-widget .body .comment-form .monaco-editor,
353+
.review-widget .body .comment-form .monaco-editor .monaco-editor-background,
354+
.review-widget .body .edit-container .monaco-editor .monaco-editor-background {
355+
background-color: var(--vscode-peekViewTitle-background);
356+
}
357+
352358
.review-widget .body .comment-form .monaco-editor,
353359
.review-widget .body .edit-container .monaco-editor {
354360
width: 100%;

‎src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1442,24 +1442,6 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
14421442
}
14431443
});
14441444

1445-
this.registerExtensionAction({
1446-
id: 'workbench.extensions.action.toggleApplyToAllProfiles',
1447-
title: { value: localize('workbench.extensions.action.toggleApplyToAllProfiles', "Apply this Extension to all Profiles"), original: `Apply this Extension to all Profiles` },
1448-
toggled: ContextKeyExpr.has('isApplicationScopedExtension'),
1449-
menu: {
1450-
id: MenuId.ExtensionContext,
1451-
group: '2_configure',
1452-
when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'installed'), ContextKeyExpr.has('isDefaultApplicationScopedExtension').negate()),
1453-
order: 4
1454-
},
1455-
run: async (accessor: ServicesAccessor, id: string) => {
1456-
const extension = this.extensionsWorkbenchService.local.find(e => areSameExtensions({ id }, e.identifier));
1457-
if (extension) {
1458-
return this.extensionsWorkbenchService.toggleApplyExtensionToAllProfiles(extension);
1459-
}
1460-
}
1461-
});
1462-
14631445
this.registerExtensionAction({
14641446
id: 'workbench.extensions.action.ignoreRecommendation',
14651447
title: { value: localize('workbench.extensions.action.ignoreRecommendation', "Ignore Recommendation"), original: `Ignore Recommendation` },

0 commit comments

Comments
 (0)