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/vs/platform/theme/common/themeService.ts

@@ -21,6 +21,14 @@ export function themeColorFromId(id: ColorIdentifier) {
 	return { id };
 }
 
+// theme icon
+export interface ThemeIcon {
+	readonly id: string;
+}
+
+export const FileThemeIcon = { id: 'file' };
+export const FolderThemeIcon = { id: 'folder' };
+
 // base themes
 export const DARK: ThemeType = 'dark';
 export const LIGHT: ThemeType = 'light';