Convert getLabel to return undefined instead of null

mjbvz · mjbvz · commit aeb7669fbafd · 2019-05-16T10:38:28.000-07:00
diff --git a/src/vs/base/parts/quickopen/browser/quickOpenModel.ts b/src/vs/base/parts/quickopen/browser/quickOpenModel.ts
@@ -36,7 +36,7 @@ let IDS = 0;
 export class QuickOpenItemAccessorClass implements IItemAccessor<QuickOpenEntry> {
 
 	getItemLabel(entry: QuickOpenEntry): string | null {
-		return entry.getLabel();
+		return types.withUndefinedAsNull(entry.getLabel());
 	}
 
 	getItemDescription(entry: QuickOpenEntry): string | null {
@@ -75,8 +75,8 @@ export class QuickOpenEntry {
 	/**
 	 * The label of the entry to identify it from others in the list
 	 */
-	getLabel(): string | null {
-		return null;
+	getLabel(): string | undefined {
+		return undefined;
 	}
 
 	/**
@@ -229,7 +229,7 @@ export class QuickOpenEntryGroup extends QuickOpenEntry {
 		this.withBorder = showBorder;
 	}
 
-	getLabel(): string | null {
+	getLabel(): string | undefined {
 		return this.entry ? this.entry.getLabel() : super.getLabel();
 	}
 
@@ -556,7 +556,7 @@ export class QuickOpenModel implements
 	}
 
 	getLabel(entry: QuickOpenEntry): string | null {
-		return entry.getLabel();
+		return types.withUndefinedAsNull(entry.getLabel());
 	}
 
 	getAriaLabel(entry: QuickOpenEntry): string {
diff --git a/src/vs/workbench/browser/parts/editor/editorPicker.ts b/src/vs/workbench/browser/parts/editor/editorPicker.ts
@@ -39,7 +39,7 @@ export class EditorPickerEntry extends QuickOpenEntryGroup {
 	}
 
 	getLabel() {
-		return this.editor.getName();
+		return withNullAsUndefined(this.editor.getName());
 	}
 
 	getIcon(): string {
diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
@@ -724,7 +724,7 @@ export class EditorHistoryEntryGroup extends QuickOpenEntryGroup {
 export class EditorHistoryEntry extends EditorQuickOpenEntry {
 	private input: IEditorInput | IResourceInput;
 	private resource: URI | undefined;
-	private label: string | null;
+	private label: string | undefined;
 	private description?: string;
 	private dirty: boolean;
 
@@ -744,7 +744,7 @@ export class EditorHistoryEntry extends EditorQuickOpenEntry {
 
 		if (input instanceof EditorInput) {
 			this.resource = resourceForEditorHistory(input, fileService);
-			this.label = input.getName();
+			this.label = types.withNullAsUndefined(input.getName());
 			this.description = types.withNullAsUndefined(input.getDescription());
 			this.dirty = input.isDirty();
 		} else {
@@ -764,7 +764,7 @@ export class EditorHistoryEntry extends EditorQuickOpenEntry {
 		return this.dirty ? 'dirty' : '';
 	}
 
-	getLabel(): string | null {
+	getLabel(): string | undefined {
 		return this.label;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ let IDS = 0;`
`36`	`36`	`export class QuickOpenItemAccessorClass implements IItemAccessor<QuickOpenEntry> {`
`37`	`37`
`38`	`38`	`getItemLabel(entry: QuickOpenEntry): string \| null {`
`39`		`- return entry.getLabel();`
	`39`	`+ return types.withUndefinedAsNull(entry.getLabel());`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`getItemDescription(entry: QuickOpenEntry): string \| null {`
`@@ -75,8 +75,8 @@ export class QuickOpenEntry {`
`75`	`75`	`/**`
`76`	`76`	`* The label of the entry to identify it from others in the list`
`77`	`77`	`*/`
`78`		`- getLabel(): string \| null {`
`79`		`- return null;`
	`78`	`+ getLabel(): string \| undefined {`
	`79`	`+ return undefined;`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`/**`
`@@ -229,7 +229,7 @@ export class QuickOpenEntryGroup extends QuickOpenEntry {`
`229`	`229`	`this.withBorder = showBorder;`
`230`	`230`	`}`
`231`	`231`
`232`		`- getLabel(): string \| null {`
	`232`	`+ getLabel(): string \| undefined {`
`233`	`233`	`return this.entry ? this.entry.getLabel() : super.getLabel();`
`234`	`234`	`}`
`235`	`235`
`@@ -556,7 +556,7 @@ export class QuickOpenModel implements`
`556`	`556`	`}`
`557`	`557`
`558`	`558`	`getLabel(entry: QuickOpenEntry): string \| null {`
`559`		`- return entry.getLabel();`
	`559`	`+ return types.withUndefinedAsNull(entry.getLabel());`
`560`	`560`	`}`
`561`	`561`
`562`	`562`	`getAriaLabel(entry: QuickOpenEntry): string {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ export class EditorPickerEntry extends QuickOpenEntryGroup {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`getLabel() {`
`42`		`- return this.editor.getName();`
	`42`	`+ return withNullAsUndefined(this.editor.getName());`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`getIcon(): string {`