Skip to content

Commit c8e422b

Browse files
committed
Improves multi file diff editor label
1 parent 85950ef commit c8e422b

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,14 @@ export class MultiDiffEditorInput extends EditorInput implements ILanguageSuppor
9595
/** @description Updates name */
9696
const resources = this._resources.read(reader);
9797
const label = this.label ?? localize('name', "Multi Diff Editor");
98-
this._name = label + localize({
99-
key: 'files',
100-
comment: ['the number of files being shown']
101-
}, " ({0} files)", resources?.length ?? 0);
98+
if (resources) {
99+
this._name = label + localize({
100+
key: 'files',
101+
comment: ['the number of files being shown']
102+
}, " ({0} files)", resources.length);
103+
} else {
104+
this._name = label;
105+
}
102106
this._onDidChangeLabel.fire();
103107
}));
104108
}
@@ -233,8 +237,8 @@ export class MultiDiffEditorInput extends EditorInput implements ILanguageSuppor
233237
return false;
234238
}
235239

236-
private readonly _resources = derived(this, reader => this._resolvedSource.cachedPromiseResult.read(reader)?.data?.resources.read(reader) ?? []);
237-
private readonly _isDirtyObservables = mapObservableArrayCached(this, this._resources, res => {
240+
private readonly _resources = derived(this, reader => this._resolvedSource.cachedPromiseResult.read(reader)?.data?.resources.read(reader));
241+
private readonly _isDirtyObservables = mapObservableArrayCached(this, this._resources.map(r => r ?? []), res => {
238242
const isModifiedDirty = res.modified ? isUriDirty(this._textFileService, res.modified) : constObservable(false);
239243
const isOriginalDirty = res.original ? isUriDirty(this._textFileService, res.original) : constObservable(false);
240244
return derived(reader => /** @description modifiedDirty||originalDirty */ isModifiedDirty.read(reader) || isOriginalDirty.read(reader));

0 commit comments

Comments
 (0)