From 7611715313224f3b0cbca904f1cb144fc4b7c1f9 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Thu, 19 Jan 2017 16:14:37 +0100 Subject: [PATCH] files.trimTrailingWhitespace: is now an overridable setting --- src/vs/workbench/api/node/mainThreadSaveParticipant.ts | 2 +- src/vs/workbench/parts/files/browser/files.contribution.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/api/node/mainThreadSaveParticipant.ts b/src/vs/workbench/api/node/mainThreadSaveParticipant.ts index 56d4b5af4eb..706ee72ce13 100644 --- a/src/vs/workbench/api/node/mainThreadSaveParticipant.ts +++ b/src/vs/workbench/api/node/mainThreadSaveParticipant.ts @@ -41,7 +41,7 @@ class TrimWhitespaceParticipant implements INamedSaveParticpant { } public participate(model: ITextFileEditorModel, env: { reason: SaveReason }): any { - if (this.configurationService.lookup('files.trimTrailingWhitespace').value) { + if (this.configurationService.lookup('files.trimTrailingWhitespace', model.textEditorModel.getLanguageIdentifier().language).value) { this.doTrimTrailingWhitespace(model.textEditorModel, env.reason === SaveReason.AUTO); } } diff --git a/src/vs/workbench/parts/files/browser/files.contribution.ts b/src/vs/workbench/parts/files/browser/files.contribution.ts index 025e7923554..89f54fa30f0 100644 --- a/src/vs/workbench/parts/files/browser/files.contribution.ts +++ b/src/vs/workbench/parts/files/browser/files.contribution.ts @@ -220,7 +220,8 @@ configurationRegistry.registerConfiguration({ 'files.trimTrailingWhitespace': { 'type': 'boolean', 'default': false, - 'description': nls.localize('trimTrailingWhitespace', "When enabled, will trim trailing whitespace when saving a file.") + 'description': nls.localize('trimTrailingWhitespace', "When enabled, will trim trailing whitespace when saving a file."), + 'overridable': true }, 'files.insertFinalNewline': { 'type': 'boolean',