DafnyExtension: Did some refactoring to integrate the Dafny menu more tightly.

1 files changed, 5 insertions, 5 deletions

diff --git a/Source/DafnyExtension/ResolverTagger.cs b/Source/DafnyExtension/ResolverTagger.cs
index 380df534..dedf506a 100644
--- a/Source/DafnyExtension/ResolverTagger.cs
+++ b/Source/DafnyExtension/ResolverTagger.cs
@@ -208,7 +208,7 @@ namespace DafnyLanguage
       }

     }

 

-    public static readonly IDictionary<string, ResolverTagger> ResolverTaggers = new ConcurrentDictionary<string, ResolverTagger>();

+    public static readonly IDictionary<ITextBuffer, ResolverTagger> ResolverTaggers = new ConcurrentDictionary<ITextBuffer, ResolverTagger>();

 

     internal ResolverTagger(ITextBuffer buffer, IServiceProvider serviceProvider, ITextDocumentFactoryService textDocumentFactory)

     {

@@ -249,9 +249,9 @@ namespace DafnyLanguage
               _errorProvider = null;

             }

             BufferIdleEventUtil.RemoveBufferIdleEventListener(_buffer, ResolveBuffer);

-            if (_document != null)

+            if (_document != null && _document.TextBuffer != null)

             {

-              ResolverTaggers.Remove(_document.FilePath);

+              ResolverTaggers.Remove(_document.TextBuffer);

             }

           }

 

@@ -333,11 +333,11 @@ namespace DafnyLanguage
 

       if (program != null && _document != null)

       {

-        ResolverTaggers[_document.FilePath] = this;

+        ResolverTaggers[_document.TextBuffer] = this;

       }

       else if (_document != null)

       {

-        ResolverTaggers.Remove(_document.FilePath);

+        ResolverTaggers.Remove(_document.TextBuffer);

       }

 

       _resolutionErrors = newErrors;