Skip to content

Commit

Permalink
Remove incorrect init option defaults, revert revert zipfile
Browse files Browse the repository at this point in the history
  • Loading branch information
NoahTheDuke committed Nov 2, 2022
1 parent db52f22 commit fefff5f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 11 deletions.
2 changes: 1 addition & 1 deletion lib/index.js

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions package.json
Expand Up @@ -367,7 +367,6 @@
},
"clojure.initialization-options.log-path": {
"type": "string",
"default": "/tmp/clojure-lsp.*.out",
"description": "A absolute path to a file where clojure-lsp should log."
},
"clojure.initialization-options.notify-references-on-file-change": {
Expand Down Expand Up @@ -398,8 +397,7 @@
"classpath-cmd"
]
}
},
"default": []
}
},
"clojure.initialization-options.semantic-tokens?": {
"type": "boolean",
Expand Down
9 changes: 2 additions & 7 deletions src/config.ts
Expand Up @@ -9,7 +9,7 @@ import { Dictionary } from "./types";
export const documentSelector = [
{ scheme: "file", language: "clojure" },
{ scheme: "jar", language: "clojure" },
{ scheme: "zip", language: "clojure" },
{ scheme: "zipfile", language: "clojure" },
];

export interface Keymaps {
Expand All @@ -33,13 +33,8 @@ export function config(): ClojureConfig {
const rawConfig = workspace.getConfiguration("clojure");
const lspInstallPath = rawConfig.get<string>("lsp-install-path");
const initializationOptions = rawConfig.get<Dictionary<any>>(
"initialization-options",
{}
"initialization-options"
);
const logPath = rawConfig.get<string>("initialization-options.log-path");
if (logPath === rawConfig.inspect("initialization-options.log-path")?.defaultValue) {
initializationOptions["log-path"] = undefined;
}

return {
checkOnStart: rawConfig.get("lsp-check-on-start"),
Expand Down

0 comments on commit fefff5f

Please sign in to comment.