added possibility to change virtual env directory

CHANGELOG.md

@@ -1,7 +1,11 @@
 # Change Log
 All notable changes to the "vscode-vyper" extension will be documented in this file.
 
-## [Unreleased]
+## 0.0.2
+- The virtual env path can now be changed
+- The Vyper contract can now be in a subdirectory
+
+## 0.0.1
 - Initial release
 - Vyper: Build Contract command that build a give contract and displays syntax errors
 - Syntax Higlighting for Vyper (*.vy, *.v.py) files

README.md

@@ -22,12 +22,9 @@ This means that the folder `~/vyper-venv/bin` should contain a `python` and a `v
 
 ## Extension Settings
 
-Coming eventually...
+The path to the virtual Python environment can be set in the User Settings (`Ctrl+Shift+P`) + 'Open User Settings' via the `vyper.virtualEnvPath` variable.
 
-## Known Issues
-
-Requires a virtual Vyper env to be set up exactly as described in the [Vyper tutorial](https://vyper.readthedocs.io/en/latest/installing-vyper.html).
-This means that the folder `~/vyper-venv/bin` should contain a `python` and a `vyper` executable.
+![VS Code User Settings](vscode-vyper-settings.png)
 
 ## Installation
 

package.json

@@ -2,7 +2,7 @@
     "name": "vscode-vyper",
     "displayName": "Vyper",
     "description": "Vyper (Ethereum) support for VS Code",
-    "version": "0.0.1",
+    "version": "0.0.2",
     "publisher": "p-",
     "keywords": [
         "vyper",
@@ -51,7 +51,22 @@
                 "scopeName": "source.vyper",
                 "path": "./syntax/MagicPython.tmLanguage.json"
             }
-        ]
+        ],
+        "configuration": {
+            "type": "object",
+            "title": "Vyper configuration",
+            "properties": {
+                "vyper.virtualEnvPath": {
+                    "type": [
+                      "string",
+                      "null"
+                    ],
+                    "default": null,
+                    "description": "Specifies the Virtual Python Environment to use.",
+                    "scope": "resource"
+                  }
+            }
+        }
     },
     "scripts": {
         "vscode:prepublish": "npm run compile",

src/util.ts

@@ -226,25 +226,26 @@ function mapSeverityToVSCodeSeverity(sev: string): vscode.DiagnosticSeverity {
 	}
 }
 
-export function getWorkspaceFolderPath(fileUri: vscode.Uri): string {
-	if (fileUri) {
-		let workspace = vscode.workspace.getWorkspaceFolder(fileUri);
-		if (workspace) {
-			return workspace.uri.fsPath;
-		}
-	}
+export function getVyperVirtualEnv(): string {
+	const vyperConfig = vscode.workspace.getConfiguration('vyper', vscode.window.activeTextEditor ? vscode.window.activeTextEditor.document.uri : null);
 
-	// fall back to the first workspace
-	let folders = vscode.workspace.workspaceFolders;
-	if (folders && folders.length) {
-		return folders[0].uri.fsPath;
+	if (vyperConfig['virtualEnvPath'] !== null) {
+		return resolveHomeDir(vyperConfig['virtualEnvPath']);
 	}
+	return os.homedir() + '/vyper-venv';
 }
 
-export function getVyperDefaultVirtualEnv(): string {
-	return os.homedir() + '/vyper-venv';
+/**
+ * Expands ~ to homedir in non-Windows platform
+ */
+export function resolveHomeDir(inputPath: string): string {
+	if (!inputPath || !inputPath.trim()) {
+		return inputPath;
+	} 
+	return inputPath.startsWith('~') ? path.join(os.homedir(), inputPath.substr(1)) : inputPath;
 }
 
+
 export function killTree(processId: number): void {
 	if (process.platform === 'win32') {
 		const TASK_KILL = 'C:\\Windows\\System32\\taskkill.exe';

src/vyperBuild.ts

@@ -1,6 +1,6 @@
 import path = require('path');
 import vscode = require('vscode');
-import { runTool, ICheckResult, handleDiagnosticErrors, getWorkspaceFolderPath, getVyperDefaultVirtualEnv } from './util';
+import { runTool, ICheckResult, handleDiagnosticErrors, getVyperVirtualEnv } from './util';
 import { outputChannel } from './vyperStatus';
 import { diagnosticsStatusBarItem } from './vyperStatus';
 
@@ -45,17 +45,16 @@ export function vyperBuild(fileUri: vscode.Uri, vyperConfig: vscode.WorkspaceCon
 	}
 
 	// Calls Vyper with virtual env: /Users/sectests/vyper-venv/bin/python /usr/local/bin/vyper (which vyper?)
-	const currentWorkspace = getWorkspaceFolderPath(fileUri);
-	const cwd = currentWorkspace ? currentWorkspace : path.dirname(fileUri.fsPath);
+	const cwd = path.dirname(fileUri.fsPath);
 	if (!path.isAbsolute(cwd)) {
 		return Promise.resolve([]);
 	}
 
 	running = true;
 
 	//TODO get Env and Vyper Exec from config if configured
-	const pythonFromVirtualEnv = getVyperDefaultVirtualEnv() + '/bin/python';
-	const vyperExec = getVyperDefaultVirtualEnv() + '/bin/vyper';
+	const pythonFromVirtualEnv = getVyperVirtualEnv() + '/bin/python';
+	const vyperExec = getVyperVirtualEnv() + '/bin/vyper';
 
 	const index = fileUri.path.lastIndexOf("/") + 1;
 	const fileName = fileUri.path.substr(index);