Merge from vscode b12f623603e2fc1c5b3037115fa37c1a6acc4165 (#6760)

src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts

@@ -158,9 +158,9 @@ export class KeyboardLayoutPickerAction extends Action {
 
 			await this.fileService.resolve(file).then(undefined, (error) => {
 				return this.fileService.createFile(file, VSBuffer.fromString(KeyboardLayoutPickerAction.DEFAULT_CONTENT));
-			}).then((stat): Promise<IEditor | null> | null => {
+			}).then((stat): Promise<IEditor | undefined> | undefined => {
 				if (!stat) {
-					return null;
+					return undefined;
 				}
 				return this.editorService.openEditor({
 					resource: stat.resource,

src/vs/workbench/contrib/preferences/browser/preferencesActions.ts

@@ -225,7 +225,7 @@ export class OpenFolderSettingsAction extends Action {
 					return this.preferencesService.openFolderSettings(workspaceFolder.uri);
 				}
 
-				return null;
+				return undefined;
 			});
 	}
 

src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts

@@ -73,7 +73,7 @@ export class PreferencesSearchService extends Disposable implements IPreferences
 			};
 		} else {
 			return {
-				urlBase: this.productService.settingsSearchUrl
+				urlBase: this.productService.productConfiguration.settingsSearchUrl
 			};
 		}
 	}
@@ -364,7 +364,7 @@ class RemoteSearchProvider implements ISearchProvider {
 		const extensions = await this.installedExtensions;
 		const filters = this.options.newExtensionsOnly ?
 			[`diminish eq 'latest'`] :
-			this.getVersionFilters(extensions, this.productService.settingsSearchBuildId);
+			this.getVersionFilters(extensions, this.productService.productConfiguration.settingsSearchBuildId);
 
 		const filterStr = filters
 			.slice(filterPage * RemoteSearchProvider.MAX_REQUEST_FILTERS, (filterPage + 1) * RemoteSearchProvider.MAX_REQUEST_FILTERS)
@@ -563,4 +563,4 @@ export class SettingMatches {
 			endColumn: setting.valueRange.startColumn + match.end + 1
 		};
 	}
-}
+}

src/vs/workbench/contrib/preferences/browser/preferencesWidgets.ts

@@ -36,7 +36,7 @@ import { ISettingsGroup } from 'vs/workbench/services/preferences/common/prefere
 
 export class SettingsHeaderWidget extends Widget implements IViewZone {
 
-	private id: number;
+	private id: string;
 	private _domNode: HTMLElement;
 
 	protected titleContainer: HTMLElement;
@@ -121,7 +121,7 @@ export class DefaultSettingsHeaderWidget extends SettingsHeaderWidget {
 
 export class SettingsGroupTitleWidget extends Widget implements IViewZone {
 
-	private id: number;
+	private id: string;
 	private _afterLineNumber: number;
 	private _domNode: HTMLElement;
 

src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts

@@ -466,12 +466,12 @@ export class SettingsEditor2 extends BaseEditor {
 		}
 	}
 
-	switchToSettingsFile(): Promise<IEditor | null> {
+	switchToSettingsFile(): Promise<IEditor | undefined> {
 		const query = parseQuery(this.searchWidget.getValue());
 		return this.openSettingsFile(query.query);
 	}
 
-	private openSettingsFile(query?: string): Promise<IEditor | null> {
+	private openSettingsFile(query?: string): Promise<IEditor | undefined> {
 		const currentSettingsTarget = this.settingsTargetsWidget.settingsTarget;
 
 		const options: ISettingsEditorOptions = { query };

src/vs/workbench/contrib/preferences/browser/settingsTree.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as DOM from 'vs/base/browser/dom';
-import { renderMarkdown } from 'vs/base/browser/htmlContentRenderer';
+import { renderMarkdown } from 'vs/base/browser/markdownRenderer';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { IMouseEvent } from 'vs/base/browser/mouseEvent';
 import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';