Skip to content

Commit c72605e

Browse files
amungeramunger
authored
Merge branch 'main' into aamunger/fileBackedIW
2 parents 6556870 + b9048ee commit c72605e

File tree

11 files changed

+36
-25
lines changed

11 files changed

+36
-25
lines changed

‎cli/src/commands/args.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ pub enum TunnelSubcommand {
611611
/// Restarts any running tunnel on the system.
612612
Restart,
613613

614-
/// Gets whether there is a tunnel running on the current machineiou.
614+
/// Gets whether there is a tunnel running on the current machine.
615615
Status,
616616

617617
/// Rename the name of this machine associated with port forwarding service.

‎cli/src/tunnels/dev_tunnels.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,9 +471,17 @@ impl DevTunnels {
471471
continue;
472472
}
473473

474+
if let Some(d) = e.get_details() {
475+
let detail = d.detail.unwrap_or_else(|| "unknown".to_string());
476+
return Err(AnyError::from(TunnelCreationFailed(
477+
name.to_string(),
478+
detail,
479+
)));
480+
}
481+
474482
return Err(AnyError::from(TunnelCreationFailed(
475483
name.to_string(),
476-
"You've exceeded the 10 machine limit for the port fowarding service. Please remove other machines before trying to add this machine.".to_string(),
484+
"You have exceeded a limit for the port fowarding service. Please remove other machines before trying to add this machine.".to_string(),
477485
)));
478486
}
479487
Err(e) => {

‎extensions/esbuild-webview-common.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,8 @@ async function tryBuild(options, didBuild) {
6262
* @param {string[]} args
6363
* @param {(outDir: string) => unknown} [didBuild]
6464
*/
65-
module.exports.run = function (config, args, didBuild) {
65+
module.exports.run = async function (config, args, didBuild) {
6666
let outdir = config.outdir;
67-
6867
const outputRootIndex = args.indexOf('--outputRoot');
6968
if (outputRootIndex >= 0) {
7069
const outputRoot = args[outputRootIndex + 1];
@@ -81,7 +80,7 @@ module.exports.run = function (config, args, didBuild) {
8180

8281
const isWatch = args.indexOf('--watch') >= 0;
8382
if (isWatch) {
84-
tryBuild(resolvedOptions);
83+
await tryBuild(resolvedOptions, didBuild);
8584

8685
const watcher = require('@parcel/watcher');
8786
watcher.subscribe(config.srcDir, () => tryBuild(resolvedOptions, didBuild));

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"@vscode/proxy-agent": "^0.14.1",
7272
"@vscode/ripgrep": "^1.15.4",
7373
"@vscode/spdlog": "^0.13.10",
74-
"@vscode/sqlite3": "5.1.5-vscode",
74+
"@vscode/sqlite3": "5.1.6-vscode",
7575
"@vscode/sudo-prompt": "9.3.1",
7676
"@vscode/vscode-languagedetection": "1.0.21",
7777
"@vscode/windows-mutex": "^0.4.4",

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
8888
private _editorOptions: IEditorOptions;
8989
private readonly _sash: IObservable<DiffEditorSash | undefined>;
9090
private readonly _boundarySashes = observableValue<IBoundarySashes | undefined>('boundarySashes', undefined);
91-
private readonly _renderOverviewRuler: IObservable<boolean>;
91+
private readonly _renderOverviewRuler = derived('renderOverviewRuler', reader => this._options.read(reader).renderOverviewRuler);
92+
private readonly _renderSideBySide = derived('renderSideBySide', reader => this._options.read(reader).renderSideBySide);
9293

9394
private unchangedRangesFeature!: UnchangedRangesFeature;
9495

@@ -124,7 +125,6 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
124125
this._register(applyObservableDecorations(this._originalEditor, this._decorations.map(d => d?.originalDecorations || [])));
125126
this._register(applyObservableDecorations(this._modifiedEditor, this._decorations.map(d => d?.modifiedDecorations || [])));
126127

127-
this._renderOverviewRuler = this._options.map(o => o.renderOverviewRuler);
128128
this._sash = derivedWithStore('sash', (reader, store) => {
129129
const showSash = this._options.read(reader).renderSideBySide;
130130
this.elements.root.classList.toggle('side-by-side', showSash);
@@ -152,7 +152,7 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
152152

153153
this._register(autorunWithStore2('unchangedRangesFeature', (reader, store) => {
154154
this.unchangedRangesFeature = store.add(new (readHotReloadableExport(UnchangedRangesFeature, reader))(
155-
this._originalEditor, this._modifiedEditor, this._diffModel, this._options.map(o => o.renderSideBySide)
155+
this._originalEditor, this._modifiedEditor, this._diffModel, this._renderSideBySide,
156156
));
157157
}));
158158

@@ -161,7 +161,7 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
161161
this._originalEditor,
162162
this._modifiedEditor,
163163
this._diffModel,
164-
this._options.map((o) => o.renderSideBySide),
164+
this._renderSideBySide,
165165
this,
166166
() => this.unchangedRangesFeature.isUpdatingViewZones,
167167
));
@@ -257,7 +257,7 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
257257
modifiedDecorations.push({ range: i.modifiedRange, options: diffAddDecoration });
258258
}
259259

260-
if (!m.lineRangeMapping.modifiedRange.isEmpty) {
260+
if (!m.lineRangeMapping.modifiedRange.isEmpty && this._renderSideBySide.read(reader) && !currentMove) {
261261
modifiedDecorations.push({ range: Range.fromPositions(new Position(m.lineRangeMapping.modifiedRange.startLineNumber, 1)), options: arrowRevertChange });
262262
}
263263
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ export class ViewZoneManager extends Disposable {
262262
}
263263

264264
let marginDomNode: HTMLElement | undefined = undefined;
265-
if (a.diff && a.diff.modifiedRange.isEmpty) {
265+
if (a.diff && a.diff.modifiedRange.isEmpty && this._renderSideBySide.read(reader)) {
266266
marginDomNode = createViewZoneMarginArrow();
267267
}
268268

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { Disposable } from 'vs/base/common/lifecycle';
7-
import { IObservable, autorun, observableFromEvent } from 'vs/base/common/observable';
7+
import { IObservable, autorun, observableFromEvent, observableSignalFromEvent } from 'vs/base/common/observable';
88
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
9+
import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
910
import { DiffModel } from 'vs/editor/browser/widget/diffEditorWidget2/diffModel';
1011
import { EditorLayoutInfo } from 'vs/editor/common/config/editorOptions';
1112
import { LineRange } from 'vs/editor/common/core/lineRange';
@@ -18,8 +19,8 @@ export class MovedBlocksLinesPart extends Disposable {
1819
private readonly _diffModel: IObservable<DiffModel | undefined>,
1920
private readonly _originalEditorLayoutInfo: IObservable<EditorLayoutInfo | null>,
2021
private readonly _modifiedEditorLayoutInfo: IObservable<EditorLayoutInfo | null>,
21-
private readonly _originalEditor: ICodeEditor,
22-
private readonly _modifiedEditor: ICodeEditor,
22+
private readonly _originalEditor: CodeEditorWidget,
23+
private readonly _modifiedEditor: CodeEditorWidget,
2324
) {
2425
super();
2526

@@ -41,9 +42,11 @@ export class MovedBlocksLinesPart extends Disposable {
4142

4243
const originalScrollTop = observableFromEvent(this._originalEditor.onDidScrollChange, () => this._originalEditor.getScrollTop());
4344
const modifiedScrollTop = observableFromEvent(this._modifiedEditor.onDidScrollChange, () => this._modifiedEditor.getScrollTop());
45+
const viewZonesChanged = observableSignalFromEvent('onDidChangeViewZones', this._modifiedEditor.onDidChangeViewZones);
4446

4547
this._register(autorun('update', (reader) => {
4648
element.replaceChildren();
49+
viewZonesChanged.read(reader);
4750

4851
const info = this._originalEditorLayoutInfo.read(reader);
4952
const info2 = this._modifiedEditorLayoutInfo.read(reader);

‎src/vs/platform/quickinput/browser/quickInputList.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,8 +1006,8 @@ export class QuickInputList {
10061006
}
10071007

10081008
toggleHover() {
1009-
const element = this.list.getFocusedElements()[0];
1010-
if (!element.saneTooltip) {
1009+
const element: IListElement | undefined = this.list.getFocusedElements()[0];
1010+
if (!element?.saneTooltip) {
10111011
return;
10121012
}
10131013

‎src/vs/workbench/contrib/chat/browser/media/chat.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@
107107
padding: 4px 6px;
108108
}
109109

110-
.interactive-item-container .value a {
110+
.interactive-item-container .value a,
111+
.interactive-item-container .value a code {
111112
color: var(--vscode-textLink-foreground);
112113
}
113114

‎src/vs/workbench/contrib/preferences/browser/settingsTree.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { BrowserFeatures } from 'vs/base/browser/canIUse';
77
import * as DOM from 'vs/base/browser/dom';
88
import { IMouseEvent } from 'vs/base/browser/mouseEvent';
9-
import { alert as ariaAlert } from 'vs/base/browser/ui/aria/aria';
9+
import * as aria from 'vs/base/browser/ui/aria/aria';
1010
import { Button } from 'vs/base/browser/ui/button/button';
1111
import { Toggle, unthemedToggleStyles } from 'vs/base/browser/ui/toggle/toggle';
1212
import { IInputOptions, InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
@@ -2074,7 +2074,7 @@ function renderValidations(dataElement: SettingsTreeSettingElement, template: IS
20742074
template.validationErrorMessageElement.innerText = errMsg;
20752075
const validationError = localize('validationError', "Validation Error.");
20762076
template.inputBox.inputElement.parentElement!.setAttribute('aria-label', [validationError, errMsg].join(' '));
2077-
if (!calledOnStartup) { ariaAlert(validationError + ' ' + errMsg); }
2077+
if (!calledOnStartup) { aria.status(validationError + ' ' + errMsg); }
20782078
return true;
20792079
} else {
20802080
template.inputBox.inputElement.parentElement!.removeAttribute('aria-label');
@@ -2101,7 +2101,7 @@ function renderArrayValidations(
21012101
template.validationErrorMessageElement.innerText = errMsg;
21022102
const validationError = localize('validationError', "Validation Error.");
21032103
template.containerElement.setAttribute('aria-label', [dataElement.setting.key, validationError, errMsg].join(' '));
2104-
if (!calledOnStartup) { ariaAlert(validationError + ' ' + errMsg); }
2104+
if (!calledOnStartup) { aria.status(validationError + ' ' + errMsg); }
21052105
return true;
21062106
} else {
21072107
template.containerElement.setAttribute('aria-label', dataElement.setting.key);

0 commit comments

Comments
 (0)