#6679 re-arrange soruce and line columns

microsoft · Jun 9, 2016 · b9cedff · b9cedff
1 parent bac2689
commit b9cedff
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 16 deletions.
diff --git a/src/vs/workbench/parts/markers/browser/markersTreeViewer.ts b/src/vs/workbench/parts/markers/browser/markersTreeViewer.ts
@@ -27,9 +27,9 @@ interface IResourceTemplateData {
 
 interface IMarkerTemplateData {
 	icon: HTMLElement;
+	source: HighlightedLabel;
 	description: HighlightedLabel;
 	lnCol: HTMLElement;
-	source: HighlightedLabel;
 }
 
 export class DataSource implements IDataSource {
@@ -116,9 +116,9 @@ export class Renderer implements IRenderer {
 	private renderMarkerTemplate(container: HTMLElement): IMarkerTemplateData {
 		var data: IMarkerTemplateData = Object.create(null);
 		data.icon = dom.append(container, dom.emmet('.marker-icon'));
+		data.source = new HighlightedLabel(dom.append(container, dom.emmet('')));
 		data.description = new HighlightedLabel(dom.append(container, dom.emmet('.marker-description')));
 		data.lnCol = dom.append(container, dom.emmet('span.marker-line'));
-		data.source = new HighlightedLabel(dom.append(container, dom.emmet('.marker-source')));
 		return data;
 	}
 
@@ -142,17 +142,19 @@ export class Renderer implements IRenderer {
 		templateData.icon.className = 'icon ' + Renderer.iconClassNameFor(marker);
 		templateData.description.set(marker.message, element.labelMatches);
 
-		templateData.lnCol.textContent= Messages.MARKERS_PANEL_AT_LINE_COL_NUMBER(marker.startLineNumber, marker.startColumn);
-		let title= Messages.MARKERS_PANEL_TITLE_AT_LINE_COL_NUMBER(marker.startLineNumber, marker.startColumn);
-		templateData.lnCol.title= title;
-		templateData.lnCol.setAttribute('aria-label', title);
-
+		dom.toggleClass(templateData.source.element, 'marker-source', !!marker.source);
+		templateData.source.set(marker.source, element.sourceMatches);
 		if (marker.source) {
-			templateData.source.set(marker.source, element.sourceMatches);
 			let title= Messages.MARKERS_PANEL_TITLE_SOURCE(marker.source);
 			templateData.source.element.title= title;
 			templateData.source.element.setAttribute('aria-label', title);
 		}
+
+		templateData.lnCol.textContent= Messages.MARKERS_PANEL_AT_LINE_COL_NUMBER(marker.startLineNumber, marker.startColumn);
+		let title= Messages.MARKERS_PANEL_TITLE_AT_LINE_COL_NUMBER(marker.startLineNumber, marker.startColumn);
+		templateData.lnCol.title= title;
+		templateData.lnCol.setAttribute('aria-label', title);
+
 	}
 
 	private static iconClassNameFor(element: IMarker): string {

diff --git a/src/vs/workbench/parts/markers/browser/media/markers.css b/src/vs/workbench/parts/markers/browser/media/markers.css
@@ -58,25 +58,37 @@
 }
 
 .markers-panel .markers-panel-container .tree-container .markers-panel-tree-entry .marker-description {
-	width: 90%;
+	margin-right: 5px;
 }
 
-.markers-panel .markers-panel-container .tree-container .markers-panel-tree-entry .marker-line,
 .markers-panel .markers-panel-container .tree-container .markers-panel-tree-entry .marker-source {
+	color: #bcbcbc;
+	margin-right: 5px;
+}
+
+.vs-dark .markers-panel .markers-panel-container .tree-container .markers-panel-tree-entry .marker-source {
+	color: #888;
+}
+
+.markers-panel .markers-panel-container .tree-container .markers-panel-tree-entry .marker-source:before {
+	content: '[';
+}
+
+.markers-panel .markers-panel-container .tree-container .markers-panel-tree-entry .marker-source:after {
+	content: ']';
+}
+
+.markers-panel .markers-panel-container .tree-container .markers-panel-tree-entry .marker-line {
 	opacity: 0.6;
 	font-size: 85%;
-	margin-right: 5px;
-	width: 10em;
-	overflow: hidden;
-	text-overflow: ellipsis
 }
 
 .markers-panel .markers-panel-container .tree-container .markers-panel-tree-entry .highlight {
 	color: #007ACC;
 	font-weight: bold;
 }
 
-.hc-black .markers-panel .markers-panel-container .tree-container .markers-panel-tree-entry .highlight {
+.vs-dark .markers-panel .markers-panel-container .tree-container .markers-panel-tree-entry .highlight {
 	color: #0097FB;
 }
 

diff --git a/src/vs/workbench/parts/markers/common/messages.ts b/src/vs/workbench/parts/markers/common/messages.ts
@@ -31,7 +31,7 @@ export default class Messages {
 	public static MARKERS_PANEL_SINGLE_UNKNOWN_LABEL:string= nls.localize('markers.panel.single.unknown.label', "1 Unknown");
 	public static MARKERS_PANEL_MULTIPLE_UNKNOWNS_LABEL=(noOfUnknowns: number):string=>{return nls.localize('markers.panel.multiple.unknowns.label', "{0} Unknowns", ''+noOfUnknowns);};
 
-	public static MARKERS_PANEL_AT_LINE_COL_NUMBER= (ln: number, col: number):string=>{return nls.localize('markers.panel.at.ln.col.number', "Ln {0}, Col {1}", '' + ln, '' + col);}
+	public static MARKERS_PANEL_AT_LINE_COL_NUMBER= (ln: number, col: number):string=>{return nls.localize('markers.panel.at.ln.col.number', "({0}, {1})", '' + ln, '' + col);}
 	public static MARKERS_PANEL_TITLE_AT_LINE_COL_NUMBER= (ln: number, col: number):string=>{return nls.localize('markers.panel.title.at.ln.col.number', "At line {0}, column {1}", '' + ln, '' + col);}
 	public static MARKERS_PANEL_TITLE_SOURCE= (source: string):string=>{return nls.localize('markers.panel.title.source', "Built by {0}", source);}
 }