chore: code clean up (#815)

JohnstonCode · web-flow · commit 61f46e15a77e · 2020-02-18T07:58:47.000Z
diff --git a/src/extension.ts b/src/extension.ts
@@ -40,32 +40,22 @@ async function init(
     svn,
     ConstructorPolicy.Async
   );
-  const contentProvider = new SvnContentProvider(sourceControlManager);
 
   registerCommands(sourceControlManager, disposables);
 
-  disposables.push(sourceControlManager, contentProvider, tempSvnFs);
-
-  const svnProvider = new SvnProvider(sourceControlManager);
-
-  window.registerTreeDataProvider("svn", svnProvider);
-
-  const repoLogProvider = new RepoLogProvider(sourceControlManager);
-  disposables.push(repoLogProvider);
-  window.registerTreeDataProvider("repolog", repoLogProvider);
-
-  const itemLogProvider = new ItemLogProvider(sourceControlManager);
-  disposables.push(itemLogProvider);
-  window.registerTreeDataProvider("itemlog", itemLogProvider);
-
-  const branchChangesProvider = new BranchChangesProvider(sourceControlManager);
-  disposables.push(branchChangesProvider);
-  window.registerTreeDataProvider("branchchanges", branchChangesProvider);
-
-  disposables.push(new CheckActiveEditor(sourceControlManager));
-  disposables.push(new OpenRepositoryCount(sourceControlManager));
-  disposables.push(new IsSvn18orGreater(info.version));
-  disposables.push(new IsSvn19orGreater(info.version));
+  disposables.push(
+    sourceControlManager,
+    tempSvnFs,
+    new SvnContentProvider(sourceControlManager),
+    new SvnProvider(sourceControlManager),
+    new RepoLogProvider(sourceControlManager),
+    new ItemLogProvider(sourceControlManager),
+    new BranchChangesProvider(sourceControlManager),
+    new CheckActiveEditor(sourceControlManager),
+    new OpenRepositoryCount(sourceControlManager),
+    new IsSvn18orGreater(info.version),
+    new IsSvn19orGreater(info.version)
+  );
 
   outputChannel.appendLine(`Using svn "${info.version}" from "${info.path}"`);
 
diff --git a/src/historyView/branchChangesProvider.ts b/src/historyView/branchChangesProvider.ts
@@ -3,7 +3,8 @@ import {
   Disposable,
   TreeItem,
   commands,
-  EventEmitter
+  EventEmitter,
+  window
 } from "vscode";
 import { SourceControlManager } from "../source_control_manager";
 import { ISvnPathChange, Status } from "../common/types";
@@ -18,22 +19,19 @@ export class BranchChangesProvider
 
   constructor(private model: SourceControlManager) {
     this._dispose.push(
+      window.registerTreeDataProvider("branchchanges", this),
       commands.registerCommand(
         "svn.branchchanges.openDiff",
         this.openDiffCmd,
         this
-      )
-    );
-
-    this._dispose.push(
+      ),
       commands.registerCommand(
         "svn.branchchanges.refresh",
         () => this._onDidChangeTreeData.fire(),
         this
-      )
+      ),
+      this.model.onDidChangeRepository(() => this._onDidChangeTreeData.fire())
     );
-
-    this.model.onDidChangeRepository(() => this._onDidChangeTreeData.fire());
   }
 
   dispose() {
diff --git a/src/historyView/itemLogProvider.ts b/src/historyView/itemLogProvider.ts
@@ -44,37 +44,28 @@ export class ItemLogProvider
   private _dispose: Disposable[] = [];
 
   constructor(private sourceControlManager: SourceControlManager) {
-    window.onDidChangeActiveTextEditor(this.editorChanged, this);
     this._dispose.push(
+      window.onDidChangeActiveTextEditor(this.editorChanged, this),
+      window.registerTreeDataProvider("itemlog", this),
       commands.registerCommand(
         "svn.itemlog.copymsg",
         async (item: ILogTreeItem) => copyCommitToClipboard("msg", item)
-      )
-    );
-    this._dispose.push(
+      ),
       commands.registerCommand(
         "svn.itemlog.copyrevision",
         async (item: ILogTreeItem) => copyCommitToClipboard("revision", item)
-      )
-    );
-    this._dispose.push(
+      ),
       commands.registerCommand(
         "svn.itemlog.openFileRemote",
         this.openFileRemoteCmd,
         this
-      )
-    );
-    this._dispose.push(
-      commands.registerCommand("svn.itemlog.openDiff", this.openDiffCmd, this)
-    );
-    this._dispose.push(
+      ),
+      commands.registerCommand("svn.itemlog.openDiff", this.openDiffCmd, this),
       commands.registerCommand(
         "svn.itemlog.openDiffBase",
         this.openDiffBaseCmd,
         this
-      )
-    );
-    this._dispose.push(
+      ),
       commands.registerCommand("svn.itemlog.refresh", this.refresh, this)
     );
     this.refresh();
