From 16b5c65d741eeee8c0abed3f49b0cd44bc8e0096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Wed, 13 Sep 2023 21:48:15 +0200
Subject: [PATCH] Use vscode-variables package to support settings.json
 variable interpolation.

Requires shadow-cljs ugprade to fix `ES_NEXT_IN` build error
created by `vscode-variables` dependency:

* https://github.com/thheller/shadow-cljs/issues/851
* https://github.com/thheller/shadow-cljs/commit/62700720fc82e048442a4abc0a5b99d845d6545b
---
 package.json         |  6 ++++--
 src/main/config.cljs | 10 ++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 6b9d3bd..ce87911 100644
--- a/package.json
+++ b/package.json
@@ -90,10 +90,12 @@
 	},
 	"devDependencies": {
 		"@types/vscode": "^1.38.0",
-		"shadow-cljs": "2.11.18",
+		"shadow-cljs": "2.11.23",
 		"vscode-test": "^1.2.0",
 		"webpack": "^5.21.2",
 		"webpack-cli": "^4.5.0"
 	},
-	"dependencies": {}
+	"dependencies": {
+		"vscode-variables": "^0.1.3"
+	}
 }
diff --git a/src/main/config.cljs b/src/main/config.cljs
index 3f898ea..6d5c326 100644
--- a/src/main/config.cljs
+++ b/src/main/config.cljs
@@ -1,6 +1,6 @@
 (ns config
   (:require [vscode.workspace :as workspace]
-            [utils.helpers :refer [render-workspace]]))
+            [vscode-variables :as vscodeVariables]))
 
 (defonce config (atom {}))
 
@@ -10,10 +10,12 @@
   (let [workspace-root (first (workspace/get-folders))]
     (reset! config {:workspace-root workspace-root
                     :nix-file       (-> (workspace/config-get vscode-config :nix-env-selector/nix-file)
-                                        (#(when %1 (render-workspace %1 workspace-root))))
+                                        (#(when %1 (vscodeVariables %1))))
                     :suggest-nix?   (workspace/config-get vscode-config :nix-env-selector/suggestion)
                     :nix-packages   (workspace/config-get vscode-config :nix-env-selector/packages)
-                    :nix-args       (workspace/config-get vscode-config :nix-env-selector/args)
-                    :nix-shell-path (workspace/config-get vscode-config :nix-env-selector/nix-shell-path)})))
+                    :nix-args       (-> (workspace/config-get vscode-config :nix-env-selector/args)
+                                        (#(when %1 (vscodeVariables %1))))
+                    :nix-shell-path (-> (workspace/config-get vscode-config :nix-env-selector/nix-shell-path)
+                                        (#(when %1 (vscodeVariables %1))))})))
 
 (workspace/on-config-change update-config!)