Tweak whitespaceAroundPipe settings migration logic to do it only once (

#2703) * Tweak whitespaceAroundPipe settings migration logic to do it only once * refactor Co-authored-by: Christoph Bergmeister <christoph.bergmeister@bjss.com>
PowerShell · May 18, 2020 · 252a2c5 · 252a2c5
1 parent 3256d4e
commit 252a2c5
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/session.ts b/src/session.ts
@@ -324,10 +324,12 @@ export class SessionManager implements Middleware {
     private async migrateWhitespaceAroundPipeSetting() {
         const configuration = vscode.workspace.getConfiguration(utils.PowerShellLanguageId);
         const deprecatedSetting = 'codeFormatting.whitespaceAroundPipe'
-        if (configuration.has(deprecatedSetting) && !configuration.has('codeFormatting.addWhitespaceAroundPipe')) {
+        const newSetting = 'codeFormatting.addWhitespaceAroundPipe'
+        const configurationTargetOfNewSetting = await Settings.getEffectiveConfigurationTarget(newSetting);
+        if (configuration.has(deprecatedSetting) && configurationTargetOfNewSetting === null) {
             const configurationTarget = await Settings.getEffectiveConfigurationTarget(deprecatedSetting);
             const value = configuration.get(deprecatedSetting, configurationTarget)
-            await Settings.change('codeFormatting.addWhitespaceAroundPipe', value, configurationTarget);
+            await Settings.change(newSetting, value, configurationTarget);
         }
     }