Add djlspPath setting for vscode extension

fourdigits · Jun 12, 2024 · 92a81df · 92a81df
1 parent ee92767
commit 92a81df
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/vscode/README.md b/vscode/README.md
@@ -16,6 +16,7 @@ Then, install the `djlsp` extension from the Visual Studio Code marketplace.
 ## Settings
 
 Within the `settings.json` file, you can configure the following settings:
+- `djangoTemplateLsp.djlspPath`: Path to the `djlsp` executable. Default: `~/.local/bin/djlsp`
 - `djangoTemplateLsp.dockerComposeFile`: Docker Compose file name. Default: `docker-compose.yml`
 - `djangoTemplateLsp.dockerServiceName`: Docker service name. Default: `django`
 - `djangoTemplateLsp.djangoSettingsModule`: Django settings module. Default: ``

diff --git a/vscode/client/src/extension.ts b/vscode/client/src/extension.ts
@@ -18,11 +18,18 @@ export function activate(context: ExtensionContext) {
 		return home ? filePath.replace('~', home) : filePath;
 	};
 
-	// Check if djlsp is installed
-	const djlspPaths = [
-		'~/.local/bin/djlsp',
-		'~/.local/pipx/venvs/django-template-lsp/bin/djlsp',
-	].map(expandHomeDir);
+	const configuration = workspace.getConfiguration('djangoTemplateLsp');
+
+	const djlspPaths = [];
+
+	const djlspPathConfig = configuration.get('djlspPath', false);
+
+	if (djlspPathConfig) {
+		djlspPaths.push(expandHomeDir(djlspPathConfig));
+	} else {
+		djlspPaths.push(expandHomeDir('~/.local/bin/djlsp'));
+		djlspPaths.push(expandHomeDir('~/.local/pipx/venvs/django-template-lsp/bin/djlsp'));
+	}
 
 	const djlspPath = djlspPaths.find(fs.existsSync);
 
@@ -31,8 +38,6 @@ export function activate(context: ExtensionContext) {
 		throw new Error('djlsp is not installed');
 	}
 
-	const configuration = workspace.getConfiguration('djangoTemplateLsp');
-
 	const djlspArgs = [];
 
 	if (configuration.get("enableLogging", false)) {

diff --git a/vscode/package.json b/vscode/package.json
@@ -30,6 +30,11 @@
 			"type": "object",
 			"title": "Django Template LSP",
 			"properties": {
+				"djangoTemplateLsp.djlspPath": {
+					"type": "string",
+					"default": "",
+					"description": "The path to the djlsp executable, by default it will search for djlsp in your .local directory"
+				},
 				"djangoTemplateLsp.dockerComposeFile": {
 					"type": "string",
 					"default": "docker-compose.yml",