about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-01-25 09:22:01 +0000
committerbors <bors@rust-lang.org>2023-01-25 09:22:01 +0000
commit8bf338f2c86f7863a17e9884a7e7d6676c1cd9d0 (patch)
tree38de5f812ba5f1616b28fdb635d30ee4460b2fb2
parente86bac92f485ff8f17a3fe49f8f7e7a10bacfecc (diff)
parente6ad8a2edcbe5e9614f71308d43f6fb0cbf7ceef (diff)
downloadrust-8bf338f2c86f7863a17e9884a7e7d6676c1cd9d0.tar.gz
rust-8bf338f2c86f7863a17e9884a7e7d6676c1cd9d0.zip
Auto merge of #14023 - Veykril:config-sub-fix, r=Veykril
fix: config substitution failing extension activation

Closes https://github.com/rust-lang/rust-analyzer/issues/14022

Not sure how a function can appear there, but there is also no reason for us to care about it anyways.
-rw-r--r--editors/code/src/config.ts2
1 files changed, 0 insertions, 2 deletions
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index ce1142df3a8..114abf062b9 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -268,8 +268,6 @@ export function substituteVSCodeVariables<T>(resp: T): T {
             res[key] = substituteVSCodeVariables(val);
         }
         return res as T;
-    } else if (Is.func(resp)) {
-        throw new Error("Unexpected function type in substitution");
     }
     return resp;
 }