debt - less null

Benjamin Pasero · Benjamin Pasero · commit ced1335a0eb7 · 2019-09-02T11:08:37.000+02:00
diff --git a/src/vs/base/browser/dnd.ts b/src/vs/base/browser/dnd.ts
@@ -111,4 +111,4 @@ export interface IStaticDND {
 
 export const StaticDND: IStaticDND = {
 	CurrentDragAndDropData: undefined
-};
+};
diff --git a/src/vs/base/common/labels.ts b/src/vs/base/common/labels.ts
@@ -283,7 +283,7 @@ interface ISegment {
  * @param value string to which templating is applied
  * @param values the values of the templates to use
  */
-export function template(template: string, values: { [key: string]: string | ISeparator | null } = Object.create(null)): string {
+export function template(template: string, values: { [key: string]: string | ISeparator | undefined | null } = Object.create(null)): string {
 	const segments: ISegment[] = [];
 
 	let inVariable = false;
diff --git a/src/vs/workbench/browser/composite.ts b/src/vs/workbench/browser/composite.ts
@@ -84,8 +84,8 @@ export abstract class Composite extends Component implements IComposite {
 		this.visible = false;
 	}
 
-	getTitle(): string | null {
-		return null;
+	getTitle(): string | undefined {
+		return undefined;
 	}
 
 	protected get telemetryService(): ITelemetryService {
diff --git a/src/vs/workbench/browser/parts/compositePart.ts b/src/vs/workbench/browser/parts/compositePart.ts
@@ -32,7 +32,6 @@ import { attachProgressBarStyler } from 'vs/platform/theme/common/styler';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { Dimension, append, $, addClass, hide, show, addClasses } from 'vs/base/browser/dom';
 import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
-import { withNullAsUndefined } from 'vs/base/common/types';
 
 export interface ICompositeTitleLabel {
 
@@ -240,7 +239,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		// Update title with composite title if it differs from descriptor
 		const descriptor = this.registry.getComposite(composite.getId());
 		if (descriptor && descriptor.name !== composite.getTitle()) {
-			this.updateTitle(composite.getId(), withNullAsUndefined(composite.getTitle()));
+			this.updateTitle(composite.getId(), composite.getTitle());
 		}
 
 		// Handle Composite Actions
diff --git a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
@@ -61,7 +61,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		return new EditorMemento(this.getId(), key, Object.create(null), limit, editorGroupService); // do not persist in storage as diff editors are never persisted
 	}
 
-	getTitle(): string | null {
+	getTitle(): string | undefined {
 		if (this.input) {
 			return this.input.getName();
 		}
diff --git a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
@@ -46,7 +46,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 		super(id, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorService, editorGroupService, windowService);
 	}
 
-	getTitle(): string | null {
+	getTitle(): string | undefined {
 		if (this.input) {
 			return this.input.getName();
 		}
diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts
@@ -274,7 +274,7 @@ export abstract class TitleControl extends Themable {
 					label = localize('draggedEditorGroup', "{0} (+{1})", label, this.group.count - 1);
 				}
 
-				applyDragImage(e, label, 'monaco-editor-group-drag-image');
+				applyDragImage(e, withUndefinedAsNull(label), 'monaco-editor-group-drag-image');
 			}
 		}));
 
diff --git a/src/vs/workbench/common/composite.ts b/src/vs/workbench/common/composite.ts
@@ -15,7 +15,7 @@ export interface IComposite {
 	/**
 	 * Returns the name of this composite to show in the title area.
 	 */
-	getTitle(): string | null;
+	getTitle(): string | undefined;
 
 	/**
 	 * Returns the primary actions of the composite.
diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
@@ -292,7 +292,7 @@ export interface IEditorInput extends IDisposable {
 	/**
 	 * Returns the display name of this input.
 	 */
-	getName(): string | null;
+	getName(): string | undefined;
 
 	/**
 	 * Returns the display description of this input.
@@ -302,7 +302,7 @@ export interface IEditorInput extends IDisposable {
 	/**
 	 * Returns the display title of this input.
 	 */
-	getTitle(verbosity?: Verbosity): string | null;
+	getTitle(verbosity?: Verbosity): string | undefined;
 
 	/**
 	 * Resolves the input.
@@ -358,8 +358,8 @@ export abstract class EditorInput extends Disposable implements IEditorInput {
 	 * Returns the name of this input that can be shown to the user. Examples include showing the name of the input
 	 * above the editor area when the input is shown.
 	 */
-	getName(): string | null {
-		return null;
+	getName(): string | undefined {
+		return undefined;
 	}
 
 	/**
@@ -374,7 +374,7 @@ export abstract class EditorInput extends Disposable implements IEditorInput {
 	 * Returns the title of this input that can be shown to the user. Examples include showing the title of
 	 * the input above the editor area as hover over the input label.
 	 */
-	getTitle(verbosity?: Verbosity): string | null {
+	getTitle(verbosity?: Verbosity): string | undefined {
 		return this.getName();
 	}
 
diff --git a/src/vs/workbench/common/editor/dataUriEditorInput.ts b/src/vs/workbench/common/editor/dataUriEditorInput.ts
@@ -8,7 +8,6 @@ import { URI } from 'vs/base/common/uri';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { BinaryEditorModel } from 'vs/workbench/common/editor/binaryEditorModel';
 import { DataUri } from 'vs/base/common/resources';
-import { withUndefinedAsNull } from 'vs/base/common/types';
 
 /**
  * An editor input to present data URIs in a binary editor. Data URIs have the form of:
@@ -51,8 +50,8 @@ export class DataUriEditorInput extends EditorInput {
 		return DataUriEditorInput.ID;
 	}
 
-	getName(): string | null {
-		return withUndefinedAsNull(this.name);
+	getName(): string | undefined {
+		return this.name;
 	}
 
 	getDescription(): string | undefined {
diff --git a/src/vs/workbench/common/editor/untitledEditorInput.ts b/src/vs/workbench/common/editor/untitledEditorInput.ts
@@ -107,7 +107,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		return this.labelService.getUriLabel(this.resource);
 	}
 
-	getTitle(verbosity: Verbosity): string | null {
+	getTitle(verbosity: Verbosity): string | undefined {
 		if (!this.hasAssociatedFilePath) {
 			return this.getName();
 		}
@@ -121,7 +121,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 				return this.longTitle;
 		}
 
-		return null;
+		return undefined;
 	}
 
 	isDirty(): boolean {
diff --git a/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.ts b/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.ts
@@ -57,7 +57,7 @@ export class BinaryFileEditor extends BaseBinaryResourceEditor {
 		}
 	}
 
-	getTitle(): string | null {
+	getTitle(): string | undefined {
 		return this.input ? this.input.getName() : nls.localize('binaryFileEditor', "Binary File Viewer");
 	}
 }
diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts
@@ -635,10 +635,10 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 		return input;
 	}
 
-	private toDiffLabel(input: EditorInput): string | null {
+	private toDiffLabel(input: EditorInput): string | undefined {
 		const res = input.getResource();
 		if (!res) {
-			return null;
+			return undefined;
 		}
 
 		// Do not try to extract any paths from simple untitled editors
diff --git a/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts b/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
@@ -21,7 +21,7 @@ export class PreferencesEditorInput extends SideBySideEditorInput {
 		return PreferencesEditorInput.ID;
 	}
 
-	getTitle(verbosity: Verbosity): string | null {
+	getTitle(verbosity: Verbosity): string | undefined {
 		return this.master.getTitle(verbosity);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,8 @@ export abstract class Composite extends Component implements IComposite {`
`84`	`84`	`this.visible = false;`
`85`	`85`	`}`
`86`	`86`
`87`		`- getTitle(): string \| null {`
`88`		`- return null;`
	`87`	`+ getTitle(): string \| undefined {`
	`88`	`+ return undefined;`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`protected get telemetryService(): ITelemetryService {`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {`
`61`	`61`	`return new EditorMemento(this.getId(), key, Object.create(null), limit, editorGroupService); // do not persist in storage as diff editors are never persisted`
`62`	`62`	`}`
`63`	`63`
`64`		`- getTitle(): string \| null {`
	`64`	`+ getTitle(): string \| undefined {`
`65`	`65`	`if (this.input) {`
`66`	`66`	`return this.input.getName();`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {`
`46`	`46`	`super(id, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorService, editorGroupService, windowService);`
`47`	`47`	`}`
`48`	`48`
`49`		`- getTitle(): string \| null {`
	`49`	`+ getTitle(): string \| undefined {`
`50`	`50`	`if (this.input) {`
`51`	`51`	`return this.input.getName();`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ export abstract class TitleControl extends Themable {`
`274`	`274`	`label = localize('draggedEditorGroup', "{0} (+{1})", label, this.group.count - 1);`
`275`	`275`	`}`
`276`	`276`
`277`		`- applyDragImage(e, label, 'monaco-editor-group-drag-image');`
	`277`	`+ applyDragImage(e, withUndefinedAsNull(label), 'monaco-editor-group-drag-image');`
`278`	`278`	`}`
`279`	`279`	`}));`
`280`	`280`