Skip to content

Commit 885696c

Browse files
committed
fix: rename configuration key
1 parent 0ef2d84 commit 885696c

File tree

2 files changed

+23
-9
lines changed

2 files changed

+23
-9
lines changed

src/task.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { ActivityBar } from './elements/activityBar.js';
55
import { Namespace, Task } from './models/models.js';
66
import { taskfileSvc } from './services/taskfile.js';
77
import { log } from './utils/log.js';
8-
import { settings, UpdateOn } from './utils/settings.js';
8+
import { configKey, oldConfigKey, settings, UpdateOn } from './utils/settings.js';
99

1010
export class TaskExtension {
1111
private _taskfiles: Namespace[] = [];
@@ -289,7 +289,7 @@ export class TaskExtension {
289289

290290
private _onDidChangeConfiguration(event: vscode.ConfigurationChangeEvent) {
291291
log.info("Detected changes to configuration");
292-
if (event.affectsConfiguration("task")) {
292+
if (event.affectsConfiguration(configKey) || event.affectsConfiguration(oldConfigKey)) {
293293
settings.update();
294294
this._nesting = settings.tree.nesting;
295295
this._status = settings.tree.status;

src/utils/settings.ts

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,23 @@
11
import * as vscode from 'vscode';
22
import { log } from './log.js';
33

4+
export const configKey = "taskfile";
5+
export const oldConfigKey = "task";
6+
const oldConfigKeys = [
7+
"updateOn",
8+
"path",
9+
"outputTo",
10+
"checkForUpdates",
11+
"doubleClickTimeout",
12+
"tree.nesting",
13+
"tree.status",
14+
"tree.sort",
15+
"terminal.per",
16+
"terminal.close",
17+
];
18+
419
class Settings {
520
private static _instance: Settings;
6-
private static namespace = "taskfile";
721
public updateOn!: UpdateOn;
822
public path!: string;
923
public outputTo!: OutputTo;
@@ -25,17 +39,17 @@ class Settings {
2539
log.info("Updating settings");
2640

2741
// Check if the old configuration still exists
28-
let oldConfig = vscode.workspace.getConfiguration("task");
29-
if (oldConfig) {
30-
vscode.window.showWarningMessage(`Task changed its configuration namespace from "task" to "taskfile". Your task settings will not be applied until you update your settings accordingly.`, "More Info").then(selection => {
42+
const oldConfig = vscode.workspace.getConfiguration(oldConfigKey);
43+
if (oldConfigKeys.some(key => oldConfig.has(key))) {
44+
vscode.window.showWarningMessage(`Task changed its configuration namespace from "${oldConfigKey}" to "${configKey}". Your task settings will not be applied until you update your settings accordingly.`, "More Info").then(selection => {
3145
if (selection === "More Info") {
3246
vscode.env.openExternal(vscode.Uri.parse("https://taskfile.dev/docs/integrations#configuration-namespace-change"));
3347
}
3448
});
3549
}
3650

3751
// Get the workspace config
38-
let config = vscode.workspace.getConfiguration(Settings.namespace);
52+
let config = vscode.workspace.getConfiguration(configKey);
3953

4054
// Set the properties
4155
this.updateOn = config.get("updateOn") ?? UpdateOn.save;
@@ -77,7 +91,7 @@ class TreeSettings {
7791
log.info("Updating tree settings");
7892

7993
// Get the workspace config
80-
let config = vscode.workspace.getConfiguration("task");
94+
let config = vscode.workspace.getConfiguration(configKey);
8195

8296
// Set the properties
8397
this.nesting = config.get("tree.nesting") ?? true;
@@ -110,7 +124,7 @@ class TerminalSettings {
110124
log.info("Updating terminal settings");
111125

112126
// Get the workspace config
113-
let config = vscode.workspace.getConfiguration("task");
127+
let config = vscode.workspace.getConfiguration(configKey);
114128

115129
// Set the properties
116130
this.per = config.get("terminal.per") ?? TerminalPer.window;

0 commit comments

Comments
 (0)