1 files changed, 16 insertions, 2 deletions
diff --git a/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs b/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
index 9b0e5025..a9254621 100644
--- a/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
+++ b/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
@@ -7,7 +7,7 @@ using Microsoft.VisualStudio.Text.Classification;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Tagging;
 using Microsoft.VisualStudio.Utilities;
-
+using Dafny = Microsoft.Dafny;
 
 namespace DafnyLanguage
 {
@@ -23,7 +23,8 @@ namespace DafnyLanguage
 
   public enum DafnyTokenKinds
   {
-    Keyword, Number, String, Comment
+    Keyword, Number, String, Comment,
+    TypeIdentifier, VariableIdentifier
   }
 
   public class DafnyTokenTag : ITag
@@ -34,6 +35,18 @@ namespace DafnyLanguage
       this.Kind = kind;
     }
   }
+  public class IdentifierDafnyTokenTag : DafnyTokenTag
+  {
+    public IdentifierDafnyTokenTag()
+      : base(DafnyTokenKinds.VariableIdentifier) {
+    }
+  }
+  public class TypeDafnyTokenTag : DafnyTokenTag
+  {
+    public TypeDafnyTokenTag()
+      : base(DafnyTokenKinds.TypeIdentifier) {
+    }
+  }
 
   internal sealed class DafnyTokenTagger : ITagger<DafnyTokenTag>
   {
@@ -261,6 +274,7 @@ namespace DafnyLanguage
                 case "refines":
                 case "replaces":
                 case "requires":
+                case "result":
                 case "return":
                 case "returns":
                 case "seq":