Merge VS Code 1.21 source code (#1067)

* Initial VS Code 1.21 file copy with patches

* A few more merges

* Post npm install

* Fix batch of build breaks

* Fix more build breaks

* Fix more build errors

* Fix more build breaks

* Runtime fixes 1

* Get connection dialog working with some todos

* Fix a few packaging issues

* Copy several node_modules to package build to fix loader issues

* Fix breaks from master

* A few more fixes

* Make tests pass

* First pass of license header updates

* Second pass of license header updates

* Fix restore dialog issues

* Remove add additional themes menu items

* fix select box issues where the list doesn't show up

* formatting

* Fix editor dispose issue

* Copy over node modules to correct location on all platforms

src/sql/common/pathUtilities.ts

@@ -7,8 +7,8 @@ import * as path from 'path';
 import * as os from 'os';
 
 import URI from 'vs/base/common/uri';
-import { UNTITLED_SCHEMA } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
+import { Schemas } from 'vs/base/common/network';
 
 export const FILE_SCHEMA: string = 'file';
 
@@ -19,7 +19,7 @@ export function resolveCurrentDirectory(uri: string, rootPath: string): string {
 	// use current directory of the sql file if sql file is saved
 	if (sqlUri.scheme === FILE_SCHEMA) {
 		currentDirectory = path.dirname(sqlUri.fsPath);
-	} else if (sqlUri.scheme === UNTITLED_SCHEMA) {
+	} else if (sqlUri.scheme === Schemas.untitled) {
 		// if sql file is unsaved/untitled but a workspace is open use workspace root
 		let root = rootPath;
 		if (root) {