Skip to content

Commit 5acb913

Browse files
committed
Reset ruff.configuration if it contains VS Code variables
1 parent ab433c4 commit 5acb913

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

src/common/settings.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,14 +198,20 @@ function getOptionalGlobalValue<T>(config: WorkspaceConfiguration, key: string):
198198

199199
export async function getGlobalSettings(namespace: string): Promise<ISettings> {
200200
const config = getConfiguration(namespace);
201+
202+
let configuration = getGlobalValue<string | object | null>(config, "configuration", null);
203+
if (typeof configuration === "string" && configuration.search("${workspaceFolder:") !== -1) {
204+
configuration = null;
205+
}
206+
201207
return {
202208
nativeServer: getGlobalValue<NativeServer>(config, "nativeServer", "auto"),
203209
cwd: process.cwd(),
204210
workspace: process.cwd(),
205211
path: getGlobalValue<string[]>(config, "path", []),
206212
ignoreStandardLibrary: getGlobalValue<boolean>(config, "ignoreStandardLibrary", true),
207213
interpreter: [],
208-
configuration: getGlobalValue<string | object | null>(config, "configuration", null),
214+
configuration,
209215
importStrategy: getGlobalValue<ImportStrategy>(config, "importStrategy", "fromEnvironment"),
210216
codeAction: getGlobalValue<CodeAction>(config, "codeAction", {}),
211217
lint: {

0 commit comments

Comments
 (0)