diff --git a/src/historyView/repoLogProvider.ts b/src/historyView/repoLogProvider.ts
@@ -85,53 +85,40 @@ export class RepoLogProvider
   constructor(private sourceControlManager: SourceControlManager) {
     this.refresh();
     this._dispose.push(
+      window.registerTreeDataProvider("repolog", this),
       commands.registerCommand(
         "svn.repolog.copymsg",
         async (item: ILogTreeItem) => copyCommitToClipboard("msg", item)
-      )
-    );
-    this._dispose.push(
+      ),
       commands.registerCommand(
         "svn.repolog.copyrevision",
         async (item: ILogTreeItem) => copyCommitToClipboard("revision", item)
-      )
-    );
-    this._dispose.push(
+      ),
       commands.registerCommand(
         "svn.repolog.addrepolike",
         this.addRepolikeGui,
         this
-      )
-    );
-    this._dispose.push(
-      commands.registerCommand("svn.repolog.remove", this.removeRepo, this)
-    );
-    this._dispose.push(
+      ),
+      commands.registerCommand("svn.repolog.remove", this.removeRepo, this),
       commands.registerCommand(
         "svn.repolog.openFileRemote",
         this.openFileRemoteCmd,
         this
-      )
-    );
-    this._dispose.push(
-      commands.registerCommand("svn.repolog.openDiff", this.openDiffCmd, this)
-    );
-    this._dispose.push(
+      ),
+      commands.registerCommand("svn.repolog.openDiff", this.openDiffCmd, this),
       commands.registerCommand(
         "svn.repolog.openFileLocal",
         this.openFileLocal,
         this
+      ),
+      commands.registerCommand("svn.repolog.refresh", this.refresh, this),
+      this.sourceControlManager.onDidChangeRepository(
+        async (_e: RepositoryChangeEvent) => {
+          return this.refresh();
+          // TODO refresh only required repo, need to pass element === getChildren()
+        }
       )
     );
