Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-06 14:34:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Show Location ranges in used refs file label (#196129)" (#196293)

Browse Source 
This reverts commit ceeec96501.
This commit is contained in:
Rob Lourens
2023-10-23 09:50:37 -07:00
committed by GitHub
parent 2683aa01ac
commit 79c4cbce46
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/browser/labels.ts
+3 -8
View File
@@ -22,12 +22,10 @@ import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
import { Disposable, dispose, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { normalizeDriveLetter } from 'vs/base/common/labels';
import { IRange } from 'vs/editor/common/core/range';
export interface IResourceLabelProps {
resource?: URI | { primary?: URI; secondary?: URI };
name?: string | string[];
range?: IRange;
description?: string;
}
@@ -64,7 +62,6 @@ export interface IResourceLabelOptions extends IIconLabelValueOptions {
export interface IFileLabelOptions extends IResourceLabelOptions {
hideLabel?: boolean;
hidePath?: boolean;
range?: IRange;
}
export interface IResourceLabel extends IDisposable {
@@ -416,7 +413,7 @@ class ResourceLabelWidget extends IconLabel {
description = this.labelService.getUriLabel(dirname(resource), { relative: true });
}
this.setResource({ resource, name, description, range: options?.range }, options);
this.setResource({ resource, name, description }, options);
}
setResource(label: IResourceLabelProps, options: IResourceLabelOptions = Object.create(null)): void {
@@ -549,6 +546,7 @@ class ResourceLabelWidget extends IconLabel {
};
const resource = toResource(this.label);
const label = this.label.name;
if (this.options?.title !== undefined) {
iconLabelOptions.title = this.options.title;
@@ -614,10 +612,7 @@ class ResourceLabelWidget extends IconLabel {
}
}
const rangePart = this.label.range ? `:${this.label.range.startLineNumber}-${this.label.range.endLineNumber}` : '';
const label = this.label.name ?
this.label.name + rangePart : '';
this.setLabel(label, this.label.description, iconLabelOptions);
this.setLabel(label || '', this.label.description, iconLabelOptions);
this._onDidRender.fire();
src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+1 -3
View File
@@ -1143,12 +1143,10 @@ class ContentReferencesListRenderer implements IListRenderer<IChatContentReferen
renderElement(element: IChatContentReference, index: number, templateData: IChatContentReferenceListTemplate, height: number | undefined): void {
templateData.label.element.style.display = 'flex';
const uri = 'uri' in element.reference ? element.reference.uri : element.reference;
templateData.label.setFile(uri, {
templateData.label.setFile('uri' in element.reference ? element.reference.uri : element.reference, {
fileKind: FileKind.FILE,
// Should not have this live-updating data on a historical reference
fileDecorations: { badges: false, colors: false },
range: 'range' in element.reference ? element.reference.range : undefined
});
}