Skip to content

editors - include preferred name and description in tooltip if available (fix #198204) #198441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bpasero merged 1 commit into from
Nov 16, 2023
Merged

editors - include preferred name and description in tooltip if available (fix #198204) #198441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/vs/workbench/common/editor/diffEditorInput.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,16 @@ export class DiffEditorInput extends SideBySideEditorInput implements IDiffEdito
}

// Title
const shortTitle = this.computeLabel(this.original.getTitle(Verbosity.SHORT) ?? this.original.getName(), this.modified.getTitle(Verbosity.SHORT) ?? this.modified.getName(), ' ↔ ');
const mediumTitle = this.computeLabel(this.original.getTitle(Verbosity.MEDIUM) ?? this.original.getName(), this.modified.getTitle(Verbosity.MEDIUM) ?? this.modified.getName(), ' ↔ ');
const longTitle = this.computeLabel(this.original.getTitle(Verbosity.LONG) ?? this.original.getName(), this.modified.getTitle(Verbosity.LONG) ?? this.modified.getName(), ' ↔ ');
let shortTitle = this.computeLabel(this.original.getTitle(Verbosity.SHORT) ?? this.original.getName(), this.modified.getTitle(Verbosity.SHORT) ?? this.modified.getName(), ' ↔ ');
let mediumTitle = this.computeLabel(this.original.getTitle(Verbosity.MEDIUM) ?? this.original.getName(), this.modified.getTitle(Verbosity.MEDIUM) ?? this.modified.getName(), ' ↔ ');
let longTitle = this.computeLabel(this.original.getTitle(Verbosity.LONG) ?? this.original.getName(), this.modified.getTitle(Verbosity.LONG) ?? this.modified.getName(), ' ↔ ');

const preferredTitle = this.getPreferredTitle();
if (preferredTitle) {
shortTitle = `${preferredTitle} (${shortTitle})`;
mediumTitle = `${preferredTitle} (${mediumTitle})`;
longTitle = `${preferredTitle} (${longTitle})`;
}

return { name, shortDescription, mediumDescription, longDescription, forceDescription, shortTitle, mediumTitle, longTitle };
}
Expand Down
24 changes: 22 additions & 2 deletions src/vs/workbench/common/editor/sideBySideEditorInput.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,31 @@ export class SideBySideEditorInput extends EditorInput implements ISideBySideEdi
}

override getTitle(verbosity?: Verbosity): string {
let title: string;
if (this.hasIdenticalSides) {
return this.primary.getTitle(verbosity) ?? this.getName();
title = this.primary.getTitle(verbosity) ?? this.getName();
} else {
title = super.getTitle(verbosity);
}

return super.getTitle(verbosity);
const preferredTitle = this.getPreferredTitle();
if (preferredTitle) {
title = `${preferredTitle} (${title})`;
}

return title;
}

protected getPreferredTitle(): string | undefined {
if (this.preferredName && this.preferredDescription) {
return `${this.preferredName} ${this.preferredDescription}`;
}

if (this.preferredName || this.preferredDescription) {
return this.preferredName ?? this.preferredDescription;
}

return undefined;
}

override getLabelExtraClasses(): string[] {
Expand Down
23 changes: 23 additions & 0 deletions src/vs/workbench/contrib/files/browser/editors/fileEditorInput.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,29 @@ export class FileEditorInput extends AbstractTextResourceEditorInput implements
return this.preferredDescription;
}

override getTitle(verbosity?: Verbosity): string {
let title = super.getTitle(verbosity);

const preferredTitle = this.getPreferredTitle();
if (preferredTitle) {
title = `${preferredTitle} (${title})`;
}

return title;
}

protected getPreferredTitle(): string | undefined {
if (this.preferredName && this.preferredDescription) {
return `${this.preferredName} ${this.preferredDescription}`;
}

if (this.preferredName || this.preferredDescription) {
return this.preferredName ?? this.preferredDescription;
}

return undefined;
}

getEncoding(): string | undefined {
if (this.model) {
return this.model.getEncoding();
Expand Down