add setting

src/vs/workbench/api/node/mainThreadSaveParticipant.ts

@@ -82,7 +82,7 @@ class FormatOnSaveParticipant implements ISaveParticipant {
 	}
 
 	participate(editorModel: ITextFileEditorModel, env: { isAutoSaved: boolean }): TPromise<any> {
-		if (true || this._configurationService.lookup('files.formatOnSave').value) {
+		if (this._configurationService.lookup('files.formatOnSave').value) {
 			const model: IModel = editorModel.textEditorModel;
 			const editor = this._findEditor(model);
 			return formatDocument(model, editor);

src/vs/workbench/parts/files/browser/files.contribution.ts

@@ -212,6 +212,11 @@ configurationRegistry.registerConfiguration({
 			'default': false,
 			'description': nls.localize('trimTrailingWhitespace', "When enabled, will trim trailing whitespace when you save a file.")
 		},
+		'files.formatOnSave': {
+			'type': 'boolean',
+			'default': false,
+			'description': nls.localize('formatOnSave', "Format a file on save - a matching formatting provider must be available.")
+		},
 		'files.autoSave': {
 			'type': 'string',
 			'enum': [AutoSaveConfiguration.OFF, AutoSaveConfiguration.AFTER_DELAY, AutoSaveConfiguration.ON_FOCUS_CHANGE, , AutoSaveConfiguration.ON_WINDOW_CHANGE],