Revert "Merge pull request atom#2308 from wadethestealth/project-mana…

…gement"

This reverts commit aae4848, reversing
changes made to 79afbab.

lib/atom/marker.js

@@ -25,7 +25,7 @@ export const DecorableContext = React.createContext();
 class BareMarker extends React.Component {
   static propTypes = {
     ...markerProps,
-    id: PropTypes.number,
+    id: PropTypes.string,
     bufferRange: RangePropType,
     markableHolder: RefHolderPropType,
     children: PropTypes.node,

lib/containers/current-pull-request-container.js

@@ -37,6 +37,8 @@ export default class CurrentPullRequestContainer extends React.Component {
     aheadCount: PropTypes.number,
     pushInProgress: PropTypes.bool.isRequired,
 
+    workspace: PropTypes.object.isRequired,
+
     // Actions
     onOpenIssueish: PropTypes.func.isRequired,
     onOpenReviews: PropTypes.func.isRequired,
@@ -162,6 +164,7 @@ export default class CurrentPullRequestContainer extends React.Component {
         total={associatedPullRequests.totalCount}
         results={associatedPullRequests.nodes}
         isLoading={false}
+        workspace={this.props.workspace}
         endpoint={this.props.endpoint}
         resultFilter={issueish => issueish.getHeadRepositoryID() === this.props.repository.id}
         {...this.controllerProps()}

lib/containers/github-tab-container.js

@@ -70,18 +70,8 @@ export default class GitHubTabContainer extends React.Component {
     }
 
     if (!this.props.repository.isPresent()) {
-      return (
-        <GitHubTabController
-          {...this.props}
-          remoteOperationObserver={this.state.remoteOperationObserver}
-
-          allRemotes={new RemoteSet()}
-          branches={new BranchSet()}
-          aheadCount={0}
-          pushInProgress={false}
-          isLoading={false}
-        />
-      );
+      // TODO include a better message here.
+      return null;
     }
 
     return (

lib/controllers/git-tab-controller.js

@@ -33,7 +33,6 @@ export default class GitTabController extends React.Component {
     workingDirectoryPath: PropTypes.string,
     mergeMessage: PropTypes.string,
     fetchInProgress: PropTypes.bool.isRequired,
-    currentWorkDir: PropTypes.string,
 
     workspace: PropTypes.object.isRequired,
     commands: PropTypes.object.isRequired,
@@ -52,9 +51,6 @@ export default class GitTabController extends React.Component {
     openFiles: PropTypes.func.isRequired,
     openInitializeDialog: PropTypes.func.isRequired,
     controllerRef: RefHolderPropType,
-    changeWorkingDirectory: PropTypes.func.isRequired,
-    onDidChangeWorkDirs: PropTypes.func.isRequired,
-    getCurrentWorkDirs: PropTypes.func.isRequired,
   };
 
   constructor(props, context) {
@@ -103,7 +99,7 @@ export default class GitTabController extends React.Component {
         unstagedChanges={this.props.unstagedChanges}
         stagedChanges={this.props.stagedChanges}
         mergeConflicts={this.props.mergeConflicts}
-        workingDirectoryPath={this.props.workingDirectoryPath || this.props.currentWorkDir}
+        workingDirectoryPath={this.props.workingDirectoryPath}
         mergeMessage={this.props.mergeMessage}
         userStore={this.userStore}
         selectedCoAuthors={this.state.selectedCoAuthors}
@@ -123,9 +119,6 @@ export default class GitTabController extends React.Component {
         openFiles={this.props.openFiles}
         discardWorkDirChangesForPaths={this.props.discardWorkDirChangesForPaths}
         undoLastDiscard={this.props.undoLastDiscard}
-        changeWorkingDirectory={this.props.changeWorkingDirectory}
-        getCurrentWorkDirs={this.props.getCurrentWorkDirs}
-        onDidChangeWorkDirs={this.props.onDidChangeWorkDirs}
 
         attemptFileStageOperation={this.attemptFileStageOperation}
         attemptStageAllOperation={this.attemptStageAllOperation}

lib/controllers/github-tab-controller.js

@@ -21,11 +21,6 @@ export default class GitHubTabController extends React.Component {
     aheadCount: PropTypes.number,
     pushInProgress: PropTypes.bool.isRequired,
     isLoading: PropTypes.bool.isRequired,
-    currentWorkDir: PropTypes.string,
-
-    changeWorkingDirectory: PropTypes.func.isRequired,
-    onDidChangeWorkDirs: PropTypes.func.isRequired,
-    getCurrentWorkDirs: PropTypes.func.isRequired,
   }
 
   render() {
@@ -47,7 +42,7 @@ export default class GitHubTabController extends React.Component {
         loginModel={this.props.loginModel}
         rootHolder={this.props.rootHolder}
 
-        workingDirectory={this.props.workingDirectory || this.props.currentWorkDir}
+        workingDirectory={this.props.workingDirectory}
         branches={this.props.branches}
         currentBranch={currentBranch}
         remotes={gitHubRemotes}
@@ -59,9 +54,6 @@ export default class GitHubTabController extends React.Component {
 
         handlePushBranch={this.handlePushBranch}
         handleRemoteSelect={this.handleRemoteSelect}
-        changeWorkingDirectory={this.props.changeWorkingDirectory}
-        getCurrentWorkDirs={this.props.getCurrentWorkDirs}
-        onDidChangeWorkDirs={this.props.onDidChangeWorkDirs}
       />
     );
   }

lib/controllers/issueish-list-controller.js

@@ -56,6 +56,7 @@ export class BareIssueishListController extends React.Component {
     onOpenMore: PropTypes.func,
 
     emptyComponent: PropTypes.func,
+    workspace: PropTypes.object,
     endpoint: EndpointPropType,
     needReviewsButton: PropTypes.bool,
   };

lib/controllers/root-controller.js

@@ -60,14 +60,11 @@ export default class RootController extends React.Component {
     switchboard: PropTypes.instanceOf(Switchboard),
     pipelineManager: PropTypes.object,
 
-    currentWorkDir: PropTypes.string,
-
     // Git actions
     initialize: PropTypes.func.isRequired,
     clone: PropTypes.func.isRequired,
 
     // Control
-    changeWorkingDirectory: PropTypes.func.isRequired,
     startOpen: PropTypes.bool,
     startRevealed: PropTypes.bool,
   }
@@ -261,10 +258,6 @@ export default class RootController extends React.Component {
   }
 
   renderPaneItems() {
-    const {workdirContextPool} = this.props;
-    const getCurrentWorkDirs = workdirContextPool.getCurrentWorkDirs.bind(workdirContextPool);
-    const onDidChangeWorkDirs = workdirContextPool.onDidChangePoolContexts.bind(workdirContextPool);
-
     return (
       <Fragment>
         <PaneItem
@@ -291,10 +284,6 @@ export default class RootController extends React.Component {
               discardWorkDirChangesForPaths={this.discardWorkDirChangesForPaths}
               undoLastDiscard={this.undoLastDiscard}
               refreshResolutionProgress={this.refreshResolutionProgress}
-              currentWorkDir={this.props.currentWorkDir}
-              getCurrentWorkDirs={getCurrentWorkDirs}
-              onDidChangeWorkDirs={onDidChangeWorkDirs}
-              changeWorkingDirectory={this.props.changeWorkingDirectory}
             />
           )}
         </PaneItem>
@@ -308,10 +297,6 @@ export default class RootController extends React.Component {
               repository={this.props.repository}
               loginModel={this.props.loginModel}
               workspace={this.props.workspace}
-              currentWorkDir={this.props.currentWorkDir}
-              getCurrentWorkDirs={getCurrentWorkDirs}
-              onDidChangeWorkDirs={onDidChangeWorkDirs}
-              changeWorkingDirectory={this.props.changeWorkingDirectory}
             />
           )}
         </PaneItem>

lib/github-package.js

@@ -175,14 +175,9 @@ export default class GithubPackage {
       return !!event.target.closest('.github-FilePatchListView').querySelector('.is-selected');
     };
 
-    const handleProjectPathsChange = () => {
-      const activeRepository = this.getActiveRepository();
-      const activeRepositoryPath = activeRepository ? activeRepository.getWorkingDirectoryPath() : null;
-      this.scheduleActiveContextUpdate({activeRepositoryPath});
-    };
-
     this.subscriptions.add(
-      this.project.onDidChangePaths(handleProjectPathsChange),
+      this.project.onDidChangePaths(this.scheduleActiveContextUpdate),
+      this.workspace.getCenter().onDidChangeActivePaneItem(this.scheduleActiveContextUpdate),
       this.styleCalculator.startWatching(
         'github-package-styles',
         ['editor.fontSize', 'editor.fontFamily', 'editor.lineHeight', 'editor.tabLength'],
@@ -274,10 +269,6 @@ export default class GithubPackage {
       }));
     }
 
-    const changeWorkingDirectory = workingDirectory => {
-      this.scheduleActiveContextUpdate({activeRepositoryPath: workingDirectory});
-    };
-
     this.renderFn(
       <RootController
         ref={c => { this.controller = c; }}
@@ -303,8 +294,6 @@ export default class GithubPackage {
         startOpen={this.startOpen}
         startRevealed={this.startRevealed}
         removeFilePatchItem={this.removeFilePatchItem}
-        currentWorkDir={this.getActiveWorkdir()}
-        changeWorkingDirectory={changeWorkingDirectory}
       />, this.element, callback,
     );
   }
@@ -506,13 +495,14 @@ export default class GithubPackage {
    * Derive the git working directory context that should be used for the package's git operations based on the current
    * state of the Atom workspace. In priority, this prefers:
    *
-   * - The preferred git working directory set by the user (This is also the working directory that was active when the
-   *   package was last serialized).
-   * - A git working directory corresponding to "first" Project, whether or not there is a single project or multiple.
+   * - A git working directory that contains the active pane item in the workspace's center.
+   * - A git working directory corresponding to a single Project.
+   * - When initially activating the package, the working directory that was active when the package was last
+   *   serialized.
    * - The current context, unchanged, which may be a `NullWorkdirContext`.
    *
    * First updates the pool of resident contexts to match all git working directories that correspond to open
-   * projects.
+   * projects and pane items.
    */
   async getNextContext(savedState) {
     const workdirs = new Set(
@@ -524,34 +514,50 @@ export default class GithubPackage {
       ),
     );
 
-    // Update pool with the open projects
-    this.contextPool.set(workdirs, savedState);
+    const fromPaneItem = async maybeItem => {
+      const itemPath = pathForPaneItem(maybeItem);
 
-    if (savedState.activeRepositoryPath) {
-      // Preferred git directory (the preferred directory or the last serialized directory).
-      const stateContext = this.contextPool.getContext(savedState.activeRepositoryPath);
-      // If the context exists chose it, else continue.
-      if (stateContext.isPresent()) {
-        return stateContext;
+      if (!itemPath) {
+        return {};
       }
-    }
 
-    const projectPaths = this.project.getPaths();
+      const itemWorkdir = await this.workdirCache.find(itemPath);
+
+      if (itemWorkdir && !this.project.contains(itemPath)) {
+        workdirs.add(itemWorkdir);
+      }
+
+      return {itemPath, itemWorkdir};
+    };
+
+    const active = await fromPaneItem(this.workspace.getCenter().getActivePaneItem());
+
+    this.contextPool.set(workdirs, savedState);
 
-    if (projectPaths.length >= 1) {
-      // Single or multiple projects (just choose the first, the user can select after)
-      const projectPath = projectPaths[0];
+    if (active.itemPath) {
+      // Prefer an active item
+      return this.contextPool.getContext(active.itemWorkdir || active.itemPath);
+    }
+
+    if (this.project.getPaths().length === 1) {
+      // Single project
+      const projectPath = this.project.getPaths()[0];
       const activeWorkingDir = await this.workdirCache.find(projectPath);
       return this.contextPool.getContext(activeWorkingDir || projectPath);
     }
 
-    if (projectPaths.length === 0 && !this.activeContext.getRepository().isUndetermined()) {
+    if (this.project.getPaths().length === 0 && !this.activeContext.getRepository().isUndetermined()) {
       // No projects. Revert to the absent context unless we've guessed that more projects are on the way.
       return WorkdirContext.absent({pipelineManager: this.pipelineManager});
     }
 
-    // It is only possible to reach here if there there was no preferred directory, there are no project paths and the
-    // the active context's repository is not undetermined.
+    // Restore models from saved state. Will return a NullWorkdirContext if this path is not presently
+    // resident in the pool.
+    const savedWorkingDir = savedState.activeRepositoryPath;
+    if (savedWorkingDir) {
+      return this.contextPool.getContext(savedWorkingDir);
+    }
+
     return this.activeContext;
   }
 
@@ -594,3 +600,22 @@ export default class GithubPackage {
     }
   }
 }
+
+function pathForPaneItem(paneItem) {
+  if (!paneItem) {
+    return null;
+  }
+
+  // Likely GitHub package provided pane item
+  if (typeof paneItem.getWorkingDirectory === 'function') {
+    return paneItem.getWorkingDirectory();
+  }
+
+  // TextEditor-like
+  if (typeof paneItem.getPath === 'function') {
+    return paneItem.getPath();
+  }
+
+  // Oh well
+  return null;
+}