Avoid deserialising the cache multiple times

The map in the cache hits the disk whenever it's enumerated. Added an
intermediate cache, and also avoid multiple nested enumerations.

See RSPL-6881 and RSRP-461359

Author: citizenmatt

install/resharper-angularjs.nuspec

@@ -3,7 +3,7 @@
   <metadata>
     <id>JetBrains.AngularJS</id>
     <title>AngularJS</title>
-    <version>1.6.1</version>
+    <version>1.6.2</version>
     <authors>JetBrains</authors>
     <owners>JetBrains</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -12,6 +12,9 @@
     <iconUrl>https://raw.github.com/JetBrains/resharper-angularjs/master/icon.png</iconUrl>
     <description>Code completion and live templates for AngularJS</description>
     <releaseNotes>
+&#8226; Address performance issue with many directives.
+
+From 1.6.1:
 &#8226; Updated to ReSharper 2016.2
 &#8226; Initial 1.6.0 release was incorrect, re-compiled and re-released as 1.6.1
 

src/resharper-angularjs/Feature/Services/Caches/AngularJsCache.cs

@@ -24,6 +24,7 @@
 using JetBrains.ReSharper.Psi.JavaScript.Tree;
 using JetBrains.ReSharper.Psi.Tree;
 using JetBrains.Util;
