Problems - fix the source column so that it displays the source inste…

…ad of the owner
microsoft · Feb 11, 2025 · 5232f0e · 5232f0e
1 parent 1fa9d37
commit 5232f0e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/src/vs/workbench/contrib/markers/browser/markersModel.ts b/src/vs/workbench/contrib/markers/browser/markersModel.ts
@@ -124,8 +124,7 @@ export class MarkerTableItem extends Marker {
 		readonly sourceMatches?: IMatch[],
 		readonly codeMatches?: IMatch[],
 		readonly messageMatches?: IMatch[],
-		readonly fileMatches?: IMatch[],
-		readonly ownerMatches?: IMatch[],
+		readonly fileMatches?: IMatch[]
 	) {
 		super(marker.id, marker.marker, marker.relatedInformation);
 	}

diff --git a/src/vs/workbench/contrib/markers/browser/markersTable.ts b/src/vs/workbench/contrib/markers/browser/markersTable.ts
@@ -230,21 +230,21 @@ class MarkerFileColumnRenderer implements ITableRenderer<MarkerTableItem, IMarke
 	}
 }
 
-class MarkerOwnerColumnRenderer implements ITableRenderer<MarkerTableItem, IMarkerHighlightedLabelColumnTemplateData> {
+class MarkerSourceColumnRenderer implements ITableRenderer<MarkerTableItem, IMarkerHighlightedLabelColumnTemplateData> {
 
-	static readonly TEMPLATE_ID = 'owner';
+	static readonly TEMPLATE_ID = 'source';
 
-	readonly templateId: string = MarkerOwnerColumnRenderer.TEMPLATE_ID;
+	readonly templateId: string = MarkerSourceColumnRenderer.TEMPLATE_ID;
 
 	renderTemplate(container: HTMLElement): IMarkerHighlightedLabelColumnTemplateData {
-		const columnElement = DOM.append(container, $('.owner'));
+		const columnElement = DOM.append(container, $('.source'));
 		const highlightedLabel = new HighlightedLabel(columnElement);
 		return { columnElement, highlightedLabel };
 	}
 
 	renderElement(element: MarkerTableItem, index: number, templateData: IMarkerHighlightedLabelColumnTemplateData, height: number | undefined): void {
-		templateData.columnElement.title = element.marker.owner;
-		templateData.highlightedLabel.set(element.marker.owner, element.ownerMatches);
+		templateData.columnElement.title = element.marker.source ?? '';
+		templateData.highlightedLabel.set(element.marker.source ?? '', element.sourceMatches);
 	}
 
 	disposeTemplate(templateData: IMarkerHighlightedLabelColumnTemplateData): void {
@@ -321,7 +321,7 @@ export class MarkersTable extends Disposable implements IProblemsWidget {
 					weight: 1,
 					minimumWidth: 100,
 					maximumWidth: 300,
-					templateId: MarkerOwnerColumnRenderer.TEMPLATE_ID,
+					templateId: MarkerSourceColumnRenderer.TEMPLATE_ID,
 					project(row: Marker): Marker { return row; }
 				}
 			],
@@ -330,7 +330,7 @@ export class MarkersTable extends Disposable implements IProblemsWidget {
 				this.instantiationService.createInstance(MarkerCodeColumnRenderer),
 				this.instantiationService.createInstance(MarkerMessageColumnRenderer),
 				this.instantiationService.createInstance(MarkerFileColumnRenderer),
-				this.instantiationService.createInstance(MarkerOwnerColumnRenderer),
+				this.instantiationService.createInstance(MarkerSourceColumnRenderer),
 			],
 			options
 		) as WorkbenchTable<MarkerTableItem>;
@@ -454,11 +454,10 @@ export class MarkersTable extends Disposable implements IProblemsWidget {
 					const codeMatches = marker.marker.code ? FilterOptions._filter(this.filterOptions.textFilter.text, typeof marker.marker.code === 'string' ? marker.marker.code : marker.marker.code.value) ?? undefined : undefined;
 					const messageMatches = FilterOptions._messageFilter(this.filterOptions.textFilter.text, marker.marker.message) ?? undefined;
 					const fileMatches = FilterOptions._messageFilter(this.filterOptions.textFilter.text, this.labelService.getUriLabel(marker.resource, { relative: true })) ?? undefined;
-					const ownerMatches = FilterOptions._messageFilter(this.filterOptions.textFilter.text, marker.marker.owner) ?? undefined;
 
-					const matched = sourceMatches || codeMatches || messageMatches || fileMatches || ownerMatches;
+					const matched = sourceMatches || codeMatches || messageMatches || fileMatches;
 					if ((matched && !this.filterOptions.textFilter.negate) || (!matched && this.filterOptions.textFilter.negate)) {
-						items.push(new MarkerTableItem(marker, sourceMatches, codeMatches, messageMatches, fileMatches, ownerMatches));
+						items.push(new MarkerTableItem(marker, sourceMatches, codeMatches, messageMatches, fileMatches));
 					}
 
 					continue;

diff --git a/src/vs/workbench/contrib/markers/browser/media/markers.css b/src/vs/workbench/contrib/markers/browser/media/markers.css
@@ -182,7 +182,7 @@
 .markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr > .monaco-table-td > .code,
 .markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr > .monaco-table-td > .message,
 .markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr > .monaco-table-td > .file,
-.markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr > .monaco-table-td > .owner {
+.markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr > .monaco-table-td > .source {
 	overflow: hidden;
 	text-overflow: ellipsis;
 }