titleControl: update labels once new formater gets registered

isidorn · isidorn · commit ff6ef95b2ba4 · 2019-04-16T16:35:07.000+02:00
diff --git a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
@@ -145,8 +145,13 @@ export class NoTabsTitleControl extends TitleControl {
 		this.redraw();
 	}
 
-	updateEditorLabel(editor: IEditorInput): void {
-		this.ifEditorIsActive(editor, () => this.redraw());
+	updateEditorLabel(editor?: IEditorInput): void {
+		if (!editor) {
+			editor = withNullAsUndefined(this.group.activeEditor);
+		}
+		if (editor) {
+			this.ifEditorIsActive(editor, () => this.redraw());
+		}
 	}
 
 	updateEditorDirty(editor: IEditorInput): void {
diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
@@ -41,6 +41,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { BreadcrumbsControl } from 'vs/workbench/browser/parts/editor/breadcrumbsControl';
 import { IFileService } from 'vs/platform/files/common/files';
 import { withNullAsUndefined } from 'vs/base/common/types';
+import { ILabelService } from 'vs/platform/label/common/label';
 
 interface IEditorInputLabel {
 	name: string;
@@ -83,8 +84,9 @@ export class TabsTitleControl extends TitleControl {
 		@IExtensionService extensionService: IExtensionService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IFileService fileService: IFileService,
+		@ILabelService labelService: ILabelService
 	) {
-		super(parent, accessor, group, contextMenuService, instantiationService, contextKeyService, keybindingService, telemetryService, notificationService, menuService, quickOpenService, themeService, extensionService, configurationService, fileService);
+		super(parent, accessor, group, contextMenuService, instantiationService, contextKeyService, keybindingService, telemetryService, notificationService, menuService, quickOpenService, themeService, extensionService, configurationService, fileService, labelService);
 	}
 
 	protected create(parent: HTMLElement): void {
diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts
@@ -40,6 +40,7 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
 import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
 import { IFileService } from 'vs/platform/files/common/files';
 import { withNullAsUndefined } from 'vs/base/common/types';
+import { ILabelService } from 'vs/platform/label/common/label';
 
 export interface IToolbarActions {
 	primary: IAction[];
@@ -78,6 +79,7 @@ export abstract class TitleControl extends Themable {
 		@IExtensionService private readonly extensionService: IExtensionService,
 		@IConfigurationService protected configurationService: IConfigurationService,
 		@IFileService private readonly fileService: IFileService,
+		@ILabelService private readonly labelService: ILabelService
 	) {
 		super(themeService);
 
@@ -90,6 +92,7 @@ export abstract class TitleControl extends Themable {
 
 	private registerListeners(): void {
 		this._register(this.extensionService.onDidRegisterExtensions(() => this.updateEditorActionsToolbar()));
+		this._register(this.labelService.onDidChangeFormatters(() => this.updateEditorLabel()));
 	}
 
 	protected abstract create(parent: HTMLElement): void;
@@ -339,7 +342,7 @@ export abstract class TitleControl extends Themable {
 
 	abstract setActive(isActive: boolean): void;
 
-	abstract updateEditorLabel(editor: IEditorInput): void;
+	abstract updateEditorLabel(editor?: IEditorInput): void;
 
 	abstract updateEditorDirty(editor: IEditorInput): void;
 

Original file line number	Diff line number	Diff line change
`@@ -145,8 +145,13 @@ export class NoTabsTitleControl extends TitleControl {`
`145`	`145`	`this.redraw();`
`146`	`146`	`}`
`147`	`147`
`148`		`- updateEditorLabel(editor: IEditorInput): void {`
`149`		`- this.ifEditorIsActive(editor, () => this.redraw());`
	`148`	`+ updateEditorLabel(editor?: IEditorInput): void {`
	`149`	`+ if (!editor) {`
	`150`	`+ editor = withNullAsUndefined(this.group.activeEditor);`
	`151`	`+ }`
	`152`	`+ if (editor) {`
	`153`	`+ this.ifEditorIsActive(editor, () => this.redraw());`
	`154`	`+ }`
`150`	`155`	`}`
`151`	`156`
`152`	`157`	`updateEditorDirty(editor: IEditorInput): void {`