Skip to content

Fix migration of codeFormatting.addWhitespaceAroundPipe setting #2863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 5, 2020
Merged

Fix migration of codeFormatting.addWhitespaceAroundPipe setting #2863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/features/RemoteFiles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export class RemoteFilesFeature extends LanguageClientConsumer {
this.closeRemoteFiles();

vscode.workspace.onDidSaveTextDocument((doc) => {
if (this.languageClient && this.isDocumentRemote(doc)) {
if (this.isDocumentRemote(doc) && this.languageClient) {
this.languageClient.sendNotification(
DidSaveTextDocumentNotificationType,
{
Expand Down
10 changes: 5 additions & 5 deletions src/session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,11 +332,11 @@ export class SessionManager implements Middleware {
const deprecatedSetting = 'codeFormatting.whitespaceAroundPipe'
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(newSetting, value, configurationTarget);
await Settings.change(deprecatedSetting, undefined, configurationTarget);
const configurationTargetOfOldSetting = await Settings.getEffectiveConfigurationTarget(deprecatedSetting);
if (configurationTargetOfOldSetting !== null && configurationTargetOfNewSetting === null) {
const value = configuration.get(deprecatedSetting, configurationTargetOfOldSetting)
await Settings.change(newSetting, value, configurationTargetOfOldSetting);
await Settings.change(deprecatedSetting, undefined, configurationTargetOfOldSetting);
}
}

Expand Down
12 changes: 11 additions & 1 deletion test/settings.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*--------------------------------------------------------*/

import * as assert from "assert";
import { IPowerShellExeDetails } from "../src/platform";
import * as vscode from "vscode";
import Settings = require("../src/settings");

suite("Settings module", () => {
Expand Down Expand Up @@ -34,4 +34,14 @@ suite("Settings module", () => {
await Settings.change("powerShellAdditionalExePaths", psExeDetails, true);
assert.strictEqual(Settings.load().powerShellAdditionalExePaths[0].versionName, psExeDetails[0].versionName);
});

test("Can get effective configuration target", async () => {
await Settings.change("helpCompletion", "LineComment", false);
let target = await Settings.getEffectiveConfigurationTarget("helpCompletion");
assert.strictEqual(target, vscode.ConfigurationTarget.Workspace);

await Settings.change("helpCompletion", undefined, false);
target = await Settings.getEffectiveConfigurationTarget("helpCompletion");
assert.strictEqual(target, null);
});
});