diff --git a/CHANGELOG.md b/CHANGELOG.md index cbc501c..84fe60e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [0.5.9](https://github.com/nix-community/vscode-nix-ide/compare/v0.5.8...v0.5.9) (2026-05-14) + + +### Bug Fixes + +* do not attempt to find nixd unless configured ([0ef06e3](https://github.com/nix-community/vscode-nix-ide/commit/0ef06e3374caa2ff5f4a1d5b929ddf70ecf6b0ac)), closes [#529](https://github.com/nix-community/vscode-nix-ide/issues/529) + ### [0.5.8](https://github.com/nix-community/vscode-nix-ide/compare/v0.5.7...v0.5.8) (2026-05-12) ### [0.5.7](https://github.com/nix-community/vscode-nix-ide/compare/v0.5.6...v0.5.7) (2026-05-12) diff --git a/bun.lock b/bun.lock index bbb08bf..058f0dc 100644 --- a/bun.lock +++ b/bun.lock @@ -14,8 +14,8 @@ "@commitlint/config-conventional": "^20.5.3", "@types/bun": "^1.3.13", "@types/command-exists": "^1.2.3", - "@types/node": "^25.0.3", - "@types/vscode": "^1.118.0", + "@types/node": "^25.7.0", + "@types/vscode": "^1.112.0", "@vscode/test-cli": "^0.0.12", "@vscode/test-electron": "^2.5.2", "@vscode/vsce": "^3.9.1", @@ -23,7 +23,7 @@ "lefthook": "^2.1.6", "ovsx": "^0.10.12", "tmlanguage-generator": "^0.6.8", - "typescript": "^6.0.2", + "typescript": "^6.0.3", "vscode-tmgrammar-test": "^0.1.3", "yaml": "^2.9.0", }, @@ -200,7 +200,7 @@ "@tybys/wasm-util": ["@tybys/wasm-util@0.10.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg=="], - "@types/bun": ["@types/bun@1.3.13", "", { "dependencies": { "bun-types": "1.3.13" } }, "sha512-9fqXWk5YIHGGnUau9TEi+qdlTYDAnOj+xLCmSTwXfAIqXr2x4tytJb43E9uCvt09zJURKXwAtkoH4nLQfzeTXw=="], + "@types/bun": ["@types/bun@1.3.14", "", { "dependencies": { "bun-types": "1.3.14" } }, "sha512-h1hFqFVcvAvD9j9K7ZW7vd82aSA+rTdznZa+5bwvCwqSB1jmmfLcbIWhOLx1/+boy/xmjgCs/OMUL8hRJSmnPw=="], "@types/command-exists": ["@types/command-exists@1.2.3", "", {}, "sha512-PpbaE2XWLaWYboXD6k70TcXO/OdOyyRFq5TVpmlUELNxdkkmXU9fkImNosmXU1DtsNrqdUgWd/nJQYXgwmtdXQ=="], @@ -214,7 +214,7 @@ "@types/sarif": ["@types/sarif@2.1.7", "", {}, "sha512-kRz0VEkJqWLf1LLVN4pT1cg1Z9wAuvI6L97V3m2f5B76Tg8d413ddvLBPTEHAZJlnn4XSvu0FkZtViCQGVyrXQ=="], - "@types/vscode": ["@types/vscode@1.118.0", "", {}, "sha512-Ah6eTlqDcwIMELEVwQMO++rJAFBRz/oLluLD/vWdYrH1KuI9kfpaM+7pg0OvvascgcJy+ghLCERAYouM4QbzGw=="], + "@types/vscode": ["@types/vscode@1.120.0", "", {}, "sha512-feaT4Rst+FkTch5zz/ZbNCxoIvo55YU80Be2kiL7OJcod4+CUYf2lUBPdIJzozNnSEMq1VRTGrWEcCGFB3fBmA=="], "@typespec/ts-http-runtime": ["@typespec/ts-http-runtime@0.3.2", "", { "dependencies": { "http-proxy-agent": "^7.0.0", "https-proxy-agent": "^7.0.0", "tslib": "^2.6.2" } }, "sha512-IlqQ/Gv22xUC1r/WQm4StLkYQmaaTsXAhUVsNE0+xiyf0yRFiH5++q78U3bw6bLKDCTmh0uqKB9eG9+Bt75Dkg=="], @@ -296,7 +296,7 @@ "buffer-equal-constant-time": ["buffer-equal-constant-time@1.0.1", "", {}, "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="], - "bun-types": ["bun-types@1.3.13", "", { "dependencies": { "@types/node": "*" } }, "sha512-QXKeHLlOLqQX9LgYaHJfzdBaV21T63HhFJnvuRCcjZiaUDpbs5ED1MgxbMra71CsryN/1dAoXuJJJwIv/2drVA=="], + "bun-types": ["bun-types@1.3.14", "", { "dependencies": { "@types/node": "*" } }, "sha512-4N0ig0fEomHt5R0KCFWjovxow98rIoRwKolrYdCcknNwMekCXRnWEUvgu5soYV8QXtVsrUD8B95MBOZGPvr6KQ=="], "bundle-name": ["bundle-name@4.1.0", "", { "dependencies": { "run-applescript": "^7.0.0" } }, "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q=="], diff --git a/package.json b/package.json index 604b2fa..3fc1af2 100644 --- a/package.json +++ b/package.json @@ -2,12 +2,12 @@ "name": "nix-ide", "displayName": "Nix IDE", "description": "Full Nix language support with/without external language servers", - "version": "0.5.8", + "version": "0.5.9", "publisher": "jnoortheen", "icon": "images/icon.png", "license": "MIT", "engines": { - "vscode": ">=1.118.0" + "vscode": ">=1.112.0" }, "categories": [ "Programming Languages", @@ -259,7 +259,7 @@ "@types/bun": "^1.3.13", "@types/command-exists": "^1.2.3", "@types/node": "^25.7.0", - "@types/vscode": "^1.118.0", + "@types/vscode": "^1.112.0", "@vscode/test-cli": "^0.0.12", "@vscode/test-electron": "^2.5.2", "@vscode/vsce": "^3.9.1", diff --git a/src/client.ts b/src/client.ts index b488661..400be57 100644 --- a/src/client.ts +++ b/src/client.ts @@ -88,13 +88,22 @@ function resolveServerPath(): Array { } export async function activate(context: ExtensionContext): Promise { + if (!config.LSPEnabled) { + throw new Error("Language server is not enabled in configuration"); + } + const serverPath = resolveServerPath(); if (!commandExistsSync(serverPath[0])) { - const selection = await window.showErrorMessage(`Command ${serverPath} not found in $PATH`, { - title: "Install language server", - uri: Uri.parse("https://github.com/nix-community/vscode-nix-ide?tab=readme-ov-file#language-servers"), - }); + const selection = await window.showErrorMessage( + `Command ${serverPath} not found in $PATH`, + { + title: "Install language server", + uri: Uri.parse( + "https://github.com/nix-community/vscode-nix-ide?tab=readme-ov-file#language-servers", + ), + }, + ); if (selection?.uri !== undefined) { await env.openExternal(selection?.uri); return; diff --git a/src/extension.ts b/src/extension.ts index 55f8f07..6c12d9b 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -18,6 +18,16 @@ import { startLinting } from "./linter"; * @return A promise for the initialization */ export async function activate(context: ExtensionContext): Promise { + if (!config.LSPEnabled) { + await startLinting(context); + const subs = [ + vscode.languages.registerDocumentFormattingEditProvider, + vscode.languages.registerDocumentRangeFormattingEditProvider, + ].map((func) => func("nix", formattingProviders)); + context.subscriptions.push(...subs); + return; + } + try { await client.activate(context); } catch (err) {