-    this._dispose.push(
-      commands.registerCommand("svn.repolog.refresh", this.refresh, this)
-    );
-    this.sourceControlManager.onDidChangeRepository(
-      async (_e: RepositoryChangeEvent) => {
-        return this.refresh();
-        // TODO refresh only required repo, need to pass element === getChildren()
-      }
-    );
   }
 
   public dispose() {
diff --git a/src/parser/diffParser.ts b/src/parser/diffParser.ts
@@ -1,6 +1,6 @@
-import { ISvnPath } from "./common/types";
+import { ISvnPath } from "../common/types";
 import * as xml2js from "xml2js";
-import { camelcase } from "./util";
+import { camelcase } from "../util";
 
 export async function parseDiffXml(content: string): Promise<ISvnPath[]> {
   return new Promise<ISvnPath[]>((resolve, reject) => {
diff --git a/src/parser/infoParser.ts b/src/parser/infoParser.ts
@@ -1,6 +1,6 @@
 import * as xml2js from "xml2js";
-import { ISvnInfo } from "./common/types";
-import { camelcase } from "./util";
+import { ISvnInfo } from "../common/types";
+import { camelcase } from "../util";
 
 export async function parseInfoXml(content: string): Promise<ISvnInfo> {
   return new Promise<ISvnInfo>((resolve, reject) => {
diff --git a/src/parser/listParser.ts b/src/parser/listParser.ts
@@ -1,6 +1,6 @@
 import * as xml2js from "xml2js";
-import { xml2jsParseSettings } from "./common/constants";
-import { ISvnListItem } from "./common/types";
+import { xml2jsParseSettings } from "../common/constants";
+import { ISvnListItem } from "../common/types";
 
 export async function parseSvnList(content: string): Promise<ISvnListItem[]> {
   return new Promise<ISvnListItem[]>((resolve, reject) => {
diff --git a/src/parser/logParser.ts b/src/parser/logParser.ts
@@ -1,6 +1,6 @@
 import * as xml2js from "xml2js";
-import { xml2jsParseSettings } from "./common/constants";
-import { ISvnLogEntry } from "./common/types";
+import { xml2jsParseSettings } from "../common/constants";
+import { ISvnLogEntry } from "../common/types";
 
 export async function parseSvnLog(content: string): Promise<ISvnLogEntry[]> {
   return new Promise<ISvnLogEntry[]>((resolve, reject) => {
diff --git a/src/parser/statusParser.ts b/src/parser/statusParser.ts
@@ -1,6 +1,6 @@
 import * as xml2js from "xml2js";
-import { xml2jsParseSettings } from "./common/constants";
-import { IEntry, IFileStatus, IWcStatus } from "./common/types";
+import { xml2jsParseSettings } from "../common/constants";
+import { IEntry, IFileStatus, IWcStatus } from "../common/types";
 
 function processEntry(
   entry: IEntry | IEntry[],
diff --git a/src/svn.ts b/src/svn.ts
@@ -10,7 +10,7 @@ import {
 } from "./common/types";
 import * as encodeUtil from "./encoding";
 import { configuration } from "./helpers/configuration";
-import { parseInfoXml } from "./infoParser";
+import { parseInfoXml } from "./parser/infoParser";
 import SvnError from "./svnError";
 import { Repository } from "./svnRepository";
 import { dispose, IDisposable, toDisposable } from "./util";
diff --git a/src/svnRepository.ts b/src/svnRepository.ts
@@ -18,10 +18,10 @@ import * as encodeUtil from "./encoding";
 import { exists, writeFile } from "./fs";
 import { getBranchName } from "./helpers/branch";
 import { configuration } from "./helpers/configuration";
-import { parseInfoXml } from "./infoParser";
-import { parseSvnList } from "./listParser";
-import { parseSvnLog } from "./logParser";
-import { parseStatusXml } from "./statusParser";
+import { parseInfoXml } from "./parser/infoParser";
+import { parseSvnList } from "./parser/listParser";
+import { parseSvnLog } from "./parser/logParser";
+import { parseStatusXml } from "./parser/statusParser";
 import { Svn } from "./svn";
 import {
   fixPathSeparator,
@@ -30,7 +30,7 @@ import {
   normalizePath,
   unwrap
 } from "./util";
-import { parseDiffXml } from "./diffParser";
+import { parseDiffXml } from "./parser/diffParser";
 
 export class Repository {
   private _infoCache: {
diff --git a/src/treeView/dataProviders/svnProvider.ts b/src/treeView/dataProviders/svnProvider.ts
@@ -3,22 +3,30 @@ import {
   Event,
   EventEmitter,
   TreeDataProvider,
-  TreeItem
+  TreeItem,
+  Disposable,
+  window
 } from "vscode";
 import { SourceControlManager } from "../../source_control_manager";
 import BaseNode from "../nodes/baseNode";
 import RepositoryNode from "../nodes/repositoryNode";
+import { dispose } from "../../util";
 
-export default class SvnProvider implements TreeDataProvider<BaseNode> {
+export default class SvnProvider
+  implements TreeDataProvider<BaseNode>, Disposable {
   private _onDidChangeTreeData: EventEmitter<
     BaseNode | undefined
   > = new EventEmitter<BaseNode | undefined>();
+  private _dispose: Disposable[] = [];
   public onDidChangeTreeData: Event<BaseNode | undefined> = this
     ._onDidChangeTreeData.event;
 
   constructor(private sourceControlManager: SourceControlManager) {
-    commands.registerCommand("svn.treeview.refreshProvider", () =>
-      this.refresh()
+    this._dispose.push(
+      window.registerTreeDataProvider("svn", this),
+      commands.registerCommand("svn.treeview.refreshProvider", () =>
+        this.refresh()
+      )
     );
   }
 
@@ -54,4 +62,8 @@ export default class SvnProvider implements TreeDataProvider<BaseNode> {
   public update(node: BaseNode): void {
     this._onDidChangeTreeData.fire(node);
   }
+
+  public dispose() {
+    dispose(this._dispose);
+  }
 }
