diff --git a/extensions/configuration-editing/src/extension.ts b/extensions/configuration-editing/src/extension.ts
index 6160ac77b53..b8875fc9800 100644
--- a/extensions/configuration-editing/src/extension.ts
+++ b/extensions/configuration-editing/src/extension.ts
@@ -107,6 +107,7 @@ function registerKeybindingsCompletions(): vscode.Disposable {
 				const range = document.getWordRangeAtPosition(position) || new vscode.Range(position, position);
 				return commands.then(ids => ids.map(id => newSimpleCompletionItem(JSON.stringify(id), range)));
 			}
+			return undefined;
 		}
 	});
 }
@@ -204,6 +205,7 @@ function provideInstalledExtensionProposals(extensionsContent: IExtensionsConten
 			return [example];
 		}
 	}
+	return undefined;
 }
 
 function newSimpleCompletionItem(label: string, range: vscode.Range, description?: string, insertText?: string): vscode.CompletionItem {
diff --git a/extensions/configuration-editing/tsconfig.json b/extensions/configuration-editing/tsconfig.json
index 58e3b15279e..296ddb38fcb 100644
--- a/extensions/configuration-editing/tsconfig.json
+++ b/extensions/configuration-editing/tsconfig.json
@@ -1,14 +1,7 @@
 {
+	"extends": "../shared.tsconfig.json",
 	"compilerOptions": {
-		"target": "es5",
-		"module": "commonjs",
-		"outDir": "./out",
-		"lib": [
-			"es2015"
-		],
-		"strict": true,
-		"noUnusedLocals": true,
-		"noUnusedParameters": true
+		"outDir": "./out"
 	},
 	"include": [
 		"src/**/*"