Ensure direnv runs before everything else

package.json

@@ -6,7 +6,7 @@
     "publisher": "Rubymaniac",
     "license": "MIT",
     "engines": {
-        "vscode": "^1.0.0"
+        "vscode": "^1.1.34"
     },
     "bugs": {
         "url": "https://github.com/rubymaniac/vscode-direnv/issues"
@@ -16,22 +16,26 @@
         "url": "https://github.com/rubymaniac/vscode-direnv.git"
     },
     "scripts": {
-        "vscode:prepublish": "node ./node_modules/vscode/bin/compile",
-        "compile": "node ./node_modules/vscode/bin/compile -watch -p ./",
+        "vscode:prepublish": "./node_modules/typescript/bin/tsc -p ./",
+        "compile": "./node_modules/typescript/bin/tsc -watch -p ./",
         "postinstall": "node ./node_modules/vscode/bin/install",
         "lint": "node ./node_modules/tslint/bin/tslint ./src/*.ts"
     },
     "devDependencies": {
-        "typescript": "^1.8.5",
+        "typescript": "^2.0.3",
         "tslint": "^3.15.1",
-        "vscode": "^0.11.0"
+        "vsce": "^1.75.0",
+        "vscode": "^1.1.34",
+        "mocha": "^2.3.3",
+        "@types/node": "^6.0.40",
+        "@types/mocha": "^2.2.32"
     },
     "dependencies": {},
     "categories": [
         "Other"
     ],
     "activationEvents": [
-        "*"
+        "onFileSystem:file"
     ],
     "main": "./out/src/main",
     "contributes": {
@@ -53,4 +57,4 @@
             }
         ]
     }
-}
+}

src/command.ts

@@ -1,7 +1,7 @@
 'use strict';
 
 import * as path from 'path';
-import { exec, ExecOptions } from 'child_process';
+import { execSync, ExecOptions } from 'child_process';
 import * as constants from './constants';
 import * as utils from './utils';
 
@@ -16,31 +16,27 @@ interface CommandExecOptions {
 export class Command {
     rootPath: string;
     rcPath: string;
+    direnvExe: any;
     constructor(rootPath: string) {
         this.rootPath = rootPath;
         this.rcPath = path.join(rootPath, `${constants.direnv.rc}`);
     }
     // Private methods
-    private exec(options: CommandExecOptions): Thenable<string> {
+    private exec(options: CommandExecOptions): string {
         let direnvCmd = [constants.direnv.cmd, options.cmd].join(' ');
         let execOptions: ExecOptions = {};
         if (options.cwd == null || options.cwd) {
             execOptions.cwd = this.rootPath;
         }
-        return new Promise((resolve, reject) => {
-            exec(direnvCmd, execOptions, (err, stdout, stderr) => {
-                if (err) {
-                    err.message = stderr;
-                    reject(err);
-                } else {
-                    resolve(stdout);
-                }
-            });
-        });
+        let result = execSync(direnvCmd, execOptions);
+        return result.toString();
     }
     // Public methods
     version = () => this.exec({ cmd: 'version' });
     allow = () => this.exec({ cmd: 'allow' });
     deny = () => this.exec({ cmd: 'deny' });
-    exportJSON = () => this.exec({ cmd: 'export json' }).then((o) => o ? JSON.parse(o) : {});
+    exportJSON = () => {
+        let o = this.exec({ cmd: 'export json' });
+        return o ? JSON.parse(o) : {};
+    }
 }

src/main.ts

@@ -12,49 +12,53 @@ let displayError = (e) =>
     vscode.window.showErrorMessage(constants.messages.error(e));
 let handleError = (t: Thenable<any>) => t.then(undefined, displayError);
 let version = () =>
-    command.version().then(v => vscode.window.showInformationMessage(constants.messages.version(v)), displayError);
+    vscode.window.showInformationMessage(constants.messages.version(command.version()));
 let revertFromOption = (option) => {
     if (option === constants.vscode.extension.actions.revert) {
         utils.assign(process.env, oldEnvDiff);
         oldEnvDiff = {};
         vscode.window.showInformationMessage(constants.messages.reverted);
     }
 };
-let assignEnvDiff = (options: { showSuccess: boolean }) => {
-    return command.exportJSON().then((envDiff) => {
+let assignEnvDiff = async (options: { showSuccess: boolean }) => {
+    try {
+        let envDiff = command.exportJSON()
         Object.keys(envDiff).forEach((key) => {
             if (key.indexOf('DIRENV_') === -1 && oldEnvDiff[key] !== envDiff[key]) {
                 oldEnvDiff[key] = process.env[key];
             }
         });
-        return utils.assign(process.env, envDiff);
-    }).then(() => {
+        utils.assign(process.env, envDiff);
         if (options.showSuccess) {
             return vscode.window.showInformationMessage(constants.messages.assign.success);
         }
-    }, (err) => {
+    } catch (err) {
+        let optionP;
         if (err.message.indexOf(`${constants.direnv.rc} is blocked`) !== -1) {
-            return vscode.window.showWarningMessage(constants.messages.assign.warn,
+            optionP = vscode.window.showWarningMessage(constants.messages.assign.warn,
                 constants.vscode.extension.actions.allow, constants.vscode.extension.actions.view);
         } else {
-            return displayError(err);
+            optionP = displayError(err);
         }
-    }).then((option) => {
+        let option = await optionP
         if (option === constants.vscode.extension.actions.allow) {
             return allow();
         } else if (option === constants.vscode.extension.actions.view) {
             return viewThenAllow();
         }
-    });
+    }
 };
 let allow = () => {
-    return command.allow().then(() => assignEnvDiff({ showSuccess: true }), (err) => {
+    try {
+        command.allow();
+        return assignEnvDiff({ showSuccess: true });
+    } catch (err) {
         if (err.message.indexOf(`${constants.direnv.rc} file not found`) !== -1) {
             return vscode.commands.executeCommand(constants.vscode.commands.open, vscode.Uri.file(command.rcPath));
         } else {
-            displayError(err);
+            return displayError(err);
         }
-    });
+    };
 };
 let allowFromOption = (option) => {
     if (option === constants.vscode.extension.actions.allow) {

tsconfig.json

@@ -1,10 +1,10 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "target": "es5",
+        "target": "es6",
         "outDir": "out",
-        "noLib": true,
         "sourceMap": true,
+        "lib": ["es6"],
         "rootDir": "."
     },
     "exclude": [