Parse exported variables properly. Fixes #1102.

Author: vlad-shatskyi

src/plugins/DotEnvLoader.ts

@@ -2,7 +2,7 @@ import {Session} from "../shell/Session";
 import {PluginManager} from "../PluginManager";
 import * as Path from "path";
 import {io} from "../utils/Common";
-import {sourceFile} from "../shell/Command";
+import {sourceFile} from "../shell/BuiltInCommands";
 
 PluginManager.registerEnvironmentObserver({
     presentWorkingDirectoryWillChange: () => void 0,

src/plugins/autocompletion_providers/Cd.ts

@@ -1,4 +1,4 @@
-import {expandHistoricalDirectory} from "../../shell/Command";
+import {expandHistoricalDirectory} from "../../shell/BuiltInCommands";
 import {styles, directoriesSuggestionsProvider, Suggestion} from "../autocompletion_utils/Common";
 import * as _ from "lodash";
 import {PluginManager} from "../../PluginManager";

src/shell/Command.ts renamed to src/shell/BuiltInCommands.ts

@@ -6,6 +6,7 @@ import {EOL} from "os";
 import {Session} from "./Session";
 import {OrderedSet} from "../utils/OrderedSet";
 import {parseAlias} from "./Aliases";
+import {stringLiteralValue} from "./Scanner";
 
 const executors: Dictionary<(i: Job, a: string[]) => void> = {
     cd: (job: Job, args: string[]): void => {
@@ -89,8 +90,12 @@ export function sourceFile(session: Session, fileName: string) {
 
     content.split(EOL).forEach(line => {
         if (line.startsWith("export ")) {
-            const [key, value] = line.split(" ")[1].split("=");
-            session.environment.set(key, value);
+            const [variableName, variableValueLiteral] = line.split(" ")[1].split("=");
+
+            const variableValue = stringLiteralValue(variableValueLiteral);
+            if (variableValue) {
+                session.environment.set(variableName, variableValue);
+            }
         }
     });
 }

src/shell/CommandExecutor.ts

@@ -1,5 +1,5 @@
 import {Job} from "./Job";
-import {Command} from "./Command";
+import {Command} from "./BuiltInCommands";
 import {PTY} from "../PTY";
 import * as Path from "path";
 import {resolveFile, isWindows, filterAsync, io} from "../utils/Common";

src/shell/Scanner.ts

@@ -285,3 +285,25 @@ export function expandAliases(tokens: Token[], aliases: Aliases): Token[] {
         return tokens;
     }
 }
+
+export function stringLiteralValue(literal: string): string | undefined {
+    const tokens = scan(literal);
+
+    if (tokens.length !== 1) {
+        return;
+    }
+
+    const token = tokens[0];
+
+    if (token instanceof DoubleQuotedStringLiteral) {
+        return token.value;
+    }
+
+    if (token instanceof SingleQuotedStringLiteral) {
+        return token.value;
+    }
+
+    if (token instanceof Word) {
+        return token.value;
+    }
+}