let -> const, remove 'public'

src/vs/workbench/parts/preferences/browser/keybindingWidgets.ts

@@ -38,16 +38,16 @@ export class KeybindingsSearchWidget extends SearchWidget {
 	private recordDisposables: IDisposable[] = [];
 
 	private _onKeybinding = this._register(new Emitter<[ResolvedKeybinding, ResolvedKeybinding]>());
-	public readonly onKeybinding: Event<[ResolvedKeybinding, ResolvedKeybinding]> = this._onKeybinding.event;
+	readonly onKeybinding: Event<[ResolvedKeybinding, ResolvedKeybinding]> = this._onKeybinding.event;
 
 	private _onEnter = this._register(new Emitter<void>());
-	public readonly onEnter: Event<void> = this._onEnter.event;
+	readonly onEnter: Event<void> = this._onEnter.event;
 
 	private _onEscape = this._register(new Emitter<void>());
-	public readonly onEscape: Event<void> = this._onEscape.event;
+	readonly onEscape: Event<void> = this._onEscape.event;
 
 	private _onBlur = this._register(new Emitter<void>());
-	public readonly onBlur: Event<void> = this._onBlur.event;
+	readonly onBlur: Event<void> = this._onBlur.event;
 
 	constructor(parent: HTMLElement, options: SearchOptions,
 		@IContextViewService contextViewService: IContextViewService,
@@ -81,12 +81,12 @@ export class KeybindingsSearchWidget extends SearchWidget {
 		dispose(this.recordDisposables);
 	}
 
-	public setInputValue(value: string): void {
+	setInputValue(value: string): void {
 		this._inputValue = value;
 		this.inputBox.value = this._inputValue;
 	}
 
-	public focus(): void {
+	focus(): void {
 		this.inputBox.focus();
 	}
 
@@ -158,10 +158,10 @@ export class DefineKeybindingWidget extends Widget {
 	private _onHide = this._register(new Emitter<void>());
 
 	private _onDidChange = this._register(new Emitter<String>());
-	public onDidChange: Event<String> = this._onDidChange.event;
+	onDidChange: Event<String> = this._onDidChange.event;
 
 	private _onShowExistingKeybindings = this._register(new Emitter<String>());
-	public readonly onShowExistingKeybidings: Event<String> = this._onShowExistingKeybindings.event;
+	readonly onShowExistingKeybidings: Event<String> = this._onShowExistingKeybindings.event;
 
 	constructor(
 		parent: HTMLElement,
@@ -201,10 +201,10 @@ export class DefineKeybindingWidget extends Widget {
 	}
 
 	layout(layout: dom.Dimension): void {
-		let top = Math.round((layout.height - DefineKeybindingWidget.HEIGHT) / 2);
+		const top = Math.round((layout.height - DefineKeybindingWidget.HEIGHT) / 2);
 		this._domNode.setTop(top);
 
-		let left = Math.round((layout.width - DefineKeybindingWidget.WIDTH) / 2);
+		const left = Math.round((layout.width - DefineKeybindingWidget.WIDTH) / 2);
 		this._domNode.setLeft(left);
 	}
 
@@ -311,26 +311,26 @@ export class DefineKeybindingOverlayWidget extends Disposable implements IOverla
 		this._editor.addOverlayWidget(this);
 	}
 
-	public getId(): string {
+	getId(): string {
 		return DefineKeybindingOverlayWidget.ID;
 	}
 
-	public getDomNode(): HTMLElement {
+	getDomNode(): HTMLElement {
 		return this._widget.domNode;
 	}
 
-	public getPosition(): IOverlayWidgetPosition {
+	getPosition(): IOverlayWidgetPosition {
 		return {
 			preference: null
 		};
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this._editor.removeOverlayWidget(this);
 		super.dispose();
 	}
 
-	public start(): Promise<string> {
+	start(): Promise<string> {
 		this._editor.revealPositionInCenterIfOutsideViewport(this._editor.getPosition(), ScrollType.Smooth);
 		const layoutInfo = this._editor.getLayoutInfo();
 		this._widget.layout(new dom.Dimension(layoutInfo.width, layoutInfo.height));

src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts

@@ -46,11 +46,11 @@ import { attachStylerCallback } from 'vs/platform/theme/common/styler';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 
-let $ = DOM.$;
+const $ = DOM.$;
 
 export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor {
 
-	public static readonly ID: string = 'workbench.editor.keybindings';
+	static readonly ID: string = 'workbench.editor.keybindings';
 
 	private keybindingsEditorModel: KeybindingsEditorModel;
 
@@ -372,7 +372,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 		fileElement.tabIndex = 0;
 		this._register(DOM.addDisposableListener(fileElement, DOM.EventType.CLICK, () => this.preferencesService.openGlobalKeybindingSettings(true)));
 		this._register(DOM.addDisposableListener(fileElement, DOM.EventType.KEY_UP, e => {
-			let keyboardEvent = new StandardKeyboardEvent(e);
+			const keyboardEvent = new StandardKeyboardEvent(e);
 			switch (keyboardEvent.keyCode) {
 				case KeyCode.Enter:
 					this.preferencesService.openGlobalKeybindingSettings(true);
@@ -644,7 +644,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 
 	private reportFilteringUsed(filter: string): void {
 		if (filter) {
-			let data = {
+			const data = {
 				filter,
 				emptyFilters: this.getLatestEmptyFiltersForTelemetry()
 			};
@@ -835,7 +835,7 @@ class ActionsColumn extends Column {
 		};
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.actionBar = dispose(this.actionBar);
 	}
 }

src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.ts

@@ -38,7 +38,7 @@ export class DefineKeybindingController extends Disposable implements editorComm
 
 	private static readonly ID = 'editor.contrib.defineKeybinding';
 
-	public static get(editor: ICodeEditor): DefineKeybindingController {
+	static get(editor: ICodeEditor): DefineKeybindingController {
 		return editor.getContribution<DefineKeybindingController>(DefineKeybindingController.ID);
 	}
 
@@ -58,15 +58,15 @@ export class DefineKeybindingController extends Disposable implements editorComm
 		this._update();
 	}
 
-	public getId(): string {
+	getId(): string {
 		return DefineKeybindingController.ID;
 	}
 
-	public get keybindingWidgetRenderer(): KeybindingWidgetRenderer {
+	get keybindingWidgetRenderer(): KeybindingWidgetRenderer {
 		return this._keybindingWidgetRenderer;
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this._disposeKeybindingWidgetRenderer();
 		this._disposeKeybindingDecorationRenderer();
 		super.dispose();
@@ -134,15 +134,15 @@ export class KeybindingWidgetRenderer extends Disposable {
 		this._launchWidget.render();
 	}
 
-	public showDefineKeybindingWidget(): void {
+	showDefineKeybindingWidget(): void {
 		this._defineWidget.start().then(keybinding => this._onAccepted(keybinding));
 	}
 
 	private _onAccepted(keybinding: string): void {
 		this._editor.focus();
 		if (keybinding) {
-			let regexp = new RegExp(/\\/g);
-			let backslash = regexp.test(keybinding);
+			const regexp = new RegExp(/\\/g);
+			const backslash = regexp.test(keybinding);
 			if (backslash) {
 				keybinding = keybinding.slice(0, -1) + '\\\\';
 			}
@@ -154,7 +154,7 @@ export class KeybindingWidgetRenderer extends Disposable {
 				'}$0'
 			].join('\n');
 
-			let smartInsertInfo = SmartSnippetInserter.insertSnippet(this._editor.getModel(), this._editor.getPosition());
+			const smartInsertInfo = SmartSnippetInserter.insertSnippet(this._editor.getModel(), this._editor.getPosition());
 			snippetText = smartInsertInfo.prepend + snippetText + smartInsertInfo.append;
 			this._editor.setPosition(smartInsertInfo.position);
 
@@ -176,7 +176,7 @@ export class KeybindingEditorDecorationsRenderer extends Disposable {
 
 		this._updateDecorations = this._register(new RunOnceScheduler(() => this._updateDecorationsNow(), 500));
 
-		let model = this._editor.getModel();
+		const model = this._editor.getModel();
 		this._register(model.onDidChangeContent(() => this._updateDecorations.schedule()));
 		this._register(this._keybindingService.onDidUpdateKeybindings((e) => this._updateDecorations.schedule()));
 		this._register({
@@ -191,7 +191,7 @@ export class KeybindingEditorDecorationsRenderer extends Disposable {
 	private _updateDecorationsNow(): void {
 		const model = this._editor.getModel();
 
-		let newDecorations: IModelDeltaDecoration[] = [];
+		const newDecorations: IModelDeltaDecoration[] = [];
 
 		const root = parseTree(model.getValue());
 		if (root && Array.isArray(root.children)) {
@@ -374,11 +374,11 @@ class DefineKeybindingCommand extends EditorCommand {
 		});
 	}
 
-	public runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor): void {
+	runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor): void {
 		if (!isInterestingEditorModel(editor) || editor.getConfiguration().readOnly) {
 			return;
 		}
-		let controller = DefineKeybindingController.get(editor);
+		const controller = DefineKeybindingController.get(editor);
 		if (controller && controller.keybindingWidgetRenderer) {
 			controller.keybindingWidgetRenderer.showDefineKeybindingWidget();
 		}
@@ -386,11 +386,11 @@ class DefineKeybindingCommand extends EditorCommand {
 }
 
 function isInterestingEditorModel(editor: ICodeEditor): boolean {
-	let model = editor.getModel();
+	const model = editor.getModel();
 	if (!model) {
 		return false;
 	}
-	let url = model.uri.toString();
+	const url = model.uri.toString();
 	return INTERESTING_FILE.test(url);
 }
 

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

@@ -18,8 +18,8 @@ import { IPreferencesService } from 'vs/workbench/services/preferences/common/pr
 
 export class OpenRawDefaultSettingsAction extends Action {
 
-	public static readonly ID = 'workbench.action.openRawDefaultSettings';
-	public static readonly LABEL = nls.localize('openRawDefaultSettings', "Open Raw Default Settings");
+	static readonly ID = 'workbench.action.openRawDefaultSettings';
+	static readonly LABEL = nls.localize('openRawDefaultSettings', "Open Raw Default Settings");
 
 	constructor(
 		id: string,
@@ -29,15 +29,15 @@ export class OpenRawDefaultSettingsAction extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any): Promise<any> {
+	run(event?: any): Promise<any> {
 		return this.preferencesService.openRawDefaultSettings();
 	}
 }
 
 export class OpenSettings2Action extends Action {
 
-	public static readonly ID = 'workbench.action.openSettings2';
-	public static readonly LABEL = nls.localize('openSettings2', "Open Settings (UI)");
+	static readonly ID = 'workbench.action.openSettings2';
+	static readonly LABEL = nls.localize('openSettings2', "Open Settings (UI)");
 
 	constructor(
 		id: string,
@@ -47,15 +47,15 @@ export class OpenSettings2Action extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any): Promise<any> {
+	run(event?: any): Promise<any> {
 		return this.preferencesService.openSettings(false);
 	}
 }
 
 export class OpenSettingsAction extends Action {
 
-	public static readonly ID = 'workbench.action.openSettings';
-	public static readonly LABEL = nls.localize('openSettings', "Open Settings");
+	static readonly ID = 'workbench.action.openSettings';
+	static readonly LABEL = nls.localize('openSettings', "Open Settings");
 
 	constructor(
 		id: string,
@@ -65,15 +65,15 @@ export class OpenSettingsAction extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any): Promise<any> {
+	run(event?: any): Promise<any> {
 		return this.preferencesService.openSettings();
 	}
 }
 
 export class OpenSettingsJsonAction extends Action {
 
-	public static readonly ID = 'workbench.action.openSettingsJson';
-	public static readonly LABEL = nls.localize('openSettingsJson', "Open Settings (JSON)");
+	static readonly ID = 'workbench.action.openSettingsJson';
+	static readonly LABEL = nls.localize('openSettingsJson', "Open Settings (JSON)");
 
 	constructor(
 		id: string,
@@ -83,15 +83,15 @@ export class OpenSettingsJsonAction extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any): Promise<any> {
+	run(event?: any): Promise<any> {
 		return this.preferencesService.openSettings(true);
 	}
 }
 
 export class OpenGlobalSettingsAction extends Action {
 
-	public static readonly ID = 'workbench.action.openGlobalSettings';
-	public static readonly LABEL = nls.localize('openGlobalSettings', "Open User Settings");
+	static readonly ID = 'workbench.action.openGlobalSettings';
+	static readonly LABEL = nls.localize('openGlobalSettings', "Open User Settings");
 
 	constructor(
 		id: string,
@@ -101,15 +101,15 @@ export class OpenGlobalSettingsAction extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any): Promise<any> {
+	run(event?: any): Promise<any> {
 		return this.preferencesService.openGlobalSettings();
 	}
 }
 
 export class OpenGlobalKeybindingsAction extends Action {
 
-	public static readonly ID = 'workbench.action.openGlobalKeybindings';
-	public static readonly LABEL = nls.localize('openGlobalKeybindings', "Open Keyboard Shortcuts");
+	static readonly ID = 'workbench.action.openGlobalKeybindings';
+	static readonly LABEL = nls.localize('openGlobalKeybindings', "Open Keyboard Shortcuts");
 
 	constructor(
 		id: string,
@@ -119,15 +119,15 @@ export class OpenGlobalKeybindingsAction extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any): Promise<any> {
+	run(event?: any): Promise<any> {
 		return this.preferencesService.openGlobalKeybindingSettings(false);
 	}
 }
 
 export class OpenGlobalKeybindingsFileAction extends Action {
 
-	public static readonly ID = 'workbench.action.openGlobalKeybindingsFile';
-	public static readonly LABEL = nls.localize('openGlobalKeybindingsFile', "Open Keyboard Shortcuts (JSON)");
+	static readonly ID = 'workbench.action.openGlobalKeybindingsFile';
+	static readonly LABEL = nls.localize('openGlobalKeybindingsFile', "Open Keyboard Shortcuts (JSON)");
 
 	constructor(
 		id: string,
@@ -137,15 +137,15 @@ export class OpenGlobalKeybindingsFileAction extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any): Promise<any> {
+	run(event?: any): Promise<any> {
 		return this.preferencesService.openGlobalKeybindingSettings(true);
 	}
 }
 
 export class OpenDefaultKeybindingsFileAction extends Action {
 
-	public static readonly ID = 'workbench.action.openDefaultKeybindingsFile';
-	public static readonly LABEL = nls.localize('openDefaultKeybindingsFile', "Open Default Keyboard Shortcuts (JSON)");
+	static readonly ID = 'workbench.action.openDefaultKeybindingsFile';
+	static readonly LABEL = nls.localize('openDefaultKeybindingsFile', "Open Default Keyboard Shortcuts (JSON)");
 
 	constructor(
 		id: string,
@@ -155,15 +155,15 @@ export class OpenDefaultKeybindingsFileAction extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any): Promise<any> {
+	run(event?: any): Promise<any> {
 		return this.preferencesService.openDefaultKeybindingsFile();
 	}
 }
 
 export class OpenWorkspaceSettingsAction extends Action {
 
-	public static readonly ID = 'workbench.action.openWorkspaceSettings';
-	public static readonly LABEL = nls.localize('openWorkspaceSettings', "Open Workspace Settings");
+	static readonly ID = 'workbench.action.openWorkspaceSettings';
+	static readonly LABEL = nls.localize('openWorkspaceSettings', "Open Workspace Settings");
 
 	private disposables: IDisposable[] = [];
 
@@ -182,11 +182,11 @@ export class OpenWorkspaceSettingsAction extends Action {
 		this.enabled = this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY;
 	}
 
-	public run(event?: any): Promise<any> {
+	run(event?: any): Promise<any> {
 		return this.preferencesService.openWorkspaceSettings();
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.disposables = dispose(this.disposables);
 		super.dispose();
 	}
@@ -196,8 +196,8 @@ export const OPEN_FOLDER_SETTINGS_COMMAND = '_workbench.action.openFolderSetting
 export const OPEN_FOLDER_SETTINGS_LABEL = nls.localize('openFolderSettings', "Open Folder Settings");
 export class OpenFolderSettingsAction extends Action {
 
-	public static readonly ID = 'workbench.action.openFolderSettings';
-	public static readonly LABEL = OPEN_FOLDER_SETTINGS_LABEL;
+	static readonly ID = 'workbench.action.openFolderSettings';
+	static readonly LABEL = OPEN_FOLDER_SETTINGS_LABEL;
 
 	private disposables: IDisposable[] = [];
 
@@ -219,7 +219,7 @@ export class OpenFolderSettingsAction extends Action {
 		this.enabled = this.workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE && this.workspaceContextService.getWorkspace().folders.length > 0;
 	}
 
-	public run(): Promise<any> {
+	run(): Promise<any> {
 		return this.commandService.executeCommand<IWorkspaceFolder>(PICK_WORKSPACE_FOLDER_COMMAND_ID)
 			.then(workspaceFolder => {
 				if (workspaceFolder) {
@@ -230,7 +230,7 @@ export class OpenFolderSettingsAction extends Action {
 			});
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.disposables = dispose(this.disposables);
 		super.dispose();
 	}
@@ -238,8 +238,8 @@ export class OpenFolderSettingsAction extends Action {
 
 export class ConfigureLanguageBasedSettingsAction extends Action {
 
-	public static readonly ID = 'workbench.action.configureLanguageBasedSettings';
-	public static readonly LABEL = nls.localize('configureLanguageBasedSettings', "Configure Language Specific Settings...");
+	static readonly ID = 'workbench.action.configureLanguageBasedSettings';
+	static readonly LABEL = nls.localize('configureLanguageBasedSettings', "Configure Language Specific Settings...");
 
 	constructor(
 		id: string,
@@ -252,10 +252,10 @@ export class ConfigureLanguageBasedSettingsAction extends Action {
 		super(id, label);
 	}
 
-	public run(): Promise<any> {
+	run(): Promise<any> {
 		const languages = this.modeService.getRegisteredLanguageNames();
 		const picks: IQuickPickItem[] = languages.sort().map((lang, index) => {
-			let description: string = nls.localize('languageDescriptionConfigured', "({0})", this.modeService.getModeIdForLanguageName(lang.toLowerCase()));
+			const description: string = nls.localize('languageDescriptionConfigured', "({0})", this.modeService.getModeIdForLanguageName(lang.toLowerCase()));
 			// construct a fake resource to be able to show nice icons if any
 			let fakeResource: URI;
 			const extensions = this.modeService.getExtensions(lang);

src/vs/workbench/parts/preferences/browser/preferencesEditor.ts

@@ -58,7 +58,7 @@ import { IWindowService } from 'vs/platform/windows/common/windows';
 
 export class PreferencesEditor extends BaseEditor {
 
-	public static readonly ID: string = PREFERENCES_EDITOR_ID;
+	static readonly ID: string = PREFERENCES_EDITOR_ID;
 
 	private defaultSettingsEditorContextKey: IContextKey<boolean>;
 	private defaultSettingsJSONEditorContextKey: IContextKey<boolean>;
@@ -106,7 +106,7 @@ export class PreferencesEditor extends BaseEditor {
 		this.remoteSearchThrottle = new ThrottledDelayer(200);
 	}
 
-	public createEditor(parent: HTMLElement): void {
+	createEditor(parent: HTMLElement): void {
 		DOM.addClass(parent, 'preferences-editor');
 
 		this.headerContainer = DOM.append(parent, DOM.$('.preferences-header'));
@@ -132,29 +132,29 @@ export class PreferencesEditor extends BaseEditor {
 		this._register(this.preferencesRenderers.onDidFilterResultsCountChange(count => this.showSearchResultsMessage(count)));
 	}
 
-	public clearSearchResults(): void {
+	clearSearchResults(): void {
 		if (this.searchWidget) {
 			this.searchWidget.clear();
 		}
 	}
 
-	public focusNextResult(): void {
+	focusNextResult(): void {
 		if (this.preferencesRenderers) {
 			this.preferencesRenderers.focusNextPreference(true);
 		}
 	}
 
-	public focusPreviousResult(): void {
+	focusPreviousResult(): void {
 		if (this.preferencesRenderers) {
 			this.preferencesRenderers.focusNextPreference(false);
 		}
 	}
 
-	public editFocusedPreference(): void {
+	editFocusedPreference(): void {
 		this.preferencesRenderers.editFocusedPreference();
 	}
 
-	public setInput(newInput: PreferencesEditorInput, options: SettingsEditorOptions, token: CancellationToken): Promise<void> {
+	setInput(newInput: PreferencesEditorInput, options: SettingsEditorOptions, token: CancellationToken): Promise<void> {
 		this.defaultSettingsEditorContextKey.set(true);
 		this.defaultSettingsJSONEditorContextKey.set(true);
 		if (options && options.query) {
@@ -164,23 +164,23 @@ export class PreferencesEditor extends BaseEditor {
 		return super.setInput(newInput, options, token).then(() => this.updateInput(newInput, options, token));
 	}
 
-	public layout(dimension: DOM.Dimension): void {
+	layout(dimension: DOM.Dimension): void {
 		this.searchWidget.layout(dimension);
 		const headerHeight = DOM.getTotalHeight(this.headerContainer);
 		this.sideBySidePreferencesWidget.layout(new DOM.Dimension(dimension.width, dimension.height - headerHeight));
 	}
 
-	public getControl(): IEditorControl {
+	getControl(): IEditorControl {
 		return this.sideBySidePreferencesWidget.getControl();
 	}
 
-	public focus(): void {
+	focus(): void {
 		if (this.lastFocusedWidget) {
 			this.lastFocusedWidget.focus();
 		}
 	}
 
-	public focusSearch(filter?: string): void {
+	focusSearch(filter?: string): void {
 		if (filter) {
 			this.searchWidget.setValue(filter);
 		}
@@ -188,13 +188,13 @@ export class PreferencesEditor extends BaseEditor {
 		this.searchWidget.focus();
 	}
 
-	public focusSettingsFileEditor(): void {
+	focusSettingsFileEditor(): void {
 		if (this.sideBySidePreferencesWidget) {
 			this.sideBySidePreferencesWidget.focus();
 		}
 	}
 
-	public clearInput(): void {
+	clearInput(): void {
 		this.defaultSettingsEditorContextKey.set(false);
 		this.defaultSettingsJSONEditorContextKey.set(false);
 		this.sideBySidePreferencesWidget.clearInput();
@@ -309,7 +309,7 @@ export class PreferencesEditor extends BaseEditor {
 				Object.keys(metadata).forEach(key => durations[key] = metadata[key].duration);
 			}
 
-			let data = {
+			const data = {
 				filter,
 				durations,
 				counts,
@@ -339,15 +339,15 @@ export class PreferencesEditor extends BaseEditor {
 
 class SettingsNavigator extends ArrayNavigator<ISetting> {
 
-	public next(): ISetting {
+	next(): ISetting {
 		return super.next() || super.first();
 	}
 
-	public previous(): ISetting {
+	previous(): ISetting {
 		return super.previous() || super.last();
 	}
 
-	public reset(): void {
+	reset(): void {
 		this.index = this.start - 1;
 	}
 }
@@ -375,7 +375,7 @@ class PreferencesRenderersController extends Disposable {
 	private _lastFilterResult: IFilterResult;
 
 	private readonly _onDidFilterResultsCountChange: Emitter<IPreferencesCount> = this._register(new Emitter<IPreferencesCount>());
-	public readonly onDidFilterResultsCountChange: Event<IPreferencesCount> = this._onDidFilterResultsCountChange.event;
+	readonly onDidFilterResultsCountChange: Event<IPreferencesCount> = this._onDidFilterResultsCountChange.event;
 
 	constructor(
 		@IPreferencesSearchService private preferencesSearchService: IPreferencesSearchService,
@@ -754,7 +754,7 @@ class PreferencesRenderersController extends Disposable {
 		return settings;
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		dispose(this._defaultPreferencesRendererDisposables);
 		dispose(this._editablePreferencesRendererDisposables);
 		super.dispose();
@@ -848,7 +848,7 @@ class SideBySidePreferencesWidget extends Widget {
 		this._register(focusTracker.onDidFocus(() => this._onFocus.fire()));
 	}
 
-	public setInput(defaultPreferencesEditorInput: DefaultPreferencesEditorInput, editablePreferencesEditorInput: EditorInput, options: EditorOptions, token: CancellationToken): Promise<{ defaultPreferencesRenderer?: IPreferencesRenderer<ISetting>, editablePreferencesRenderer?: IPreferencesRenderer<ISetting> }> {
+	setInput(defaultPreferencesEditorInput: DefaultPreferencesEditorInput, editablePreferencesEditorInput: EditorInput, options: EditorOptions, token: CancellationToken): Promise<{ defaultPreferencesRenderer?: IPreferencesRenderer<ISetting>, editablePreferencesRenderer?: IPreferencesRenderer<ISetting> }> {
 		this.getOrCreateEditablePreferencesEditor(editablePreferencesEditorInput);
 		this.settingsTargetsWidget.settingsTarget = this.getSettingsTarget(editablePreferencesEditorInput.getResource());
 		return Promise.all([
@@ -877,26 +877,26 @@ class SideBySidePreferencesWidget extends Widget {
 		return '';
 	}
 
-	public setResultCount(settingsTarget: SettingsTarget, count: number): void {
+	setResultCount(settingsTarget: SettingsTarget, count: number): void {
 		this.settingsTargetsWidget.setResultCount(settingsTarget, count);
 	}
 
-	public layout(dimension: DOM.Dimension = this.dimension): void {
+	layout(dimension: DOM.Dimension = this.dimension): void {
 		this.dimension = dimension;
 		this.splitview.layout(dimension.width);
 	}
 
-	public focus(): void {
+	focus(): void {
 		if (this.lastFocusedEditor) {
 			this.lastFocusedEditor.focus();
 		}
 	}
 
-	public getControl(): IEditorControl {
+	getControl(): IEditorControl {
 		return this.editablePreferencesEditor ? this.editablePreferencesEditor.getControl() : null;
 	}
 
-	public clearInput(): void {
+	clearInput(): void {
 		if (this.defaultPreferencesEditor) {
 			this.defaultPreferencesEditor.clearInput();
 		}
@@ -905,7 +905,7 @@ class SideBySidePreferencesWidget extends Widget {
 		}
 	}
 
-	public setEditorVisible(visible: boolean, group: IEditorGroup): void {
+	setEditorVisible(visible: boolean, group: IEditorGroup): void {
 		this.isVisible = visible;
 		this.group = group;
 
@@ -973,7 +973,7 @@ class SideBySidePreferencesWidget extends Widget {
 		}
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.disposeEditors();
 		super.dispose();
 	}
@@ -981,7 +981,7 @@ class SideBySidePreferencesWidget extends Widget {
 
 export class DefaultPreferencesEditor extends BaseTextEditor {
 
-	public static readonly ID: string = 'workbench.editor.defaultPreferences';
+	static readonly ID: string = 'workbench.editor.defaultPreferences';
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -998,13 +998,13 @@ export class DefaultPreferencesEditor extends BaseTextEditor {
 	}
 
 	private static _getContributions(): IEditorContributionCtor[] {
-		let skipContributions = [FoldingController.prototype, SelectionHighlighter.prototype, FindController.prototype];
-		let contributions = EditorExtensionsRegistry.getEditorContributions().filter(c => skipContributions.indexOf(c.prototype) === -1);
+		const skipContributions = [FoldingController.prototype, SelectionHighlighter.prototype, FindController.prototype];
+		const contributions = EditorExtensionsRegistry.getEditorContributions().filter(c => skipContributions.indexOf(c.prototype) === -1);
 		contributions.push(DefaultSettingsEditorContribution);
 		return contributions;
 	}
 
-	public createEditorControl(parent: HTMLElement, configuration: IEditorOptions): editorCommon.IEditor {
+	createEditorControl(parent: HTMLElement, configuration: IEditorOptions): editorCommon.IEditor {
 		const editor = this.instantiationService.createInstance(CodeEditorWidget, parent, configuration, { contributions: DefaultPreferencesEditor._getContributions() });
 
 		// Inform user about editor being readonly if user starts type
@@ -1060,7 +1060,7 @@ export class DefaultPreferencesEditor extends BaseTextEditor {
 				}));
 	}
 
-	public clearInput(): void {
+	clearInput(): void {
 		// Clear Model
 		this.getControl().setModel(null);
 
@@ -1068,7 +1068,7 @@ export class DefaultPreferencesEditor extends BaseTextEditor {
 		super.clearInput();
 	}
 
-	public layout(dimension: DOM.Dimension) {
+	layout(dimension: DOM.Dimension) {
 		this.getControl().layout(dimension);
 	}
 

src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts

@@ -57,17 +57,17 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 	private associatedPreferencesModel: IPreferencesEditorModel<ISetting>;
 
 	private readonly _onFocusPreference = new Emitter<ISetting>();
-	public readonly onFocusPreference: Event<ISetting> = this._onFocusPreference.event;
+	readonly onFocusPreference: Event<ISetting> = this._onFocusPreference.event;
 
 	private readonly _onClearFocusPreference = new Emitter<ISetting>();
-	public readonly onClearFocusPreference: Event<ISetting> = this._onClearFocusPreference.event;
+	readonly onClearFocusPreference: Event<ISetting> = this._onClearFocusPreference.event;
 
 	private readonly _onUpdatePreference: Emitter<{ key: string, value: any, source: IIndexedSetting }> = new Emitter<{ key: string, value: any, source: IIndexedSetting }>();
-	public readonly onUpdatePreference: Event<{ key: string, value: any, source: IIndexedSetting }> = this._onUpdatePreference.event;
+	readonly onUpdatePreference: Event<{ key: string, value: any, source: IIndexedSetting }> = this._onUpdatePreference.event;
 
 	private filterResult: IFilterResult;
 
-	constructor(protected editor: ICodeEditor, public readonly preferencesModel: SettingsEditorModel,
+	constructor(protected editor: ICodeEditor, readonly preferencesModel: SettingsEditorModel,
 		@IPreferencesService protected preferencesService: IPreferencesService,
 		@IConfigurationService private configurationService: IConfigurationService,
 		@IInstantiationService protected instantiationService: IInstantiationService
@@ -81,11 +81,11 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 
 	}
 
-	public getAssociatedPreferencesModel(): IPreferencesEditorModel<ISetting> {
+	getAssociatedPreferencesModel(): IPreferencesEditorModel<ISetting> {
 		return this.associatedPreferencesModel;
 	}
 
-	public setAssociatedPreferencesModel(associatedPreferencesModel: IPreferencesEditorModel<ISetting>): void {
+	setAssociatedPreferencesModel(associatedPreferencesModel: IPreferencesEditorModel<ISetting>): void {
 		this.associatedPreferencesModel = associatedPreferencesModel;
 		this.editSettingActionRenderer.associatedPreferencesModel = associatedPreferencesModel;
 
@@ -97,7 +97,7 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 		this._register(new SettingsHeaderWidget(this.editor, '')).setMessage(nls.localize('emptyUserSettingsHeader', "Place your settings here to override the Default Settings."));
 	}
 
-	public render(): void {
+	render(): void {
 		this.editSettingActionRenderer.render(this.preferencesModel.settingsGroups, this.associatedPreferencesModel);
 		if (this.filterResult) {
 			this.filterPreferences(this.filterResult);
@@ -109,7 +109,7 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 		this.updatePreference(key, value, source);
 	}
 
-	public updatePreference(key: string, value: any, source: IIndexedSetting): void {
+	updatePreference(key: string, value: any, source: IIndexedSetting): void {
 		const overrideIdentifier = source.overrideOf ? overrideIdentifierFromKey(source.overrideOf.key) : null;
 		const resource = this.preferencesModel.uri;
 		this.configurationService.updateValue(key, value, { overrideIdentifier, resource }, this.preferencesModel.configurationTarget)
@@ -149,13 +149,13 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 		return this.preferencesModel.getPreference(key);
 	}
 
-	public filterPreferences(filterResult: IFilterResult): void {
+	filterPreferences(filterResult: IFilterResult): void {
 		this.filterResult = filterResult;
 		this.settingHighlighter.clear(true);
 		this.highlightMatchesRenderer.render(filterResult ? filterResult.matches : []);
 	}
 
-	public focusPreference(setting: ISetting): void {
+	focusPreference(setting: ISetting): void {
 		const s = this.getSetting(setting);
 		if (s) {
 			this.settingHighlighter.highlight(s, true);
@@ -165,11 +165,11 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 		}
 	}
 
-	public clearFocus(setting: ISetting): void {
+	clearFocus(setting: ISetting): void {
 		this.settingHighlighter.clear(true);
 	}
 
-	public editPreference(setting: ISetting): boolean {
+	editPreference(setting: ISetting): boolean {
 		const editableSetting = this.getSetting(setting);
 		return editableSetting && this.editSettingActionRenderer.activateOnSetting(editableSetting);
 	}
@@ -193,12 +193,12 @@ export class WorkspaceSettingsRenderer extends UserSettingsRenderer implements I
 		this._register(new SettingsHeaderWidget(this.editor, '')).setMessage(nls.localize('emptyWorkspaceSettingsHeader', "Place your settings here to override the User Settings."));
 	}
 
-	public setAssociatedPreferencesModel(associatedPreferencesModel: IPreferencesEditorModel<ISetting>): void {
+	setAssociatedPreferencesModel(associatedPreferencesModel: IPreferencesEditorModel<ISetting>): void {
 		super.setAssociatedPreferencesModel(associatedPreferencesModel);
 		this.workspaceConfigurationRenderer.render(this.getAssociatedPreferencesModel());
 	}
 
-	public render(): void {
+	render(): void {
 		super.render();
 		this.workspaceConfigurationRenderer.render(this.getAssociatedPreferencesModel());
 	}
@@ -234,15 +234,15 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR
 	private filterResult: IFilterResult;
 
 	private readonly _onUpdatePreference: Emitter<{ key: string, value: any, source: IIndexedSetting }> = new Emitter<{ key: string, value: any, source: IIndexedSetting }>();
-	public readonly onUpdatePreference: Event<{ key: string, value: any, source: IIndexedSetting }> = this._onUpdatePreference.event;
+	readonly onUpdatePreference: Event<{ key: string, value: any, source: IIndexedSetting }> = this._onUpdatePreference.event;
 
 	private readonly _onFocusPreference = new Emitter<ISetting>();
-	public readonly onFocusPreference: Event<ISetting> = this._onFocusPreference.event;
+	readonly onFocusPreference: Event<ISetting> = this._onFocusPreference.event;
 
 	private readonly _onClearFocusPreference = new Emitter<ISetting>();
-	public readonly onClearFocusPreference: Event<ISetting> = this._onClearFocusPreference.event;
+	readonly onClearFocusPreference: Event<ISetting> = this._onClearFocusPreference.event;
 
-	constructor(protected editor: ICodeEditor, public readonly preferencesModel: DefaultSettingsEditorModel,
+	constructor(protected editor: ICodeEditor, readonly preferencesModel: DefaultSettingsEditorModel,
 		@IPreferencesService protected preferencesService: IPreferencesService,
 		@IInstantiationService protected instantiationService: IInstantiationService,
 	) {
@@ -260,16 +260,16 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR
 		this._register(preferencesModel.onDidChangeGroups(() => this.render()));
 	}
 
-	public getAssociatedPreferencesModel(): IPreferencesEditorModel<ISetting> {
+	getAssociatedPreferencesModel(): IPreferencesEditorModel<ISetting> {
 		return this._associatedPreferencesModel;
 	}
 
-	public setAssociatedPreferencesModel(associatedPreferencesModel: IPreferencesEditorModel<ISetting>): void {
+	setAssociatedPreferencesModel(associatedPreferencesModel: IPreferencesEditorModel<ISetting>): void {
 		this._associatedPreferencesModel = associatedPreferencesModel;
 		this.editSettingActionRenderer.associatedPreferencesModel = associatedPreferencesModel;
 	}
 
-	public render() {
+	render() {
 		this.settingsGroupTitleRenderer.render(this.preferencesModel.settingsGroups);
 		this.editSettingActionRenderer.render(this.preferencesModel.settingsGroups, this._associatedPreferencesModel);
 		this.settingHighlighter.clear(true);
@@ -278,7 +278,7 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR
 		this.hiddenAreasRenderer.render();
 	}
 
-	public filterPreferences(filterResult: IFilterResult): void {
+	filterPreferences(filterResult: IFilterResult): void {
 		this.filterResult = filterResult;
 
 		if (filterResult) {
@@ -301,7 +301,7 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR
 		this.hiddenAreasRenderer.render();
 	}
 
-	public focusPreference(s: ISetting): void {
+	focusPreference(s: ISetting): void {
 		const setting = this.getSetting(s);
 		if (setting) {
 			this.settingsGroupTitleRenderer.showSetting(setting);
@@ -339,14 +339,14 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR
 		return null;
 	}
 
-	public clearFocus(setting: ISetting): void {
+	clearFocus(setting: ISetting): void {
 		this.settingHighlighter.clear(true);
 	}
 
-	public updatePreference(key: string, value: any, source: ISetting): void {
+	updatePreference(key: string, value: any, source: ISetting): void {
 	}
 
-	public editPreference(setting: ISetting): boolean {
+	editPreference(setting: ISetting): boolean {
 		return this.editSettingActionRenderer.activateOnSetting(setting);
 	}
 }
@@ -420,7 +420,7 @@ export class BracesHidingRenderer extends Disposable implements HiddenAreasProvi
 class DefaultSettingsHeaderRenderer extends Disposable {
 
 	private settingsHeaderWidget: DefaultSettingsHeaderWidget;
-	public readonly onClick: Event<void>;
+	readonly onClick: Event<void>;
 
 	constructor(editor: ICodeEditor) {
 		super();
@@ -428,7 +428,7 @@ class DefaultSettingsHeaderRenderer extends Disposable {
 		this.onClick = this.settingsHeaderWidget.onClick;
 	}
 
-	public render(filterResult: IFilterResult) {
+	render(filterResult: IFilterResult) {
 		const hasSettings = !filterResult || filterResult.filteredGroups.length > 0;
 		this.settingsHeaderWidget.toggleMessage(hasSettings);
 	}
@@ -450,7 +450,7 @@ export class SettingsGroupTitleRenderer extends Disposable implements HiddenArea
 		super();
 	}
 
-	public get hiddenAreas(): IRange[] {
+	get hiddenAreas(): IRange[] {
 		const hiddenAreas: IRange[] = [];
 		for (const group of this.hiddenGroups) {
 			hiddenAreas.push(group.range);
@@ -458,7 +458,7 @@ export class SettingsGroupTitleRenderer extends Disposable implements HiddenArea
 		return hiddenAreas;
 	}
 
-	public render(settingsGroups: ISettingsGroup[]) {
+	render(settingsGroups: ISettingsGroup[]) {
 		this.disposeWidgets();
 		if (!settingsGroups) {
 			return;
@@ -480,7 +480,7 @@ export class SettingsGroupTitleRenderer extends Disposable implements HiddenArea
 		this.settingsGroupTitleWidgets.reverse();
 	}
 
-	public showGroup(groupIdx: number) {
+	showGroup(groupIdx: number) {
 		const shownGroup = this.settingsGroupTitleWidgets[groupIdx].settingsGroup;
 
 		this.hiddenGroups = this.settingsGroups.filter(g => g !== shownGroup);
@@ -490,7 +490,7 @@ export class SettingsGroupTitleRenderer extends Disposable implements HiddenArea
 		this._onHiddenAreasChanged.fire();
 	}
 
-	public showSetting(setting: ISetting): void {
+	showSetting(setting: ISetting): void {
 		const settingsGroupTitleWidget = this.settingsGroupTitleWidgets.filter(widget => Range.containsRange(widget.settingsGroup.range, setting.range))[0];
 		if (settingsGroupTitleWidget && settingsGroupTitleWidget.isCollapsed()) {
 			settingsGroupTitleWidget.toggleCollapse(false);
@@ -518,7 +518,7 @@ export class SettingsGroupTitleRenderer extends Disposable implements HiddenArea
 		this.disposables = dispose(this.disposables);
 	}
 
-	public dispose() {
+	dispose() {
 		this.disposeWidgets();
 		super.dispose();
 	}
@@ -531,7 +531,7 @@ export class HiddenAreasRenderer extends Disposable {
 		super();
 	}
 
-	public render() {
+	render() {
 		const ranges: IRange[] = [];
 		for (const hiddenAreaProvider of this.hiddenAreasProviders) {
 			ranges.push(...hiddenAreaProvider.hiddenAreas);
@@ -539,7 +539,7 @@ export class HiddenAreasRenderer extends Disposable {
 		this.editor.setHiddenAreas(ranges);
 	}
 
-	public dispose() {
+	dispose() {
 		this.editor.setHiddenAreas([]);
 		super.dispose();
 	}
@@ -548,14 +548,14 @@ export class HiddenAreasRenderer extends Disposable {
 export class FilteredMatchesRenderer extends Disposable implements HiddenAreasProvider {
 
 	private decorationIds: string[] = [];
-	public hiddenAreas: IRange[] = [];
+	hiddenAreas: IRange[] = [];
 
 	constructor(private editor: ICodeEditor
 	) {
 		super();
 	}
 
-	public render(result: IFilterResult, allSettingsGroups: ISettingsGroup[]): void {
+	render(result: IFilterResult, allSettingsGroups: ISettingsGroup[]): void {
 		const model = this.editor.getModel();
 		this.hiddenAreas = [];
 		if (result) {
@@ -596,7 +596,7 @@ export class FilteredMatchesRenderer extends Disposable implements HiddenAreasPr
 		return notMatchesRanges;
 	}
 
-	public dispose() {
+	dispose() {
 		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
 		super.dispose();
 	}
@@ -611,7 +611,7 @@ export class HighlightMatchesRenderer extends Disposable {
 		super();
 	}
 
-	public render(matches: IRange[]): void {
+	render(matches: IRange[]): void {
 		const model = this.editor.getModel();
 		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, matches.map(match => this.createDecoration(match, model)));
 	}
@@ -628,7 +628,7 @@ export class HighlightMatchesRenderer extends Disposable {
 		};
 	}
 
-	public dispose() {
+	dispose() {
 		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
 		super.dispose();
 	}
@@ -645,11 +645,11 @@ class EditSettingRenderer extends Disposable {
 	private editPreferenceWidgetForMouseMove: EditPreferenceWidget<IIndexedSetting>;
 
 	private settingsGroups: ISettingsGroup[] = [];
-	public associatedPreferencesModel: IPreferencesEditorModel<ISetting>;
+	associatedPreferencesModel: IPreferencesEditorModel<ISetting>;
 	private toggleEditPreferencesForMouseMoveDelayer: Delayer<void>;
 
 	private readonly _onUpdateSetting: Emitter<{ key: string, value: any, source: IIndexedSetting }> = new Emitter<{ key: string, value: any, source: IIndexedSetting }>();
-	public readonly onUpdateSetting: Event<{ key: string, value: any, source: IIndexedSetting }> = this._onUpdateSetting.event;
+	readonly onUpdateSetting: Event<{ key: string, value: any, source: IIndexedSetting }> = this._onUpdateSetting.event;
 
 	constructor(private editor: ICodeEditor, private masterSettingsModel: ISettingsEditorModel,
 		private settingHighlighter: SettingHighlighter,
@@ -670,7 +670,7 @@ class EditSettingRenderer extends Disposable {
 		this._register(this.editor.onDidChangeConfiguration(() => this.onConfigurationChanged()));
 	}
 
-	public render(settingsGroups: ISettingsGroup[], associatedPreferencesModel: IPreferencesEditorModel<ISetting>): void {
+	render(settingsGroups: ISettingsGroup[], associatedPreferencesModel: IPreferencesEditorModel<ISetting>): void {
 		this.editPreferenceWidgetForCursorPosition.hide();
 		this.editPreferenceWidgetForMouseMove.hide();
 		this.settingsGroups = settingsGroups;
@@ -759,7 +759,7 @@ class EditSettingRenderer extends Disposable {
 	private getSettings(lineNumber: number): IIndexedSetting[] {
 		const configurationMap = this.getConfigurationsMap();
 		return this.getSettingsAtLineNumber(lineNumber).filter(setting => {
-			let configurationNode = configurationMap[setting.key];
+			const configurationNode = configurationMap[setting.key];
 			if (configurationNode) {
 				if (this.isDefaultSettings()) {
 					if (setting.key === 'launch') {
@@ -831,7 +831,7 @@ class EditSettingRenderer extends Disposable {
 		});
 	}
 
-	public activateOnSetting(setting: ISetting): boolean {
+	activateOnSetting(setting: ISetting): boolean {
 		const startLine = setting.keyRange.startLineNumber;
 		const settings = this.getSettings(startLine);
 		if (!settings.length) {
@@ -959,7 +959,7 @@ class WorkspaceConfigurationRenderer extends Disposable {
 		this._register(this.editor.getModel().onDidChangeContent(() => this.renderingDelayer.trigger(() => this.render(this.associatedSettingsEditorModel))));
 	}
 
-	public render(associatedSettingsEditorModel: IPreferencesEditorModel<ISetting>): void {
+	render(associatedSettingsEditorModel: IPreferencesEditorModel<ISetting>): void {
 		this.associatedSettingsEditorModel = associatedSettingsEditorModel;
 		// Dim other configurations in workspace configuration file only in the context of Settings Editor
 		if (this.associatedSettingsEditorModel && this.workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE && this.workspaceSettingsEditorModel instanceof WorkspaceConfigurationEditorModel) {
@@ -994,7 +994,7 @@ class WorkspaceConfigurationRenderer extends Disposable {
 		};
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
 		super.dispose();
 	}

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

@@ -76,7 +76,7 @@ export class SettingsHeaderWidget extends Widget implements IViewZone {
 		});
 	}
 
-	public setMessage(message: string): void {
+	setMessage(message: string): void {
 		this.messageElement.textContent = message;
 	}
 
@@ -88,7 +88,7 @@ export class SettingsHeaderWidget extends Widget implements IViewZone {
 		}
 	}
 
-	public dispose() {
+	dispose() {
 		this.editor.changeViewZones(accessor => {
 			accessor.removeZone(this.id);
 		});
@@ -99,7 +99,7 @@ export class SettingsHeaderWidget extends Widget implements IViewZone {
 export class DefaultSettingsHeaderWidget extends SettingsHeaderWidget {
 
 	private _onClick = this._register(new Emitter<void>());
-	public readonly onClick: Event<void> = this._onClick.event;
+	readonly onClick: Event<void> = this._onClick.event;
 
 	protected create() {
 		super.create();
@@ -107,7 +107,7 @@ export class DefaultSettingsHeaderWidget extends SettingsHeaderWidget {
 		this.toggleMessage(true);
 	}
 
-	public toggleMessage(hasSettings: boolean): void {
+	toggleMessage(hasSettings: boolean): void {
 		if (hasSettings) {
 			this.setMessage(localize('defaultSettings', "Place your settings in the right hand side editor to override."));
 		} else {
@@ -127,7 +127,7 @@ export class SettingsGroupTitleWidget extends Widget implements IViewZone {
 	private title: HTMLElement;
 
 	private _onToggled = this._register(new Emitter<boolean>());
-	public readonly onToggled: Event<boolean> = this._onToggled.event;
+	readonly onToggled: Event<boolean> = this._onToggled.event;
 
 	private previousPosition: Position;
 
@@ -170,7 +170,7 @@ export class SettingsGroupTitleWidget extends Widget implements IViewZone {
 		this.layout();
 	}
 
-	public render() {
+	render() {
 		if (!this.settingsGroup.range) {
 			// #61352
 			return;
@@ -183,15 +183,15 @@ export class SettingsGroupTitleWidget extends Widget implements IViewZone {
 		});
 	}
 
-	public toggleCollapse(collapse: boolean) {
+	toggleCollapse(collapse: boolean) {
 		DOM.toggleClass(this.titleContainer, 'collapsed', collapse);
 	}
 
-	public toggleFocus(focus: boolean): void {
+	toggleFocus(focus: boolean): void {
 		DOM.toggleClass(this.titleContainer, 'focused', focus);
 	}
 
-	public isCollapsed(): boolean {
+	isCollapsed(): boolean {
 		return DOM.hasClass(this.titleContainer, 'collapsed');
 	}
 
@@ -276,7 +276,7 @@ export class SettingsGroupTitleWidget extends Widget implements IViewZone {
 		return false;
 	}
 
-	public dispose() {
+	dispose() {
 		this.editor.changeViewZones(accessor => {
 			accessor.removeZone(this.id);
 		});
@@ -317,13 +317,13 @@ export class FolderSettingsActionItem extends BaseActionItem {
 		this.update();
 	}
 
-	public setCount(settingsTarget: URI, count: number): void {
+	setCount(settingsTarget: URI, count: number): void {
 		const folder = this.contextService.getWorkspaceFolder(settingsTarget).uri;
 		this._folderSettingCounts.set(folder.toString(), count);
 		this.update();
 	}
 
-	public render(container: HTMLElement): void {
+	render(container: HTMLElement): void {
 		this.element = container;
 
 		this.container = container;
@@ -354,7 +354,7 @@ export class FolderSettingsActionItem extends BaseActionItem {
 		}
 	}
 
-	public onClick(event: DOM.EventLike): void {
+	onClick(event: DOM.EventLike): void {
 		DOM.EventHelper.stop(event, true);
 		if (!this.folder || this._action.checked) {
 			this.showMenu();
@@ -450,7 +450,7 @@ export class FolderSettingsActionItem extends BaseActionItem {
 		return label;
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		dispose(this.disposables);
 		super.dispose();
 	}
@@ -468,7 +468,7 @@ export class SettingsTargetsWidget extends Widget {
 	private _settingsTarget: SettingsTarget;
 
 	private readonly _onDidTargetChange = new Emitter<SettingsTarget>();
-	public readonly onDidTargetChange: Event<SettingsTarget> = this._onDidTargetChange.event;
+	readonly onDidTargetChange: Event<SettingsTarget> = this._onDidTargetChange.event;
 
 	constructor(
 		parent: HTMLElement,
@@ -504,11 +504,11 @@ export class SettingsTargetsWidget extends Widget {
 		this.settingsSwitcherBar.push([this.userSettings, this.workspaceSettings, folderSettingsAction]);
 	}
 
-	public get settingsTarget(): SettingsTarget {
+	get settingsTarget(): SettingsTarget {
 		return this._settingsTarget;
 	}
 
-	public set settingsTarget(settingsTarget: SettingsTarget) {
+	set settingsTarget(settingsTarget: SettingsTarget) {
 		this._settingsTarget = settingsTarget;
 		this.userSettings.checked = ConfigurationTarget.USER === this.settingsTarget;
 		this.workspaceSettings.checked = ConfigurationTarget.WORKSPACE === this.settingsTarget;
@@ -520,7 +520,7 @@ export class SettingsTargetsWidget extends Widget {
 		}
 	}
 
-	public setResultCount(settingsTarget: SettingsTarget, count: number): void {
+	setResultCount(settingsTarget: SettingsTarget, count: number): void {
 		if (settingsTarget === ConfigurationTarget.WORKSPACE) {
 			let label = localize('workspaceSettings', "Workspace Settings");
 			if (count) {
@@ -548,7 +548,7 @@ export class SettingsTargetsWidget extends Widget {
 		}
 	}
 
-	public updateTarget(settingsTarget: SettingsTarget): Promise<void> {
+	updateTarget(settingsTarget: SettingsTarget): Promise<void> {
 		const isSameTarget = this.settingsTarget === settingsTarget || settingsTarget instanceof URI && this.settingsTarget instanceof URI && this.settingsTarget.toString() === settingsTarget.toString();
 		if (!isSameTarget) {
 			this.settingsTarget = settingsTarget;
@@ -574,7 +574,7 @@ export interface SearchOptions extends IInputOptions {
 
 export class SearchWidget extends Widget {
 
-	public domNode: HTMLElement;
+	domNode: HTMLElement;
 
 	private countElement: HTMLElement;
 	private searchContainer: HTMLElement;
@@ -582,10 +582,10 @@ export class SearchWidget extends Widget {
 	private controlsDiv: HTMLElement;
 
 	private readonly _onDidChange: Emitter<string> = this._register(new Emitter<string>());
-	public readonly onDidChange: Event<string> = this._onDidChange.event;
+	readonly onDidChange: Event<string> = this._onDidChange.event;
 
 	private readonly _onFocus: Emitter<void> = this._register(new Emitter<void>());
-	public readonly onFocus: Event<void> = this._onFocus.event;
+	readonly onFocus: Event<void> = this._onFocus.event;
 
 	constructor(parent: HTMLElement, protected options: SearchOptions,
 		@IContextViewService private contextViewService: IContextViewService,
@@ -645,7 +645,7 @@ export class SearchWidget extends Widget {
 		return box;
 	}
 
-	public showMessage(message: string): void {
+	showMessage(message: string): void {
 		// Avoid setting the aria-label unnecessarily, the screenreader will read the count every time it's set, since it's aria-live:assertive. #50968
 		if (this.countElement && message !== this.countElement.textContent) {
 			this.countElement.textContent = message;
@@ -654,7 +654,7 @@ export class SearchWidget extends Widget {
 		}
 	}
 
-	public layout(dimension: DOM.Dimension) {
+	layout(dimension: DOM.Dimension) {
 		if (dimension.width < 400) {
 			if (this.countElement) {
 				DOM.addClass(this.countElement, 'hide');
@@ -675,30 +675,30 @@ export class SearchWidget extends Widget {
 		return countWidth + 20;
 	}
 
-	public focus() {
+	focus() {
 		this.inputBox.focus();
 		if (this.getValue()) {
 			this.inputBox.select();
 		}
 	}
 
-	public hasFocus(): boolean {
+	hasFocus(): boolean {
 		return this.inputBox.hasFocus();
 	}
 
-	public clear() {
+	clear() {
 		this.inputBox.value = '';
 	}
 
-	public getValue(): string {
+	getValue(): string {
 		return this.inputBox.value;
 	}
 
-	public setValue(value: string): string {
+	setValue(value: string): string {
 		return this.inputBox.value = value;
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		if (this.options.focusKey) {
 			this.options.focusKey.set(false);
 		}
@@ -708,7 +708,7 @@ export class SearchWidget extends Widget {
 
 export class EditPreferenceWidget<T> extends Disposable {
 
-	public static readonly GLYPH_MARGIN_CLASS_NAME = 'edit-preferences-widget';
+	static readonly GLYPH_MARGIN_CLASS_NAME = 'edit-preferences-widget';
 
 	private _line: number;
 	private _preferences: T[];
@@ -716,7 +716,7 @@ export class EditPreferenceWidget<T> extends Disposable {
 	private _editPreferenceDecoration: string[];
 
 	private readonly _onClick = new Emitter<IEditorMouseEvent>();
-	public get onClick(): Event<IEditorMouseEvent> { return this._onClick.event; }
+	get onClick(): Event<IEditorMouseEvent> { return this._onClick.event; }
 
 	constructor(private editor: ICodeEditor
 	) {

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

@@ -253,25 +253,25 @@ export abstract class AbstractSettingRenderer implements ITreeRenderer<SettingsT
 	/** To override */
 	templateId = undefined;
 
-	public static readonly CONTROL_CLASS = 'setting-control-focus-target';
-	public static readonly CONTROL_SELECTOR = '.' + AbstractSettingRenderer.CONTROL_CLASS;
+	static readonly CONTROL_CLASS = 'setting-control-focus-target';
+	static readonly CONTROL_SELECTOR = '.' + AbstractSettingRenderer.CONTROL_CLASS;
 
-	public static readonly SETTING_KEY_ATTR = 'data-key';
+	static readonly SETTING_KEY_ATTR = 'data-key';
 
 	private readonly _onDidClickOverrideElement = new Emitter<ISettingOverrideClickEvent>();
-	public readonly onDidClickOverrideElement: Event<ISettingOverrideClickEvent> = this._onDidClickOverrideElement.event;
+	readonly onDidClickOverrideElement: Event<ISettingOverrideClickEvent> = this._onDidClickOverrideElement.event;
 
 	protected readonly _onDidChangeSetting = new Emitter<ISettingChangeEvent>();
-	public readonly onDidChangeSetting: Event<ISettingChangeEvent> = this._onDidChangeSetting.event;
+	readonly onDidChangeSetting: Event<ISettingChangeEvent> = this._onDidChangeSetting.event;
 
 	protected readonly _onDidOpenSettings = new Emitter<string>();
-	public readonly onDidOpenSettings: Event<string> = this._onDidOpenSettings.event;
+	readonly onDidOpenSettings: Event<string> = this._onDidOpenSettings.event;
 
 	private readonly _onDidClickSettingLink = new Emitter<ISettingLinkClickEvent>();
-	public readonly onDidClickSettingLink: Event<ISettingLinkClickEvent> = this._onDidClickSettingLink.event;
+	readonly onDidClickSettingLink: Event<ISettingLinkClickEvent> = this._onDidClickSettingLink.event;
 
 	private readonly _onDidFocusSetting = new Emitter<SettingsTreeSettingElement>();
-	public readonly onDidFocusSetting: Event<SettingsTreeSettingElement> = this._onDidFocusSetting.event;
+	readonly onDidFocusSetting: Event<SettingsTreeSettingElement> = this._onDidFocusSetting.event;
 
 	// Put common injections back here
 	constructor(
@@ -414,7 +414,7 @@ export abstract class AbstractSettingRenderer implements ITreeRenderer<SettingsT
 			DOM.append(template.otherOverridesElement, $('span', null, `(${otherOverridesLabel}: `));
 
 			for (let i = 0; i < element.overriddenScopeList.length; i++) {
-				let view = DOM.append(template.otherOverridesElement, $('a.modified-scope', null, element.overriddenScopeList[i]));
+				const view = DOM.append(template.otherOverridesElement, $('a.modified-scope', null, element.overriddenScopeList[i]));
 
 				if (i !== element.overriddenScopeList.length - 1) {
 					DOM.append(template.otherOverridesElement, $('span', null, ', '));
@@ -826,7 +826,7 @@ export class SettingEnumRenderer extends AbstractSettingRenderer implements ITre
 		const enumDescriptions = dataElement.setting.enumDescriptions;
 		const enumDescriptionsAreMarkdown = dataElement.setting.enumDescriptionsAreMarkdown;
 
-		let displayOptions = dataElement.setting.enum
+		const displayOptions = dataElement.setting.enum
 			.map(String)
 			.map(escapeInvisibleChars)
 			.map((data, index) => <ISelectOptionItem>{
@@ -1000,18 +1000,18 @@ export class SettingBoolRenderer extends AbstractSettingRenderer implements ITre
 }
 
 export class SettingTreeRenderers {
-	public readonly onDidClickOverrideElement: Event<ISettingOverrideClickEvent>;
+	readonly onDidClickOverrideElement: Event<ISettingOverrideClickEvent>;
 
 	private readonly _onDidChangeSetting = new Emitter<ISettingChangeEvent>();
-	public readonly onDidChangeSetting: Event<ISettingChangeEvent>;
+	readonly onDidChangeSetting: Event<ISettingChangeEvent>;
 
-	public readonly onDidOpenSettings: Event<string>;
+	readonly onDidOpenSettings: Event<string>;
 
-	public readonly onDidClickSettingLink: Event<ISettingLinkClickEvent>;
+	readonly onDidClickSettingLink: Event<ISettingLinkClickEvent>;
 
-	public readonly onDidFocusSetting: Event<SettingsTreeSettingElement>;
+	readonly onDidFocusSetting: Event<SettingsTreeSettingElement>;
 
-	public readonly allRenderers: ITreeRenderer<SettingsTreeElement, never, any>[];
+	readonly allRenderers: ITreeRenderer<SettingsTreeElement, never, any>[];
 
 	private readonly settingActions: IAction[];
 
@@ -1059,7 +1059,7 @@ export class SettingTreeRenderers {
 		];
 	}
 
-	public cancelSuggesters() {
+	cancelSuggesters() {
 		this._contextViewService.hideContextView();
 	}
 

src/vs/workbench/parts/preferences/browser/settingsTreeModels.ts

@@ -408,7 +408,7 @@ export function isExcludeSetting(setting: ISetting): boolean {
 
 function settingTypeEnumRenderable(_type: string | string[]) {
 	const enumRenderableSettingTypes = ['string', 'boolean', 'null', 'integer', 'number'];
-	let type = isArray(_type) ? _type : [_type];
+	const type = isArray(_type) ? _type : [_type];
 	return type.every(type => enumRenderableSettingTypes.indexOf(type) > -1);
 }
 

src/vs/workbench/parts/preferences/browser/settingsWidgets.ts

@@ -204,7 +204,7 @@ export class ExcludeSettingWidget extends Disposable {
 	private model = new ExcludeSettingListModel();
 
 	private readonly _onDidChangeExclude = new Emitter<IExcludeChangeEvent>();
-	public readonly onDidChangeExclude: Event<IExcludeChangeEvent> = this._onDidChangeExclude.event;
+	readonly onDidChangeExclude: Event<IExcludeChangeEvent> = this._onDidChangeExclude.event;
 
 	get domNode(): HTMLElement {
 		return this.listElement;

src/vs/workbench/parts/preferences/browser/tocTree.ts

@@ -26,25 +26,25 @@ export class TOCTreeModel {
 	constructor(private _viewState: ISettingsEditorViewState) {
 	}
 
-	public get settingsTreeRoot(): SettingsTreeGroupElement {
+	get settingsTreeRoot(): SettingsTreeGroupElement {
 		return this._settingsTreeRoot;
 	}
 
-	public set settingsTreeRoot(value: SettingsTreeGroupElement) {
+	set settingsTreeRoot(value: SettingsTreeGroupElement) {
 		this._settingsTreeRoot = value;
 		this.update();
 	}
 
-	public set currentSearchModel(model: SearchResultModel) {
+	set currentSearchModel(model: SearchResultModel) {
 		this._currentSearchModel = model;
 		this.update();
 	}
 
-	public get children(): SettingsTreeElement[] {
+	get children(): SettingsTreeElement[] {
 		return this._settingsTreeRoot.children;
 	}
 
-	public update(): void {
+	update(): void {
 		if (this._settingsTreeRoot) {
 			this.updateGroupCount(this._settingsTreeRoot);
 		}

src/vs/workbench/parts/preferences/common/preferencesContribution.ts

@@ -130,7 +130,7 @@ export class PreferencesContribution implements IWorkbenchContribution {
 			const languageSelection = this.modeService.create('jsonc');
 			const model = this.modelService.createModel(modelContent, languageSelection, uri);
 
-			let disposables: IDisposable[] = [];
+			const disposables: IDisposable[] = [];
 			disposables.push(schemaRegistry.onDidChangeSchema(schemaUri => {
 				if (schemaUri === uri.toString()) {
 					schema = schemaRegistry.getSchemaContributions().schemas[uri.toString()];
@@ -144,7 +144,7 @@ export class PreferencesContribution implements IWorkbenchContribution {
 		return null;
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.editorOpeningListener = dispose(this.editorOpeningListener);
 		this.settingsListener = dispose(this.settingsListener);
 	}

src/vs/workbench/parts/preferences/common/smartSnippetInserter.ts

@@ -19,7 +19,7 @@ export class SmartSnippetInserter {
 	private static hasOpenBrace(scanner: JSONScanner): boolean {
 
 		while (scanner.scan() !== JSONSyntaxKind.EOF) {
-			let kind = scanner.getToken();
+			const kind = scanner.getToken();
 
 			if (kind === JSONSyntaxKind.OpenBraceToken) {
 				return true;
@@ -31,11 +31,11 @@ export class SmartSnippetInserter {
 
 	private static offsetToPosition(model: ITextModel, offset: number): Position {
 		let offsetBeforeLine = 0;
-		let eolLength = model.getEOL().length;
-		let lineCount = model.getLineCount();
+		const eolLength = model.getEOL().length;
+		const lineCount = model.getLineCount();
 		for (let lineNumber = 1; lineNumber <= lineCount; lineNumber++) {
-			let lineTotalLength = model.getLineContent(lineNumber).length + eolLength;
-			let offsetAfterLine = offsetBeforeLine + lineTotalLength;
+			const lineTotalLength = model.getLineContent(lineNumber).length + eolLength;
+			const offsetAfterLine = offsetBeforeLine + lineTotalLength;
 
 			if (offsetAfterLine > offset) {
 				return new Position(
@@ -51,9 +51,9 @@ export class SmartSnippetInserter {
 		);
 	}
 
-	public static insertSnippet(model: ITextModel, _position: Position): InsertSnippetResult {
+	static insertSnippet(model: ITextModel, _position: Position): InsertSnippetResult {
 
-		let desiredPosition = model.getValueLengthInRange(new Range(1, 1, _position.lineNumber, _position.column));
+		const desiredPosition = model.getValueLengthInRange(new Range(1, 1, _position.lineNumber, _position.column));
 
 		// <INVALID> [ <BEFORE_OBJECT> { <INVALID> } <AFTER_OBJECT>, <BEFORE_OBJECT> { <INVALID> } <AFTER_OBJECT> ] <INVALID>
 		enum State {
@@ -65,11 +65,11 @@ export class SmartSnippetInserter {
 		let lastValidPos = -1;
 		let lastValidState = State.INVALID;
 
-		let scanner = createJSONScanner(model.getValue());
+		const scanner = createJSONScanner(model.getValue());
 		let arrayLevel = 0;
 		let objLevel = 0;
 
-		let checkRangeStatus = (pos: number, state: State) => {
+		const checkRangeStatus = (pos: number, state: State) => {
 			if (state !== State.INVALID && arrayLevel === 1 && objLevel === 0) {
 				currentState = state;
 				lastValidPos = pos;
@@ -83,8 +83,8 @@ export class SmartSnippetInserter {
 		};
 
 		while (scanner.scan() !== JSONSyntaxKind.EOF) {
-			let currentPos = scanner.getPosition();
-			let kind = scanner.getToken();
+			const currentPos = scanner.getPosition();
+			const kind = scanner.getToken();
 
 			let goodKind = false;
 			switch (kind) {
@@ -147,7 +147,7 @@ export class SmartSnippetInserter {
 		}
 
 		// no valid position found!
-		let modelLineCount = model.getLineCount();
+		const modelLineCount = model.getLineCount();
 		return {
 			position: new Position(modelLineCount, model.getLineMaxColumn(modelLineCount)),
 			prepend: '\n[',

src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts

@@ -86,7 +86,7 @@ interface ISerializedPreferencesEditorInput {
 // Register Preferences Editor Input Factory
 class PreferencesEditorInputFactory implements IEditorInputFactory {
 
-	public serialize(editorInput: EditorInput): string {
+	serialize(editorInput: EditorInput): string {
 		const input = <PreferencesEditorInput>editorInput;
 
 		if (input.details && input.master) {
@@ -114,7 +114,7 @@ class PreferencesEditorInputFactory implements IEditorInputFactory {
 		return null;
 	}
 
-	public deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): EditorInput {
+	deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): EditorInput {
 		const deserialized: ISerializedPreferencesEditorInput = JSON.parse(serializedEditorInput);
 
 		const registry = Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactories);
@@ -136,7 +136,7 @@ class PreferencesEditorInputFactory implements IEditorInputFactory {
 
 class KeybindingsEditorInputFactory implements IEditorInputFactory {
 
-	public serialize(editorInput: EditorInput): string {
+	serialize(editorInput: EditorInput): string {
 		const input = <KeybindingsEditorInput>editorInput;
 		return JSON.stringify({
 			name: input.getName(),
@@ -144,7 +144,7 @@ class KeybindingsEditorInputFactory implements IEditorInputFactory {
 		});
 	}
 
-	public deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): EditorInput {
+	deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): EditorInput {
 		return instantiationService.createInstance(KeybindingsEditorInput);
 	}
 }
@@ -154,14 +154,14 @@ interface ISerializedSettingsEditor2EditorInput {
 
 class SettingsEditor2InputFactory implements IEditorInputFactory {
 
-	public serialize(input: SettingsEditor2Input): string {
+	serialize(input: SettingsEditor2Input): string {
 		const serialized: ISerializedSettingsEditor2EditorInput = {
 		};
 
 		return JSON.stringify(serialized);
 	}
 
-	public deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): SettingsEditor2Input {
+	deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): SettingsEditor2Input {
 		return instantiationService.createInstance(
 			SettingsEditor2Input);
 	}
@@ -174,7 +174,7 @@ interface ISerializedDefaultPreferencesEditorInput {
 // Register Default Preferences Editor Input Factory
 class DefaultPreferencesEditorInputFactory implements IEditorInputFactory {
 
-	public serialize(editorInput: EditorInput): string {
+	serialize(editorInput: EditorInput): string {
 		const input = <DefaultPreferencesEditorInput>editorInput;
 
 		const serialized: ISerializedDefaultPreferencesEditorInput = { resource: input.getResource().toString() };
@@ -182,7 +182,7 @@ class DefaultPreferencesEditorInputFactory implements IEditorInputFactory {
 		return JSON.stringify(serialized);
 	}
 
-	public deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): EditorInput {
+	deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): EditorInput {
 		const deserialized: ISerializedDefaultPreferencesEditorInput = JSON.parse(serializedEditorInput);
 
 		return instantiationService.createInstance(DefaultPreferencesEditorInput, URI.parse(deserialized.resource));
@@ -541,7 +541,7 @@ abstract class SettingsCommand extends Command {
 }
 class StartSearchDefaultSettingsCommand extends SettingsCommand {
 
-	public runCommand(accessor: ServicesAccessor, args: any): void {
+	runCommand(accessor: ServicesAccessor, args: any): void {
 		const preferencesEditor = this.getPreferencesEditor(accessor);
 		if (preferencesEditor) {
 			preferencesEditor.focusSearch();
@@ -557,7 +557,7 @@ startSearchCommand.register();
 
 class ClearSearchResultsCommand extends SettingsCommand {
 
-	public runCommand(accessor: ServicesAccessor, args: any): void {
+	runCommand(accessor: ServicesAccessor, args: any): void {
 		const preferencesEditor = this.getPreferencesEditor(accessor);
 		if (preferencesEditor) {
 			preferencesEditor.clearSearchResults();
@@ -573,7 +573,7 @@ clearSearchResultsCommand.register();
 
 class FocusSettingsFileEditorCommand extends SettingsCommand {
 
-	public runCommand(accessor: ServicesAccessor, args: any): void {
+	runCommand(accessor: ServicesAccessor, args: any): void {
 		const preferencesEditor = this.getPreferencesEditor(accessor);
 		if (preferencesEditor instanceof PreferencesEditor) {
 			preferencesEditor.focusSettingsFileEditor();
@@ -598,7 +598,7 @@ focusSettingsFromSearchCommand.register();
 
 class FocusNextSearchResultCommand extends SettingsCommand {
 
-	public runCommand(accessor: ServicesAccessor, args: any): void {
+	runCommand(accessor: ServicesAccessor, args: any): void {
 		const preferencesEditor = this.getPreferencesEditor(accessor);
 		if (preferencesEditor instanceof PreferencesEditor) {
 			preferencesEditor.focusNextResult();
@@ -614,7 +614,7 @@ focusNextSearchResultCommand.register();
 
 class FocusPreviousSearchResultCommand extends SettingsCommand {
 
-	public runCommand(accessor: ServicesAccessor, args: any): void {
+	runCommand(accessor: ServicesAccessor, args: any): void {
 		const preferencesEditor = this.getPreferencesEditor(accessor);
 		if (preferencesEditor instanceof PreferencesEditor) {
 			preferencesEditor.focusPreviousResult();
@@ -630,7 +630,7 @@ focusPreviousSearchResultCommand.register();
 
 class EditFocusedSettingCommand extends SettingsCommand {
 
-	public runCommand(accessor: ServicesAccessor, args: any): void {
+	runCommand(accessor: ServicesAccessor, args: any): void {
 		const preferencesEditor = this.getPreferencesEditor(accessor);
 		if (preferencesEditor instanceof PreferencesEditor) {
 			preferencesEditor.editFocusedPreference();
@@ -646,7 +646,7 @@ editFocusedSettingCommand.register();
 
 class FocusSettingsListCommand extends SettingsCommand {
 
-	public runCommand(accessor: ServicesAccessor, args: any): void {
+	runCommand(accessor: ServicesAccessor, args: any): void {
 		const preferencesEditor = this.getPreferencesEditor(accessor);
 		if (preferencesEditor instanceof SettingsEditor2) {
 			preferencesEditor.focusSettings();
@@ -662,7 +662,7 @@ const focusSettingsListCommand = new FocusSettingsListCommand({
 focusSettingsListCommand.register();
 
 class ShowContextMenuCommand extends SettingsCommand {
-	public runCommand(accessor: ServicesAccessor, args: any): void {
+	runCommand(accessor: ServicesAccessor, args: any): void {
 		const preferencesEditor = this.getPreferencesEditor(accessor);
 		if (preferencesEditor instanceof SettingsEditor2) {
 			preferencesEditor.showContextMenu();

src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts

@@ -243,7 +243,7 @@ class RemoteSearchProvider implements ISearchProvider {
 			const metadata = allResponses[0];
 			metadata.requestCount = 1;
 
-			for (let response of allResponses.slice(1)) {
+			for (const response of allResponses.slice(1)) {
 				metadata.requestCount++;
 				metadata.scoredResults = { ...metadata.scoredResults, ...response.scoredResults };
 			}
@@ -440,7 +440,7 @@ class SettingMatches {
 	private readonly keyMatchingWords: Map<string, IRange[]> = new Map<string, IRange[]>();
 	private readonly valueMatchingWords: Map<string, IRange[]> = new Map<string, IRange[]>();
 
-	public readonly matches: IRange[];
+	readonly matches: IRange[];
 
 	constructor(searchString: string, setting: ISetting, private requireFullQueryMatch: boolean, private searchDescription, private valuesMatcher: (filter: string, setting: ISetting) => IRange[]) {
 		this.matches = distinct(this._findMatchesInSetting(searchString, setting), (match) => `${match.startLineNumber}_${match.startColumn}_${match.endLineNumber}_${match.endColumn}_`);
@@ -451,7 +451,7 @@ class SettingMatches {
 		if (setting.overrides && setting.overrides.length) {
 			for (const subSetting of setting.overrides) {
 				const subSettingMatches = new SettingMatches(searchString, subSetting, this.requireFullQueryMatch, this.searchDescription, this.valuesMatcher);
-				let words = searchString.split(' ');
+				const words = searchString.split(' ');
 				const descriptionRanges: IRange[] = this.getRangesForWords(words, this.descriptionMatchingWords, [subSettingMatches.descriptionMatchingWords, subSettingMatches.keyMatchingWords, subSettingMatches.valueMatchingWords]);
 				const keyRanges: IRange[] = this.getRangesForWords(words, this.keyMatchingWords, [subSettingMatches.descriptionMatchingWords, subSettingMatches.keyMatchingWords, subSettingMatches.valueMatchingWords]);
 				const subSettingKeyRanges: IRange[] = this.getRangesForWords(words, subSettingMatches.keyMatchingWords, [this.descriptionMatchingWords, this.keyMatchingWords, subSettingMatches.valueMatchingWords]);
@@ -467,7 +467,7 @@ class SettingMatches {
 		const registry: { [qualifiedKey: string]: IJSONSchema } = Registry.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurationProperties();
 		const schema: IJSONSchema = registry[setting.key];
 
-		let words = searchString.split(' ');
+		const words = searchString.split(' ');
 		const settingKeyAsWords: string = setting.key.split('.').join(' ');
 
 		for (const word of words) {

src/vs/workbench/parts/preferences/electron-browser/settingsEditor2.ts

@@ -59,7 +59,7 @@ const $ = DOM.$;
 const SETTINGS_EDITOR_STATE_KEY = 'settingsEditorState';
 export class SettingsEditor2 extends BaseEditor {
 
-	public static readonly ID: string = 'workbench.editor.settings2';
+	static readonly ID: string = 'workbench.editor.settings2';
 	private static NUM_INSTANCES: number = 0;
 	private static SETTING_UPDATE_FAST_DEBOUNCE: number = 200;
 	private static SETTING_UPDATE_SLOW_DEBOUNCE: number = 1000;
@@ -441,7 +441,7 @@ export class SettingsEditor2 extends BaseEditor {
 		}
 	}
 
-	public switchToSettingsFile(): Promise<IEditor> {
+	switchToSettingsFile(): Promise<IEditor> {
 		const query = parseQuery(this.searchWidget.getValue());
 		return this.openSettingsFile(query.query);
 	}

src/vs/workbench/services/preferences/common/keybindingsEditorModel.ts

@@ -88,7 +88,7 @@ export class KeybindingsEditorModel extends EditorModel {
 		};
 	}
 
-	public fetch(searchValue: string, sortByPrecedence: boolean = false): IKeybindingItemEntry[] {
+	fetch(searchValue: string, sortByPrecedence: boolean = false): IKeybindingItemEntry[] {
 		let keybindingItems = sortByPrecedence ? this._keybindingItemsSortedByPrecedence : this._keybindingItems;
 
 		if (/@source:\s*(user|default)/i.test(searchValue)) {
@@ -130,7 +130,7 @@ export class KeybindingsEditorModel extends EditorModel {
 		const words = searchValue.split(' ');
 		const keybindingWords = this.splitKeybindingWords(words);
 		for (const keybindingItem of keybindingItems) {
-			let keybindingMatches = new KeybindingItemMatches(this.modifierLabels, keybindingItem, searchValue, words, keybindingWords, completeMatch);
+			const keybindingMatches = new KeybindingItemMatches(this.modifierLabels, keybindingItem, searchValue, words, keybindingWords, completeMatch);
 			if (keybindingMatches.commandIdMatches
 				|| keybindingMatches.commandLabelMatches
 				|| keybindingMatches.commandDefaultLabelMatches
@@ -161,7 +161,7 @@ export class KeybindingsEditorModel extends EditorModel {
 		return result;
 	}
 
-	public resolve(editorActionsLabels: { [id: string]: string; }): Promise<EditorModel> {
+	resolve(editorActionsLabels: { [id: string]: string; }): Promise<EditorModel> {
 		const workbenchActionsRegistry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
 
 		this._keybindingItemsSortedByPrecedence = [];
@@ -248,12 +248,12 @@ export class KeybindingsEditorModel extends EditorModel {
 
 class KeybindingItemMatches {
 
-	public readonly commandIdMatches: IMatch[] | null = null;
-	public readonly commandLabelMatches: IMatch[] | null = null;
-	public readonly commandDefaultLabelMatches: IMatch[] | null = null;
-	public readonly sourceMatches: IMatch[] | null = null;
-	public readonly whenMatches: IMatch[] | null = null;
-	public readonly keybindingMatches: KeybindingMatches | null = null;
+	readonly commandIdMatches: IMatch[] | null = null;
+	readonly commandLabelMatches: IMatch[] | null = null;
+	readonly commandDefaultLabelMatches: IMatch[] | null = null;
+	readonly sourceMatches: IMatch[] | null = null;
+	readonly whenMatches: IMatch[] | null = null;
+	readonly keybindingMatches: KeybindingMatches | null = null;
 
 	constructor(private modifierLabels: ModifierLabels, keybindingItem: IKeybindingItem, searchValue: string, words: string[], keybindingWords: string[], completeMatch: boolean) {
 		if (!completeMatch) {
@@ -305,11 +305,11 @@ class KeybindingItemMatches {
 			};
 		}
 
-		let firstPartMatch: KeybindingMatch = {};
+		const firstPartMatch: KeybindingMatch = {};
 		let chordPartMatch: KeybindingMatch = {};
 
 		const matchedWords: number[] = [];
-		let firstPartMatchedWords: number[] = [];
+		const firstPartMatchedWords: number[] = [];
 		let chordPartMatchedWords: number[] = [];
 		let matchFirstPart = true;
 		for (let index = 0; index < words.length; index++) {
@@ -530,7 +530,7 @@ class KeybindingItemMatches {
 	}
 
 	private createCompleteMatch(part: ResolvedKeybindingPart): KeybindingMatch {
-		let match: KeybindingMatch = {};
+		const match: KeybindingMatch = {};
 		if (part) {
 			match.keyCode = true;
 			if (part.metaKey) {

src/vs/workbench/services/preferences/common/preferencesEditorInput.ts

@@ -16,19 +16,19 @@ import { IPreferencesService } from 'vs/workbench/services/preferences/common/pr
 import { Settings2EditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
 
 export class PreferencesEditorInput extends SideBySideEditorInput {
-	public static readonly ID: string = 'workbench.editorinputs.preferencesEditorInput';
+	static readonly ID: string = 'workbench.editorinputs.preferencesEditorInput';
 
 	getTypeId(): string {
 		return PreferencesEditorInput.ID;
 	}
 
-	public getTitle(verbosity: Verbosity): string {
+	getTitle(verbosity: Verbosity): string {
 		return this.master.getTitle(verbosity);
 	}
 }
 
 export class DefaultPreferencesEditorInput extends ResourceEditorInput {
-	public static readonly ID = 'workbench.editorinputs.defaultpreferences';
+	static readonly ID = 'workbench.editorinputs.defaultpreferences';
 	constructor(defaultSettingsResource: URI,
 		@ITextModelService textModelResolverService: ITextModelService,
 		@IHashService hashService: IHashService
@@ -53,8 +53,8 @@ export class DefaultPreferencesEditorInput extends ResourceEditorInput {
 
 export class KeybindingsEditorInput extends EditorInput {
 
-	public static readonly ID: string = 'workbench.input.keybindings';
-	public readonly keybindingsModel: KeybindingsEditorModel;
+	static readonly ID: string = 'workbench.input.keybindings';
+	readonly keybindingsModel: KeybindingsEditorModel;
 
 	constructor(@IInstantiationService instantiationService: IInstantiationService) {
 		super();
@@ -80,7 +80,7 @@ export class KeybindingsEditorInput extends EditorInput {
 
 export class SettingsEditor2Input extends EditorInput {
 
-	public static readonly ID: string = 'workbench.input.settings2';
+	static readonly ID: string = 'workbench.input.settings2';
 	private readonly _settingsModel: Settings2EditorModel;
 	private resource: URI = URI.from({
 		scheme: 'vscode-settings',
@@ -111,7 +111,7 @@ export class SettingsEditor2Input extends EditorInput {
 		return Promise.resolve(this._settingsModel);
 	}
 
-	public getResource(): URI {
+	getResource(): URI {
 		return this.resource;
 	}
 }

src/vs/workbench/services/preferences/common/preferencesModels.ts

@@ -27,7 +27,7 @@ export abstract class AbstractSettingsModel extends EditorModel {
 
 	protected _currentResultGroups = new Map<string, ISearchResultGroup>();
 
-	public updateResultGroup(id: string, resultGroup: ISearchResultGroup): IFilterResult {
+	updateResultGroup(id: string, resultGroup: ISearchResultGroup): IFilterResult {
 		if (resultGroup) {
 			this._currentResultGroups.set(id, resultGroup);
 		} else {
@@ -52,7 +52,7 @@ export abstract class AbstractSettingsModel extends EditorModel {
 			});
 	}
 
-	public filterSettings(filter: string, groupFilter: IGroupFilter, settingMatcher: ISettingMatcher): ISettingMatch[] {
+	filterSettings(filter: string, groupFilter: IGroupFilter, settingMatcher: ISettingMatcher): ISettingMatch[] {
 		const allGroups = this.filterGroups;
 
 		const filterMatches: ISettingMatch[] = [];
@@ -76,7 +76,7 @@ export abstract class AbstractSettingsModel extends EditorModel {
 		return filterMatches.sort((a, b) => b.score - a.score);
 	}
 
-	public getPreference(key: string): ISetting {
+	getPreference(key: string): ISetting {
 		for (const group of this.settingsGroups) {
 			for (const section of group.sections) {
 				for (const setting of section.settings) {
@@ -107,9 +107,9 @@ export abstract class AbstractSettingsModel extends EditorModel {
 		return this.settingsGroups;
 	}
 
-	public abstract settingsGroups: ISettingsGroup[];
+	abstract settingsGroups: ISettingsGroup[];
 
-	public abstract findValueMatches(filter: string, setting: ISetting): IRange[];
+	abstract findValueMatches(filter: string, setting: ISetting): IRange[];
 
 	protected abstract update(): IFilterResult;
 }
@@ -132,26 +132,26 @@ export class SettingsEditorModel extends AbstractSettingsModel implements ISetti
 		}));
 	}
 
-	public get uri(): URI {
+	get uri(): URI {
 		return this.settingsModel.uri;
 	}
 
-	public get configurationTarget(): ConfigurationTarget {
+	get configurationTarget(): ConfigurationTarget {
 		return this._configurationTarget;
 	}
 
-	public get settingsGroups(): ISettingsGroup[] {
+	get settingsGroups(): ISettingsGroup[] {
 		if (!this._settingsGroups) {
 			this.parse();
 		}
 		return this._settingsGroups;
 	}
 
-	public get content(): string {
+	get content(): string {
 		return this.settingsModel.getValue();
 	}
 
-	public findValueMatches(filter: string, setting: ISetting): IRange[] {
+	findValueMatches(filter: string, setting: ISetting): IRange[] {
 		return this.settingsModel.findMatches(filter, setting.valueRange, false, false, null, false).map(match => match.range);
 	}
 
@@ -229,13 +229,13 @@ export class Settings2EditorModel extends AbstractSettingsModel implements ISett
 		return this.settingsGroups.slice(1);
 	}
 
-	public get settingsGroups(): ISettingsGroup[] {
+	get settingsGroups(): ISettingsGroup[] {
 		const groups = this._defaultSettings.getSettingsGroups(this.dirty);
 		this.dirty = false;
 		return groups;
 	}
 
-	public findValueMatches(filter: string, setting: ISetting): IRange[] {
+	findValueMatches(filter: string, setting: ISetting): IRange[] {
 		// TODO @roblou
 		return [];
 	}
@@ -251,9 +251,9 @@ function parse(model: ITextModel, isSettingsProperty: (currentProperty: string,
 
 	let currentProperty: string | null = null;
 	let currentParent: any = [];
-	let previousParents: any[] = [];
+	const previousParents: any[] = [];
 	let settingsPropertyIndex: number = -1;
-	let range = {
+	const range = {
 		startLineNumber: 0,
 		startColumn: 0,
 		endLineNumber: 0,
@@ -270,8 +270,8 @@ function parse(model: ITextModel, isSettingsProperty: (currentProperty: string,
 			// settings value started
 			const setting = previousParents.length === settingsPropertyIndex + 1 ? settings[settings.length - 1] : overrideSetting.overrides[overrideSetting.overrides.length - 1];
 			if (setting) {
-				let valueStartPosition = model.getPositionAt(offset);
-				let valueEndPosition = model.getPositionAt(offset + length);
+				const valueStartPosition = model.getPositionAt(offset);
+				const valueEndPosition = model.getPositionAt(offset + length);
 				setting.value = value;
 				setting.valueRange = {
 					startLineNumber: valueStartPosition.lineNumber,
@@ -286,16 +286,16 @@ function parse(model: ITextModel, isSettingsProperty: (currentProperty: string,
 			}
 		}
 	}
-	let visitor: JSONVisitor = {
+	const visitor: JSONVisitor = {
 		onObjectBegin: (offset: number, length: number) => {
 			if (isSettingsProperty(currentProperty, previousParents)) {
 				// Settings started
 				settingsPropertyIndex = previousParents.length;
-				let position = model.getPositionAt(offset);
+				const position = model.getPositionAt(offset);
 				range.startLineNumber = position.lineNumber;
 				range.startColumn = position.column;
 			}
-			let object = {};
+			const object = {};
 			onValue(object, offset, length);
 			currentParent = object;
 			currentProperty = null;
@@ -305,7 +305,7 @@ function parse(model: ITextModel, isSettingsProperty: (currentProperty: string,
 			currentProperty = name;
 			if (previousParents.length === settingsPropertyIndex + 1 || (previousParents.length === settingsPropertyIndex + 2 && overrideSetting !== null)) {
 				// setting started
-				let settingStartPosition = model.getPositionAt(offset);
+				const settingStartPosition = model.getPositionAt(offset);
 				const setting: ISetting = {
 					description: [],
 					descriptionIsMarkdown: false,
@@ -344,7 +344,7 @@ function parse(model: ITextModel, isSettingsProperty: (currentProperty: string,
 				// setting ended
 				const setting = previousParents.length === settingsPropertyIndex + 1 ? settings[settings.length - 1] : overrideSetting.overrides[overrideSetting.overrides.length - 1];
 				if (setting) {
-					let valueEndPosition = model.getPositionAt(offset + length);
+					const valueEndPosition = model.getPositionAt(offset + length);
 					setting.valueRange = assign(setting.valueRange, {
 						endLineNumber: valueEndPosition.lineNumber,
 						endColumn: valueEndPosition.column
@@ -361,13 +361,13 @@ function parse(model: ITextModel, isSettingsProperty: (currentProperty: string,
 			}
 			if (previousParents.length === settingsPropertyIndex) {
 				// settings ended
-				let position = model.getPositionAt(offset);
+				const position = model.getPositionAt(offset);
 				range.endLineNumber = position.lineNumber;
 				range.endColumn = position.column;
 			}
 		},
 		onArrayBegin: (offset: number, length: number) => {
-			let array: any[] = [];
+			const array: any[] = [];
 			onValue(array, offset, length);
 			previousParents.push(currentParent);
 			currentParent = array;
@@ -379,7 +379,7 @@ function parse(model: ITextModel, isSettingsProperty: (currentProperty: string,
 				// setting value ended
 				const setting = previousParents.length === settingsPropertyIndex + 1 ? settings[settings.length - 1] : overrideSetting.overrides[overrideSetting.overrides.length - 1];
 				if (setting) {
-					let valueEndPosition = model.getPositionAt(offset + length);
+					const valueEndPosition = model.getPositionAt(offset + length);
 					setting.valueRange = assign(setting.valueRange, {
 						endLineNumber: valueEndPosition.lineNumber,
 						endColumn: valueEndPosition.column
@@ -603,8 +603,8 @@ export class DefaultSettings extends Disposable {
 	}
 
 	private parseSettings(settingsObject: { [path: string]: IConfigurationPropertySchema; }): ISetting[] {
-		let result: ISetting[] = [];
-		for (let key in settingsObject) {
+		const result: ISetting[] = [];
+		for (const key in settingsObject) {
 			const prop = settingsObject[key];
 			if (this.matchesScope(prop)) {
 				const value = prop.default;
@@ -709,15 +709,15 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements
 		this._register(this.onDispose(() => reference.dispose()));
 	}
 
-	public get uri(): URI {
+	get uri(): URI {
 		return this._uri;
 	}
 
-	public get target(): ConfigurationTarget {
+	get target(): ConfigurationTarget {
 		return this.defaultSettings.target;
 	}
 
-	public get settingsGroups(): ISettingsGroup[] {
+	get settingsGroups(): ISettingsGroup[] {
 		return this.defaultSettings.getSettingsGroups();
 	}
 
@@ -846,11 +846,11 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements
 		};
 	}
 
-	public findValueMatches(filter: string, setting: ISetting): IRange[] {
+	findValueMatches(filter: string, setting: ISetting): IRange[] {
 		return [];
 	}
 
-	public getPreference(key: string): ISetting {
+	getPreference(key: string): ISetting {
 		for (const group of this.settingsGroups) {
 			for (const section of group.sections) {
 				for (const setting of section.settings) {
@@ -920,10 +920,10 @@ class SettingsContentBuilder {
 	private _pushGroup(group: ISettingsGroup): ISetting {
 		const indent = '  ';
 		let lastSetting: ISetting | null = null;
-		let groupStart = this.lineCountWithOffset + 1;
+		const groupStart = this.lineCountWithOffset + 1;
 		for (const section of group.sections) {
 			if (section.title) {
-				let sectionTitleStart = this.lineCountWithOffset + 1;
+				const sectionTitleStart = this.lineCountWithOffset + 1;
 				this.addDescription([section.title], indent, this._contentByLines);
 				section.titleRange = { startLineNumber: sectionTitleStart, startColumn: 1, endLineNumber: this.lineCountWithOffset, endColumn: this.lastLine.length };
 			}
@@ -991,7 +991,7 @@ class SettingsContentBuilder {
 	}
 
 	private pushValue(setting: ISetting, preValueConent: string, indent: string): void {
-		let valueString = JSON.stringify(setting.value, null, indent);
+		const valueString = JSON.stringify(setting.value, null, indent);
 		if (valueString && (typeof setting.value === 'object')) {
 			if (setting.overrides.length) {
 				this._contentByLines.push(preValueConent + ' {');
@@ -1053,7 +1053,7 @@ export function createValidator(prop: IConfigurationPropertySchema): ((value: an
 
 		type Validator<T> = { enabled: boolean, isValid: (value: T) => boolean; message: string };
 
-		let numericValidations: Validator<number>[] = isNumeric ? [
+		const numericValidations: Validator<number>[] = isNumeric ? [
 			{
 				enabled: exclusiveMax !== undefined && (prop.maximum === undefined || exclusiveMax <= prop.maximum),
 				isValid: (value => value < exclusiveMax),
@@ -1087,7 +1087,7 @@ export function createValidator(prop: IConfigurationPropertySchema): ((value: an
 			},
 		].filter(validation => validation.enabled) : [];
 
-		let stringValidations: Validator<string>[] = [
+		const stringValidations: Validator<string>[] = [
 			{
 				enabled: prop.maxLength !== undefined,
 				isValid: (value => value.length <= prop.maxLength),
@@ -1108,7 +1108,7 @@ export function createValidator(prop: IConfigurationPropertySchema): ((value: an
 		if (prop.type === 'string' && stringValidations.length === 0) { return null; }
 		if (isNullable && value === '') { return ''; }
 
-		let errors: string[] = [];
+		const errors: string[] = [];
 
 		if (isNumeric) {
 			if (value === '' || isNaN(+value)) {
@@ -1147,22 +1147,22 @@ export class DefaultKeybindingsEditorModel implements IKeybindingsEditorModel<an
 		@IKeybindingService private keybindingService: IKeybindingService) {
 	}
 
-	public get uri(): URI {
+	get uri(): URI {
 		return this._uri;
 	}
 
-	public get content(): string {
+	get content(): string {
 		if (!this._content) {
 			this._content = defaultKeybindingsContents(this.keybindingService);
 		}
 		return this._content;
 	}
 
-	public getPreference(): any {
+	getPreference(): any {
 		return null;
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		// Not disposable
 	}
 }