Merge branch 'master' into status_file_explorer

# Conflicts:
#	src/extension.ts
#	src/model.ts

Author: edgardmessias

icons/dark/open-change.svg icons/dark/open-change-base.svgicons/dark/open-change.svg renamed to icons/dark/open-change-base.svg

@@ -88,17 +88,17 @@
         "title": "Open Changes with BASE",
         "category": "SVN",
         "icon": {
-          "light": "icons/light/open-change.svg",
-          "dark": "icons/dark/open-change.svg"
+          "light": "icons/light/open-change-base.svg",
+          "dark": "icons/dark/open-change-base.svg"
         }
       },
       {
         "command": "svn.openChangeHead",
         "title": "Open Changes with HEAD",
         "category": "SVN",
         "icon": {
-          "light": "icons/light/open-change.svg",
-          "dark": "icons/dark/open-change.svg"
+          "light": "icons/light/open-change-head.svg",
+          "dark": "icons/dark/open-change-head.svg"
         }
       },
       {
@@ -164,19 +164,19 @@
       "commandPalette": [
         {
           "command": "svn.openFile",
-          "when": "config.svn.enabled"
+          "when": "config.svn.enabled && svnOpenRepositoryCount != 0"
         },
         {
           "command": "svn.openHEADFile",
-          "when": "config.svn.enabled"
+          "when": "config.svn.enabled && svnOpenRepositoryCount != 0"
         },
         {
           "command": "svn.openChangeBase",
-          "when": "config.svn.enabled"
+          "when": "config.svn.enabled && svnOpenRepositoryCount != 0"
         },
         {
           "command": "svn.openChangeHead",
-          "when": "config.svn.enabled"
+          "when": "config.svn.enabled && svnOpenRepositoryCount != 0"
         }
       ],
       "scm/title": [
@@ -292,19 +292,19 @@
           "command": "svn.openFile",
           "group": "navigation",
           "when":
-            "config.svn.enabled && isInDiffEditor && resourceScheme != extension && resourceScheme != merge-conflict.conflict-diff"
+            "config.svn.enabled && svnOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme != extension && resourceScheme != merge-conflict.conflict-diff"
         },
         {
           "command": "svn.openChangeBase",
           "group": "navigation",
           "when":
-            "config.svn.enabled && !isInDiffEditor && resourceScheme == file"
+            "config.svn.enabled && svnOpenRepositoryCount != 0 && !isInDiffEditor && resourceScheme == file"
         },
         {
           "command": "svn.openChangeHead",
           "group": "navigation",
           "when":
-            "config.svn.enabled && !isInDiffEditor && resourceScheme == file"
+            "config.svn.enabled && svnOpenRepositoryCount != 0 && !isInDiffEditor && resourceScheme == file"
         }
       ]
     },

icons/dark/open-change-head.svg

@@ -1,4 +1,10 @@
-import { ExtensionContext, Disposable, workspace, window } from "vscode";
+import {
+  ExtensionContext,
+  Disposable,
+  workspace,
+  window,
+  commands
+} from "vscode";
 import { Svn } from "./svn";
 import { SvnFinder } from "./svnFinder";
 import { SvnContentProvider } from "./svnContentProvider";
@@ -26,7 +32,7 @@ async function init(context: ExtensionContext, disposables: Disposable[]) {
   const svn = new Svn({ svnPath: info.path, version: info.version });
   const model = new Model(svn);
   const contentProvider = new SvnContentProvider(model);
-  const commands = new SvnCommands(model);
+  const svnCommands = new SvnCommands(model);
   disposables.push(model, contentProvider);
 
   // First, check the vscode has support to DecorationProvider
@@ -36,6 +42,15 @@ async function init(context: ExtensionContext, disposables: Disposable[]) {
       disposables.push(decoration);
     });
   }
+  const onRepository = () =>
+    commands.executeCommand(
+      "setContext",
+      "svnOpenRepositoryCount",
+      `${model.repositories.length}`
+    );
+  model.onDidOpenRepository(onRepository, null, disposables);
+  model.onDidCloseRepository(onRepository, null, disposables);
+  onRepository();
 
   outputChannel.appendLine("Using svn " + info.version + " from " + info.path);
 

icons/light/open-change.svg icons/light/open-change-base.svgicons/light/open-change.svg renamed to icons/light/open-change-base.svg

@@ -25,7 +25,7 @@ export interface OriginalResourceChangeEvent {
   uri: Uri;
 }
 
-interface OpenRepository {
+interface OpenRepository extends Disposable {
   repository: Repository;
 }
 
@@ -34,9 +34,9 @@ export class Model {
   readonly onDidOpenRepository: Event<Repository> = this._onDidOpenRepository
     .event;
 
-  // private _onDidCloseRepository = new EventEmitter<Repository>();
-  // readonly onDidCloseRepository: Event<Repository> = this._onDidCloseRepository
-  //   .event;
+  private _onDidCloseRepository = new EventEmitter<Repository>();
+  readonly onDidCloseRepository: Event<Repository> = this._onDidCloseRepository
+    .event;
 
   private _onDidChangeRepository = new EventEmitter<ModelChangeEvent>();
   readonly onDidChangeRepository: Event<ModelChangeEvent> = this
@@ -288,10 +288,18 @@ export class Model {
       this._onDidChangeRepository.fire({ repository, uri })
     );
 
-    this.disposables.push(changeListener);
+    const dispose = () => {
+      changeListener.dispose();
+      repository.dispose();
 
-    this.openRepositories.push({ repository });
+      this.openRepositories = this.openRepositories.filter(
+        e => e !== openRepository
+      );
+      this._onDidCloseRepository.fire(repository);
+    };
 
+    const openRepository = { repository, dispose };
+    this.openRepositories.push(openRepository);
     this._onDidOpenRepository.fire(repository);
   }