Revert changes in preferences

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

@@ -561,9 +561,8 @@ export class FilteredMatchesRenderer extends Disposable implements HiddenAreasPr
 			range,
 			options: {
 				stickiness: editorCommon.TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-				className: 'findMatch',
-
-			},
+				className: 'findMatch'
+			}
 
 		};
 	}

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

@@ -119,7 +119,6 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			.then(preferencesEditorModel => preferencesEditorModel ? preferencesEditorModel.content : null);
 	}
 
-	// vsode://DefaultSettings/1
 	createPreferencesEditorModel(uri: URI): TPromise<IPreferencesEditorModel<any>> {
 		let promise = this.defaultPreferencesEditorModels.get(uri);
 		if (promise) {
@@ -251,7 +250,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 	}
 
 	private doOpenSettings(configurationTarget: ConfigurationTarget, resource: URI, options?: IEditorOptions, position?: EditorPosition): TPromise<IEditor> {
-		const openDefaultSettings = !!this.configurationService.lookup(DEFAULT_SETTINGS_EDITOR_SETTING).value;
+		const openDefaultSettings = !!this.configurationService.getValue(DEFAULT_SETTINGS_EDITOR_SETTING);
 		return this.getOrCreateEditableSettingsEditorInput(configurationTarget, resource)
 			.then(editableSettingsEditorInput => {
 				if (!options) {
@@ -261,7 +260,6 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 				}
 
 				if (openDefaultSettings) {
-					// get a new URI for default settings here
 					const defaultPreferencesEditorInput = this.instantiationService.createInstance(DefaultPreferencesEditorInput, this.getDefaultSettingsResource(configurationTarget));
 					const preferencesEditorInput = new PreferencesEditorInput(this.getPreferencesEditorInputName(configurationTarget, resource), editableSettingsEditorInput.getDescription(), defaultPreferencesEditorInput, <EditorInput>editableSettingsEditorInput);
 					this.lastOpenedSettingsInput = preferencesEditorInput;

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

@@ -244,9 +244,7 @@ export class SettingsEditorModel extends AbstractSettingsModel implements ISetti
 	constructor(reference: IReference<ITextEditorModel>, private _configurationTarget: ConfigurationTarget, @ITextFileService protected textFileService: ITextFileService) {
 		super();
 		this.settingsModel = reference.object.textEditorModel;
-		this._register(this.onDispose(() => {
-			reference.dispose();
-		}));
+		this._register(this.onDispose(() => reference.dispose()));
 		this._register(this.settingsModel.onDidChangeContent(() => {
 			this._settingsGroups = null;
 		}));