Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks

extensions/import/src/services/serviceClient.ts

@@ -18,8 +18,8 @@ import { Telemetry, LanguageClientErrorHandler } from './telemetry';
 import * as Constants from '../constants';
 import { TelemetryFeature, FlatFileImportFeature } from './features';
 import * as serviceUtils from './serviceUtils';
-
-const baseConfig = require('./config.json');
+import { promisify } from 'util';
+import { readFile } from 'fs';
 
 export class ServiceClient {
 	private statusView: vscode.StatusBarItem;
@@ -28,8 +28,9 @@ export class ServiceClient {
 		this.statusView = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
 	}
 
-	public startService(context: vscode.ExtensionContext): Promise<SqlOpsDataClient> {
-		let config: IConfig = JSON.parse(JSON.stringify(baseConfig));
+	public async startService(context: vscode.ExtensionContext): Promise<SqlOpsDataClient> {
+		const rawConfig = await promisify(readFile)(path.join(context.extensionPath, 'config.json'));
+		const config = JSON.parse(rawConfig.toString());
 		config.installDirectory = path.join(context.extensionPath, config.installDirectory);
 		config.proxy = vscode.workspace.getConfiguration('http').get('proxy');
 		config.strictSSL = vscode.workspace.getConfiguration('http').get('proxyStrictSSL') || true;
@@ -163,4 +164,3 @@ class CustomOutputChannel implements vscode.OutputChannel {
 	dispose(): void {
 	}
 }
-

extensions/import/src/services/serviceUtils.ts

@@ -6,8 +6,6 @@
 import * as path from 'path';
 import * as os from 'os';
 
-const baseConfig = require('./config.json');
-
 // The function is a duplicate of \src\paths.js. IT would be better to import path.js but it doesn't
 // work for now because the extension is running in different process.
 export function getAppDataPath(): string {
@@ -55,25 +53,6 @@ export function verifyPlatform(): Thenable<boolean> {
 	}
 }
 
-export function getServiceInstallConfig(basePath?: string): any {
-	if (!basePath) {
-		basePath = __dirname;
-	}
-	let config = JSON.parse(JSON.stringify(baseConfig));
-	config.installDirectory = path.join(basePath, config.installDirectory);
-
-	return config;
-}
-
-export function getResolvedServiceInstallationPath(runtime: Runtime, basePath?: string): string {
-	let config = getServiceInstallConfig(basePath);
-	let dir = config.installDirectory;
-	dir = dir.replace('{#version#}', config.version);
-	dir = dir.replace('{#platform#}', getRuntimeDisplayName(runtime));
-
-	return dir;
-}
-
 export function getRuntimeDisplayName(runtime: Runtime): string {
 	switch (runtime) {
 		case Runtime.Windows_64:

extensions/import/src/wizard/pages/modifyColumnsPage.ts

@@ -95,9 +95,9 @@ export class ModifyColumnsPage extends ImportPage {
 						title: ''
 					}
 				], {
-					horizontal: false,
-					componentWidth: '100%'
-				}).component();
+				horizontal: false,
+				componentWidth: '100%'
+			}).component();
 
 		this.loading.component = this.form;
 		await this.view.initializeModel(this.form);