+using JetBrains.Util.Caches;
 
 namespace JetBrains.ReSharper.Plugins.AngularJS.Feature.Services.Caches
 {
@@ -37,6 +38,13 @@ public AngularJsCache(Lifetime lifetime, IPersistentIndexManager persistentIndex
             // TODO: Useful for testing. Remove for release
             ClearOnLoad = true;
 #endif
+            // Eumerating the map is expensive, as it will hit the disk cache. Create
+            // an in-memory cache for the enumerator. Items are automatically removed
+            // from the cache when they're removed from the Map. Use an unlimited cache
+            // because we use this data frequently - we enumerate the whole cache whenever
+            // we display code completion (which would touch each item anyway)
+            Map.UseCachingEnumerator = true;
+            Map.Cache = new UnlimitedCache<IPsiSourceFile, AngularJsCacheItems>();
 
             CacheUpdated = new SimpleSignal(lifetime, "AngularJsCache");
         }

src/resharper-angularjs/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@
 [assembly: AssemblyCulture("")]
 
 // Use a static version value so that ReSharper Build won't rebuild referencing assemblies
-[assembly: AssemblyVersion("1.5.1.0")]
+[assembly: AssemblyVersion("1.6.2.0")]
 

src/resharper-angularjs/Psi/Html/AngularJsHtmlElementsProvider.cs

@@ -17,7 +17,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using JetBrains.DataFlow;
 using JetBrains.ProjectModel;
 using JetBrains.ReSharper.Plugins.AngularJS.Feature.Services.Caches;
@@ -41,7 +40,6 @@ public class AngularJsHtmlElementsProvider : IHtmlDeclaredElementsProvider
         private readonly IHtmlAttributeValueType cdataAttributeValueType;
         private readonly Dictionary<string, IHtmlTagDeclaredElement> tags = new Dictionary<string, IHtmlTagDeclaredElement>(); 
         private readonly Dictionary<string, IHtmlAttributeDeclaredElement> attributes = new Dictionary<string, IHtmlAttributeDeclaredElement>();
-        private readonly MethodInfo getTagMethodInfo;
         private IList<AttributeInfo> commonAttributeInfos = new List<AttributeInfo>();
         private ISymbolTable commonAttributesSymbolTable;
         private ISymbolTable allAttributesSymbolTable;
@@ -62,9 +60,6 @@ public AngularJsHtmlElementsProvider(Lifetime lifetime, AngularJsCache cache, IS
 
             // TODO: Is this the right value for angular attributes?
             cdataAttributeValueType = new HtmlAttributeValueType("CDATA");
-
-            // The API for HtmlDeclareElementsCache.GetTag changed between 2016.1 and 2016.1.2
-            getTagMethodInfo = typeof(HtmlDeclaredElementsCache).GetMethod("GetTag");
         }
 
         // Gets a symbol table that contains all common attributes, that is, all attributes that apply to any tag.
@@ -83,7 +78,8 @@ public ISymbolTable GetCommonAttributesSymbolTable()
                 if (commonAttributesSymbolTable == null)
                 {
                     var psiServices = solution.GetComponent<IPsiServices>();
-                    var attributeDeclaredElements = from ai in GetCommonAttributeInfosLocked()
+                    var directives = cache.Directives;
+                    var attributeDeclaredElements = from ai in GetCommonAttributeInfosLocked(directives)
                         select ai.AttributeDeclaredElement;
                     commonAttributesSymbolTable = new DeclaredElementsSymbolTable<IHtmlAttributeDeclaredElement>(psiServices, attributeDeclaredElements);
                 }
@@ -105,8 +101,10 @@ public IEnumerable<AttributeInfo> GetAttributeInfos(IPsiSourceFile sourceFile, I
                 if (tag is IAngularJsDeclaredElement)
                     return EmptyArray<AttributeInfo>.Instance;
 
+                var directives = cache.Directives.ToList();
+
                 // Note that this includes common attributes
-                var attributeInfos = from d in cache.Directives
+                var attributeInfos = from d in directives
                     where d.IsAttribute && d.IsForTag(tag.ShortName)
                     from n in GetPrefixedNames(d.Name)
                     select
@@ -115,12 +113,10 @@ from n in GetPrefixedNames(d.Name)
                 // Get any elements that have the same name as the tag, and add the parameters as attributes
                 // Don't include any attributes that are aleady defined by other providers (this causes the
                 // HTML description cache component to crash)
-                var providers = solution.GetComponents<IHtmlDeclaredElementsProvider>();
-
-                var parameterAttributeInfos = from d in cache.Directives
+                var parameterAttributeInfos = from d in directives
                     where d.IsElement && d.Name == tag.ShortName
                     from p in d.Parameters
-                    where !IsKnownCommonAttribute(p.Name, providers)
+                    where !IsKnownCommonAttribute(p.Name)
                     from n in GetPrefixedNames(p.Name)
                     select
                         new AttributeInfo(GetOrCreateAttributeLocked(n, tag),
@@ -145,9 +141,10 @@ public IHtmlTagDeclaredElement GetTag(string name)
         {
             lock (lockObject)
             {
-                var tagDeclaredElements = from d in cache.Directives
+                var directives = cache.Directives.ToList();
+                var tagDeclaredElements = from d in directives
                     where d.IsElement && string.Equals(d.Name, name, StringComparison.InvariantCultureIgnoreCase) && !IsOverridingTag(d.Name)
-                    select GetOrCreateTagLocked(d.Name);
+                    select GetOrCreateTagLocked(d.Name, directives);
                 return tagDeclaredElements.FirstOrDefault();
             }
         }
@@ -164,10 +161,11 @@ public ISymbolTable GetAllTagsSymbolTable()
                 {
                     var psiServices = solution.GetComponent<IPsiServices>();
 
-                    var tagDeclaredElements = from d in cache.Directives
+                    var directives = cache.Directives.ToList();
+                    var tagDeclaredElements = from d in directives
                         where d.IsElement && !IsOverridingTag(d.Name)
                         from n in GetPrefixedNames(d.Name)
-                        select GetOrCreateTagLocked(n);
+                        select GetOrCreateTagLocked(n, directives);
                     allTagsSymbolTable = new DeclaredElementsSymbolTable<IHtmlTagDeclaredElement>(psiServices, tagDeclaredElements);
                 }
                 return allTagsSymbolTable;
@@ -203,18 +201,19 @@ public ISymbolTable GetAllAttributesSymbolTable()
                 if (allAttributesSymbolTable == null)
                 {
                     var psiServices = solution.GetComponent<IPsiServices>();
-                    var providers = solution.GetComponents<IHtmlDeclaredElementsProvider>();
 
-                    var attributeDeclaredElements = from d in cache.Directives
+                    var directives = cache.Directives.ToList();
+
+                    var attributeDeclaredElements = from d in directives
                         where d.IsAttribute
                         from n in GetPrefixedNames(d.Name)
                         from t in d.Tags
                         select GetOrCreateAttributeLocked(n, t);
 
-                    var parameterAttributeDeclaredElements = from d in cache.Directives
+                    var parameterAttributeDeclaredElements = from d in directives
                         where d.IsElement
                         from p in d.Parameters
-                        where !IsKnownCommonAttribute(p.Name, providers)
+                        where !IsKnownCommonAttribute(p.Name)
                         from n in GetPrefixedNames(p.Name)
                         select GetOrCreateAttributeLocked(n, d.Name);
 
@@ -279,7 +278,7 @@ private bool IsOverridingTag(string name)
             return allTags.Contains(name);
         }
 
-        private bool IsKnownCommonAttribute(string name, IEnumerable<IHtmlDeclaredElementsProvider> providers)
+        private bool IsKnownCommonAttribute(string name)
         {
             // This is horrible. We can't override existing tags and attributes, but we calling the
             // other providers dynamically causes serious perf issues. We'll just make do with
@@ -315,7 +314,7 @@ private string[] GetPrefixedNames(string root)
             return new[] {root};
         }
 
-        private IHtmlTagDeclaredElement GetOrCreateTagLocked(string name)
+        private IHtmlTagDeclaredElement GetOrCreateTagLocked(string name, IList<Directive> directives)
         {
             IHtmlTagDeclaredElement tag;
             if (!tags.TryGetValue(name, out tag))
@@ -330,14 +329,14 @@ private IHtmlTagDeclaredElement GetOrCreateTagLocked(string name)
 
                 // Stupid circular references. Populate the attributes after creating the tag, so
                 // that the attribute can reference the tag
-                var ownAttributeInfos = GetParameterAttributeInfosLocked(tag)
-                    .Concat(GetSpecificAttributeInfosLocked(tag)
+                var ownAttributeInfos = GetParameterAttributeInfosLocked(tag, directives)
+                    .Concat(GetSpecificAttributeInfosLocked(tag, directives)
                     .Distinct(ai => ai.AttributeDeclaredElement.ShortName));
                 ownAttributes.AddRange(ownAttributeInfos);
 
                 // Only include common attributes if they're not already part of the own attributes
                 var ownAttributeNames = ownAttributes.ToHashSet(a => a.AttributeDeclaredElement.ShortName);
-                var inheritedAttributeInfos = GetCommonAttributeInfosLocked()
+                var inheritedAttributeInfos = GetCommonAttributeInfosLocked(directives)
                     .Where(ai => !ownAttributeNames.Contains(ai.AttributeDeclaredElement.ShortName));
                 inheritedAttributes.AddRange(inheritedAttributeInfos);
 
@@ -346,28 +345,28 @@ private IHtmlTagDeclaredElement GetOrCreateTagLocked(string name)
             return tag;
         }
 
-        private IEnumerable<AttributeInfo> GetParameterAttributeInfosLocked(IHtmlTagDeclaredElement tag)
+        private IEnumerable<AttributeInfo> GetParameterAttributeInfosLocked(IHtmlTagDeclaredElement tag, IEnumerable<Directive> directives)
         {
-            return from d in cache.Directives
+            return from d in directives
                 where d.IsElement && d.Name.Equals(tag.ShortName, StringComparison.InvariantCultureIgnoreCase)
                 from p in d.Parameters
                 from n in GetPrefixedNames(p.Name)
                 select new AttributeInfo(GetOrCreateAttributeLocked(n, tag), DefaultAttributeValueType.IMPLIED, null);
         }
 
-        private IEnumerable<AttributeInfo> GetSpecificAttributeInfosLocked(IHtmlTagDeclaredElement tag)
+        private IEnumerable<AttributeInfo> GetSpecificAttributeInfosLocked(IHtmlTagDeclaredElement tag, IEnumerable<Directive> directives)
         {
-            return from d in cache.Directives
+            return from d in directives
                 where d.IsAttribute && d.IsForTagSpecific(tag.ShortName)
                 from n in GetPrefixedNames(d.Name)
                 select new AttributeInfo(GetOrCreateAttributeLocked(n, tag), DefaultAttributeValueType.IMPLIED, null);
         }
 
-        private IEnumerable<AttributeInfo> GetCommonAttributeInfosLocked()
+        private IEnumerable<AttributeInfo> GetCommonAttributeInfosLocked(IEnumerable<Directive> directives)
         {
             if (commonAttributeInfos == null)
             {
-                commonAttributeInfos = new List<AttributeInfo>(from d in cache.Directives
+                commonAttributeInfos = new List<AttributeInfo>(from d in directives
                     where d.IsAttribute && d.IsForAnyTag()
                     from n in GetPrefixedNames(d.Name)
                     select
@@ -406,12 +405,7 @@ private IHtmlAttributeDeclaredElement GetOrCreateAttributeLocked(string attribut
                 // doing it piecemeal. Would definitely be nice to get more fine grained caching for that.
 
                 var htmlDeclaredElementsCache = solution.GetComponent<HtmlDeclaredElementsCache>();
-                // Ugh. The API changed between 2016.1 and 2016.1.2...
-                //tag = htmlDeclaredElementsCache.GetTag(null, tagName);
-                if (getTagMethodInfo.GetParameters().Length == 3)
-                    tag = (IHtmlTagDeclaredElement) getTagMethodInfo.Invoke(htmlDeclaredElementsCache, new object[] {null, tagName, null});
-                else
-                    tag = (IHtmlTagDeclaredElement) getTagMethodInfo.Invoke(htmlDeclaredElementsCache, new object[] {tagName, null});
+                tag = htmlDeclaredElementsCache.GetTag(null, tagName);
                 attribute = GetAttributeLocked(key);
                 if (attribute != null)
                     return attribute;