From cb2a6ecef026426da33f1d13cd8a6d3ec28c7ecb Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 14 Feb 2019 12:38:34 +0100
Subject: [PATCH] strict null trouble

---
 src/vs/editor/contrib/format/format.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/editor/contrib/format/format.ts b/src/vs/editor/contrib/format/format.ts
index 68d013e786a..49c2198bf18 100644
--- a/src/vs/editor/contrib/format/format.ts
+++ b/src/vs/editor/contrib/format/format.ts
@@ -31,10 +31,10 @@ export const enum FormatKind {
 }
 
 export interface IFormatterConflictCallback {
-	(extensionIds: ExtensionIdentifier[], model: ITextModel, mode: number): void;
+	(extensionIds: (ExtensionIdentifier | undefined)[], model: ITextModel, mode: number): void;
 }
 
-let _conflictResolver: IFormatterConflictCallback;
+let _conflictResolver: IFormatterConflictCallback | undefined;
 
 export function setFormatterConflictCallback(callback: IFormatterConflictCallback): IDisposable {
 	let oldCallback = _conflictResolver;