more event stuff

Author: JohnstonCode

src/model.ts

@@ -50,10 +50,7 @@ export class Model {
   }
 
   private disable(): void {
-    const openRepositories = [...this.openRepositories];
-
-    openRepositories.forEach(repository => r.dispose());
-
+    this.repositories.forEach(repository => repository.dispose());
     this.openRepositories = [];
     this.disposables = dispose(this.disposables);
   }
@@ -66,8 +63,6 @@ export class Model {
       folder => !this.getOpenRepository(folder.uri)
     );
 
-    // console.log(workspace.workspaceFolders);
-
     const openRepositoriesToDispose = removed
       .map(folder => this.getOpenRepository(folder.uri.fsPath))
       .filter(repository => !!repository)
@@ -76,10 +71,12 @@ export class Model {
           !(workspace.workspaceFolders || []).some(f =>
             repository!.repository.root.startsWith(f.uri.fsPath)
           )
-      );
+      ) as OpenRepository[];
 
-    // console.log(removed);
-    console.log(openRepositoriesToDispose);
+    possibleRepositoryFolders.forEach(p =>
+      this.tryOpenRepository(p.uri.fsPath)
+    );
+    openRepositoriesToDispose.forEach(r => r.repository.dispose());
   }
 
   private async scanWorkspaceFolders() {

src/repository.ts

@@ -5,18 +5,26 @@ import {
   FileSystemWatcher,
   SourceControl,
   SourceControlResourceGroup,
-  SourceControlInputBox
+  SourceControlInputBox,
+  Disposable,
+  EventEmitter,
+  Event
 } from "vscode";
 import { Resource } from "./resource";
 import { throttleAsync } from "./decorators";
 import { Repository as BaseRepository } from "./svn";
 import { SvnStatusBar } from "./statusBar";
+import { dispose } from "./util";
 
 export class Repository {
   public watcher: FileSystemWatcher;
   private sourceControl: SourceControl;
   public changes: SourceControlResourceGroup;
   public notTracked: SourceControlResourceGroup;
+  private disposables: Disposable[] = [];
+
+  private _onDidChangeStatus = new EventEmitter<void>();
+  readonly onDidChangeStatus: Event<void> = this._onDidChangeStatus.event;
 
   get root(): string {
     return this.repository.root;
@@ -32,6 +40,8 @@ export class Repository {
 
   constructor(public repository: BaseRepository) {
     this.watcher = workspace.createFileSystemWatcher("**");
+    this.disposables.push(this.watcher);
+
     this.sourceControl = scm.createSourceControl(
       "svn",
       "SVN",
@@ -43,9 +53,16 @@ export class Repository {
       arguments: [this.sourceControl]
     };
     this.sourceControl.quickDiffProvider = this;
-
-    const test = new SvnStatusBar(this);
-    this.sourceControl.statusBarCommands = test.commands;
+    this.disposables.push(this.sourceControl);
+
+    const statusBar = new SvnStatusBar(this);
+    this.disposables.push(statusBar);
+    statusBar.onDidChange(
+      () => (this.sourceControl.statusBarCommands = statusBar.commands),
+      null,
+      this.disposables
+    );
+    this.sourceControl.statusBarCommands = statusBar.commands;
 
     this.changes = this.sourceControl.createResourceGroup("changes", "Changes");
     this.notTracked = this.sourceControl.createResourceGroup(
@@ -111,6 +128,8 @@ export class Repository {
     this.changes.resourceStates = changes;
     this.notTracked.resourceStates = notTracked;
 
+    this._onDidChangeStatus.fire();
+
     return Promise.resolve();
   }
 
@@ -132,4 +151,8 @@ export class Repository {
   addFile(filePath: string) {
     return this.repository.addFile(filePath);
   }
+
+  dispose(): void {
+    this.disposables = dispose(this.disposables);
+  }
 }

src/statusBar.ts

@@ -1,11 +1,21 @@
-import { window, StatusBarItem } from "vscode";
+import { window, StatusBarItem, Disposable, EventEmitter, Event } from "vscode";
 import { Repository } from "./repository";
 
 export class SvnStatusBar {
-  private statusBar: StatusBarItem;
-  private currentBranch: string;
+  private disposables: Disposable[] = [];
+  private _onDidChange = new EventEmitter<void>();
 
-  constructor(private repository: Repository) {}
+  get onDidChange(): Event<void> {
+    return this._onDidChange.event;
+  }
+
+  constructor(private repository: Repository) {
+    repository.onDidChangeStatus(
+      this._onDidChange.fire,
+      this._onDidChange,
+      this.disposables
+    );
+  }
 
   get commands() {
     // const title = `$(git-branch) ${this.repository.headLabel}`;
@@ -19,4 +29,8 @@ export class SvnStatusBar {
       }
     ];
   }
+
+  dispose(): void {
+    this.disposables.forEach(disposable => disposable.dispose());
+  }
 }