status - simplify by not needing element ID

microsoft · May 28, 2019 · 9592467 · 9592467
1 parent a429fd1
commit 9592467
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 15 deletions.
diff --git a/src/vs/platform/statusbar/common/statusbar.ts b/src/vs/platform/statusbar/common/statusbar.ts
@@ -60,11 +60,6 @@ export interface IStatusbarEntry {
 	 * Wether to show a beak above the status bar entry.
 	 */
 	readonly showBeak?: boolean;
-
-	/**
-	 * An identifier to associate with the status bar entry DOM element.
-	 */
-	readonly elementId?: string;
 }
 
 export interface IStatusbarService {

diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -324,13 +324,6 @@ class StatusBarEntryItem extends Disposable {
 
 	private render(entry: IStatusbarEntry): void {
 
-		// Container
-		if (entry.elementId) {
-			this.container.id = entry.elementId;
-		} else if (this.container.id) {
-			delete this.container.id;
-		}
-
 		// Text Container
 		let textContainer: HTMLElement;
 		if (entry.command) {

diff --git a/src/vs/workbench/contrib/tasks/electron-browser/task.contribution.ts b/src/vs/workbench/contrib/tasks/electron-browser/task.contribution.ts
@@ -128,7 +128,6 @@ export class TaskStatusBarContributions extends Disposable implements IWorkbench
 		const problems = this.markerService.getStatistics();
 
 		return {
-			elementId: 'task-statusbar-item',
 			text: this.getProblemsText(problems),
 			tooltip: this.getProblemsTooltip(problems),
 			command: 'workbench.action.tasks.toggleProblems'

diff --git a/src/vs/workbench/contrib/welcome/overlay/browser/welcomeOverlay.ts b/src/vs/workbench/contrib/welcome/overlay/browser/welcomeOverlay.ts
@@ -214,7 +214,7 @@ class WelcomeOverlay extends Disposable {
 	}
 
 	private updateProblemsKey() {
-		const problems = document.getElementById('task-statusbar-item');
+		const problems = document.querySelector('div[id="workbench.parts.statusbar"] .statusbar-item.left .octicon.octicon-warning');
 		const key = this._overlay.querySelector('.key.problems') as HTMLElement;
 		if (problems instanceof HTMLElement) {
 			const target = problems.getBoundingClientRect();

diff --git a/test/smoke/src/areas/statusbar/statusbar.ts b/test/smoke/src/areas/statusbar/statusbar.ts
@@ -48,7 +48,7 @@ export class StatusBar {
 			case StatusBarElement.SYNC_STATUS:
 				return `${this.mainSelector} ${this.leftSelector} .octicon.octicon-sync`;
 			case StatusBarElement.PROBLEMS_STATUS:
-				return `${this.mainSelector} ${this.leftSelector} div[id="task-statusbar-item"]`;
+				return `${this.mainSelector} ${this.leftSelector} .octicon.octicon-error`;
 			case StatusBarElement.SELECTION_STATUS:
 				return `${this.mainSelector} ${this.rightSelector} .editor-status-selection`;
 			case StatusBarElement.INDENTATION_STATUS: