Strict null check textDiffEditor

mjbvz · mjbvz · commit a6dee4c4070c · 2019-03-05T10:00:06.000-08:00
diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json
@@ -116,6 +116,7 @@
 		"./vs/workbench/browser/parts/editor/rangeDecorations.ts",
 		"./vs/workbench/browser/parts/editor/resourceViewer.ts",
 		"./vs/workbench/browser/parts/editor/sideBySideEditor.ts",
+		"./vs/workbench/browser/parts/editor/textDiffEditor.ts",
 		"./vs/workbench/browser/parts/editor/textEditor.ts",
 		"./vs/workbench/browser/parts/editor/textResourceEditor.ts",
 		"./vs/workbench/browser/parts/quickinput/quickInputBox.ts",
diff --git a/src/vs/editor/common/editorCommon.ts b/src/vs/editor/common/editorCommon.ts
@@ -469,7 +469,7 @@ export interface IDiffEditor extends IEditor {
 	/**
 	 * Type the getModel() of IEditor.
 	 */
-	getModel(): IDiffEditorModel;
+	getModel(): IDiffEditorModel | null;
 
 	/**
 	 * Get the `original` editor.
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 {
+	getTitle(): string | null {
 		if (this.input) {
 			return this.input.getName();
 		}
@@ -120,6 +120,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 
 				// Readonly flag
 				diffEditor.updateOptions({ readOnly: resolvedDiffEditorModel.isReadonly() });
+				return undefined;
 			}, error => {
 
 				// In case we tried to open a file and the response indicates that this is not a text file, fallback to binary diff.
@@ -262,7 +263,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		return super.loadTextEditorViewState(resource) as IDiffEditorViewState;  // overridden for text diff editor support
 	}
 
-	private saveTextDiffEditorViewState(input: EditorInput): void {
+	private saveTextDiffEditorViewState(input: EditorInput | null): void {
 		if (!(input instanceof DiffEditorInput)) {
 			return; // only supported for diff editor inputs
 		}
@@ -288,11 +289,11 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		}
 	}
 
-	protected retrieveTextEditorViewState(resource: URI): IDiffEditorViewState {
+	protected retrieveTextEditorViewState(resource: URI): IDiffEditorViewState | null {
 		return this.retrieveTextDiffEditorViewState(resource); // overridden for text diff editor support
 	}
 
-	private retrieveTextDiffEditorViewState(resource: URI): IDiffEditorViewState {
+	private retrieveTextDiffEditorViewState(resource: URI): IDiffEditorViewState | null {
 		const control = this.getControl();
 		const model = control.getModel();
 		if (!model || !model.modified || !model.original) {
@@ -311,9 +312,9 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		return control.saveViewState();
 	}
 
-	private toDiffEditorViewStateResource(modelOrInput: IDiffEditorModel | DiffEditorInput): URI {
-		let original: URI;
-		let modified: URI;
+	private toDiffEditorViewStateResource(modelOrInput: IDiffEditorModel | DiffEditorInput): URI | null {
+		let original: URI | null;
+		let modified: URI | null;
 
 		if (modelOrInput instanceof DiffEditorInput) {
 			original = modelOrInput.originalInput.getResource();

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 {`
	`64`	`+ getTitle(): string \| null {`
`65`	`65`	`if (this.input) {`
`66`	`66`	`return this.input.getName();`
`67`	`67`	`}`
`@@ -120,6 +120,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {`
`120`	`120`
`121`	`121`	`// Readonly flag`
`122`	`122`	`diffEditor.updateOptions({ readOnly: resolvedDiffEditorModel.isReadonly() });`
	`123`	`+ return undefined;`
`123`	`124`	`}, error => {`
`124`	`125`
`125`	`126`	`// In case we tried to open a file and the response indicates that this is not a text file, fallback to binary diff.`
`@@ -262,7 +263,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {`
`262`	`263`	`return super.loadTextEditorViewState(resource) as IDiffEditorViewState; // overridden for text diff editor support`
`263`	`264`	`}`
`264`	`265`
`265`		`- private saveTextDiffEditorViewState(input: EditorInput): void {`
	`266`	`+ private saveTextDiffEditorViewState(input: EditorInput \| null): void {`
`266`	`267`	`if (!(input instanceof DiffEditorInput)) {`
`267`	`268`	`return; // only supported for diff editor inputs`
`268`	`269`	`}`
`@@ -288,11 +289,11 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {`
`288`	`289`	`}`
`289`	`290`	`}`
`290`	`291`
`291`		`- protected retrieveTextEditorViewState(resource: URI): IDiffEditorViewState {`
	`292`	`+ protected retrieveTextEditorViewState(resource: URI): IDiffEditorViewState \| null {`
`292`	`293`	`return this.retrieveTextDiffEditorViewState(resource); // overridden for text diff editor support`
`293`	`294`	`}`
`294`	`295`
`295`		`- private retrieveTextDiffEditorViewState(resource: URI): IDiffEditorViewState {`
	`296`	`+ private retrieveTextDiffEditorViewState(resource: URI): IDiffEditorViewState \| null {`
`296`	`297`	`const control = this.getControl();`
`297`	`298`	`const model = control.getModel();`
`298`	`299`	`if (!model \|\| !model.modified \|\| !model.original) {`
`@@ -311,9 +312,9 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {`
`311`	`312`	`return control.saveViewState();`
`312`	`313`	`}`
`313`	`314`
`314`		`- private toDiffEditorViewStateResource(modelOrInput: IDiffEditorModel \| DiffEditorInput): URI {`
`315`		`- let original: URI;`
`316`		`- let modified: URI;`
	`315`	`+ private toDiffEditorViewStateResource(modelOrInput: IDiffEditorModel \| DiffEditorInput): URI \| null {`
	`316`	`+ let original: URI \| null;`
	`317`	`+ let modified: URI \| null;`
`317`	`318`
`318`	`319`	`if (modelOrInput instanceof DiffEditorInput) {`
`319`	`320`	`original = modelOrInput.originalInput.getResource();`