Rename cwd to pwd. Fixes #522. [ci skip].

Author: vlad-shatskyi

src/Autocompletion.ts

@@ -7,7 +7,7 @@ export const getSuggestions = async (job: Job, caretPosition: number) => {
     const node = leafNodeAt(caretPosition, job.prompt.ast);
     const suggestions = await node.suggestions({
         environment: job.environment,
-        historicalCurrentDirectoriesStack: job.session.historicalCurrentDirectoriesStack,
+        historicalPresentDirectoriesStack: job.session.historicalPresentDirectoriesStack,
         aliases: job.session.aliases,
     });
 

src/Command.ts

@@ -17,7 +17,7 @@ const executors: Dictionary<(i: Job, a: string[]) => void> = {
             const enteredPath = args[0];
 
             if (isHistoricalDirectory(enteredPath)) {
-                fullPath = expandHistoricalDirectory(enteredPath, job.session.historicalCurrentDirectoriesStack);
+                fullPath = expandHistoricalDirectory(enteredPath, job.session.historicalPresentDirectoriesStack);
             } else {
                 fullPath = job.environment.cdpath
                     .map(path => resolveDirectory(path, enteredPath))

src/Interfaces.ts

@@ -26,7 +26,7 @@ export interface Attributes {
 
 export interface PreliminarySuggestionContext {
     readonly environment: Environment;
-    readonly historicalCurrentDirectoriesStack: OrderedSet<string>;
+    readonly historicalPresentDirectoriesStack: OrderedSet<string>;
     readonly aliases: Aliases;
 }
 
@@ -55,8 +55,8 @@ export interface OutputDecorator {
 }
 
 export interface EnvironmentObserverPlugin {
-    currentWorkingDirectoryWillChange: (session: Session, directory: string) => void;
-    currentWorkingDirectoryDidChange: (session: Session, directory: string) => void;
+    presentWorkingDirectoryWillChange: (session: Session, directory: string) => void;
+    presentWorkingDirectoryDidChange: (session: Session, directory: string) => void;
 }
 
 export interface PreexecPlugin {

src/Session.ts

@@ -8,7 +8,7 @@ import {ApplicationComponent} from "./views/1_ApplicationComponent";
 import {Environment, processEnvironment} from "./Environment";
 import {
     homeDirectory, normalizeDirectory, writeFileCreatingParents,
-    currentWorkingDirectoryFilePath, historyFilePath,
+    presentWorkingDirectoryFilePath, historyFilePath,
 } from "./utils/Common";
 import {remote} from "electron";
 import {OrderedSet} from "./utils/OrderedSet";
@@ -19,7 +19,7 @@ export class Session extends EmitterWithUniqueID {
     readonly environment = new Environment(processEnvironment);
     readonly aliases = new Aliases(aliasesFromConfig);
     history = History;
-    historicalCurrentDirectoriesStack = new OrderedSet<string>();
+    historicalPresentDirectoriesStack = new OrderedSet<string>();
 
     constructor(private application: ApplicationComponent, private _dimensions: Dimensions) {
         super();
@@ -79,19 +79,19 @@ export class Session extends EmitterWithUniqueID {
         }
 
         PluginManager.environmentObservers.forEach(observer =>
-            observer.currentWorkingDirectoryWillChange(this, normalizedDirectory)
+            observer.presentWorkingDirectoryWillChange(this, normalizedDirectory)
         );
 
         this.environment.pwd = normalizedDirectory;
-        this.historicalCurrentDirectoriesStack.prepend(normalizedDirectory);
+        this.historicalPresentDirectoriesStack.prepend(normalizedDirectory);
 
         PluginManager.environmentObservers.forEach(observer =>
-            observer.currentWorkingDirectoryDidChange(this, normalizedDirectory)
+            observer.presentWorkingDirectoryDidChange(this, normalizedDirectory)
         );
     }
 
     private serialize() {
-        writeFileCreatingParents(currentWorkingDirectoryFilePath, JSON.stringify(this.directory)).then(
+        writeFileCreatingParents(presentWorkingDirectoryFilePath, JSON.stringify(this.directory)).then(
             () => void 0,
             (error: any) => { if (error) throw error; }
         );
@@ -103,7 +103,7 @@ export class Session extends EmitterWithUniqueID {
     };
 
     private deserialize(): void {
-        this.directory = this.readSerialized(currentWorkingDirectoryFilePath, homeDirectory);
+        this.directory = this.readSerialized(presentWorkingDirectoryFilePath, homeDirectory);
         History.deserialize(this.readSerialized(historyFilePath, []));
     }
 

src/plugins/DotEnvLoader.ts

@@ -5,8 +5,8 @@ import {exists} from "../utils/Common";
 import {sourceFile} from "../Command";
 
 PluginManager.registerEnvironmentObserver({
-    currentWorkingDirectoryWillChange: () => void 0,
-    currentWorkingDirectoryDidChange: async(session: Session, directory: string) => {
+    presentWorkingDirectoryWillChange: () => void 0,
+    presentWorkingDirectoryDidChange: async(session: Session, directory: string) => {
         if (await exists(Path.join(directory, ".env"))) {
             sourceFile(session, ".env");
         }

src/plugins/GitWatcher.ts

@@ -77,7 +77,7 @@ interface WatchesValue {
 class WatchManager implements EnvironmentObserverPlugin {
     directoryToDetails: Map<string, WatchesValue> = new Map();
 
-    currentWorkingDirectoryWillChange(session: Session, newDirectory: string) {
+    presentWorkingDirectoryWillChange(session: Session, newDirectory: string) {
         const oldDirectory = session.directory;
 
         if (!this.directoryToDetails.has(oldDirectory)) {
@@ -93,7 +93,7 @@ class WatchManager implements EnvironmentObserverPlugin {
         }
     }
 
-    currentWorkingDirectoryDidChange(session: Session, directory: string) {
+    presentWorkingDirectoryDidChange(session: Session, directory: string) {
         if (this.directoryToDetails.has(directory)) {
             this.directoryToDetails.get(directory)!.sessions.add(session);
         } else {

src/plugins/NVM.ts

@@ -13,10 +13,10 @@ async function withNvmPath(directory: string, callback: (path: string) => void)
 }
 
 PluginManager.registerEnvironmentObserver({
-    currentWorkingDirectoryWillChange: async(session: Session) => {
+    presentWorkingDirectoryWillChange: async(session: Session) => {
         withNvmPath(session.directory, path => session.environment.path.remove(path));
     },
-    currentWorkingDirectoryDidChange: async(session: Session, directory: string) => {
+    presentWorkingDirectoryDidChange: async(session: Session, directory: string) => {
         withNvmPath(directory, path => session.environment.path.prepend(path));
     },
 });

src/plugins/PWDOperatingSystemIntegrator.ts

@@ -3,9 +3,9 @@ import {PluginManager} from "../PluginManager";
 import {remote} from "electron";
 
 PluginManager.registerEnvironmentObserver({
-    currentWorkingDirectoryWillChange: () => { /* do nothing */ },
+    presentWorkingDirectoryWillChange: () => { /* do nothing */ },
 
-    currentWorkingDirectoryDidChange: (session: Session, directory: string) => {
+    presentWorkingDirectoryDidChange: (session: Session, directory: string) => {
         remote.app.addRecentDocument(directory);
     },
 });

src/plugins/RVM.ts

@@ -51,7 +51,7 @@ async function withRvmData(directory: string, callback: (binPaths: string[], gem
 }
 
 PluginManager.registerEnvironmentObserver({
-    currentWorkingDirectoryWillChange: () => async(session: Session, directory: string) => {
+    presentWorkingDirectoryWillChange: () => async(session: Session, directory: string) => {
         withRvmData(directory, binPaths => {
             binPaths.forEach(path => session.environment.path.remove(path));
 
@@ -61,7 +61,7 @@ PluginManager.registerEnvironmentObserver({
             });
         });
     },
-    currentWorkingDirectoryDidChange: async(session: Session, directory: string) => {
+    presentWorkingDirectoryDidChange: async(session: Session, directory: string) => {
         withRvmData(directory, (binPaths, gemPaths) => {
             binPaths.forEach(path => session.environment.path.prepend(path));
 

src/plugins/autocompletion_providers/Cd.ts

@@ -8,8 +8,8 @@ PluginManager.registerAutocompletionProvider("cd", async(context) => {
     let suggestions: Suggestion[] = [];
 
     if (context.argument.value.startsWith("-")) {
-        const historicalDirectoryAliases = _.take(["-", "-2", "-3", "-4", "-5", "-6", "-7", "-8", "-9"], context.historicalCurrentDirectoriesStack.size)
-            .map(alias => new Suggestion().withValue(alias).withDescription(expandHistoricalDirectory(alias, context.historicalCurrentDirectoriesStack)).withStyle(styles.directory));
+        const historicalDirectoryAliases = _.take(["-", "-2", "-3", "-4", "-5", "-6", "-7", "-8", "-9"], context.historicalPresentDirectoriesStack.size)
+            .map(alias => new Suggestion().withValue(alias).withDescription(expandHistoricalDirectory(alias, context.historicalPresentDirectoriesStack)).withStyle(styles.directory));
 
         suggestions.push(...historicalDirectoryAliases);
     }