Skip to content

Commit

Permalink
Use vscode-variables package to support settings.json variable interp…
Browse files Browse the repository at this point in the history
…olation.

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

* thheller/shadow-cljs#851
* thheller/shadow-cljs@6270072
  • Loading branch information
nh2 committed Sep 14, 2023
1 parent d35ca74 commit 16b5c65
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
10 changes: 6 additions & 4 deletions src/main/config.cljs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(ns config
(:require [vscode.workspace :as workspace]
[utils.helpers :refer [render-workspace]]))
[vscode-variables :as vscodeVariables]))

(defonce config (atom {}))

Expand All @@ -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!)

0 comments on commit 16b5c65

Please sign in to comment.