Merge branch 'dynamic_directives'

Author: citizenmatt

.editorconfig

@@ -0,0 +1,5 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4

.gitignore

@@ -1,65 +1,5 @@
-#################
-## Visual Studio
-#################
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
+Packages/
+bin/
+obj/
 *.user
-*.sln.docstates
-
-# Build results
-[Dd]ebug/
-[Rr]elease/
-*_i.c
-*_p.c
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.vspscc
-.builds
-*.dotCover
-*.sln.cache
-
-# ReSharper is a .NET coding add-in
-_ReSharper*
-_dotCover*
-
-# Others
-[Bb]in
-[Oo]bj
-
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-
-src/packages/*
-!src/packages/repositories.config
-
-############
-## Windows
-############
-
-# Windows image file caches
-Thumbs.db
-
-# Folder config file
-Desktop.ini
-
-# NCrunch
-_NCrunch*
-
+*.suo

src/resharper-angularjs.sln.DotSettings

@@ -1,6 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderRegionName/@EntryValue">license</s:String>
-	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright 2014 JetBrains s.r.o.&#xD;
+	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright 2015 JetBrains s.r.o.&#xD;
 &#xD;
 Licensed under the Apache License, Version 2.0 (the "License");&#xD;
 you may not use this file except in compliance with the License.&#xD;

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

@@ -0,0 +1,158 @@
+#region license
+// Copyright 2015 JetBrains s.r.o.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#endregion
+
+using System.Collections.Generic;
+using System.Linq;
+using JetBrains.DataFlow;
+using JetBrains.ReSharper.Psi;
+using JetBrains.ReSharper.Psi.Caches;
+using JetBrains.ReSharper.Psi.Files;
+using JetBrains.ReSharper.Psi.JavaScript.LanguageImpl;
+using JetBrains.ReSharper.Psi.JavaScript.Tree;
+using JetBrains.ReSharper.Psi.Tree;
+using JetBrains.Util;
+
+namespace JetBrains.ReSharper.Plugins.AngularJS.Feature.Services.Caches
+{
+    [PsiComponent]
+    public class AngularJsCache : SimpleICache<AngularJsCacheItems>
+    {
+        public AngularJsCache(Lifetime lifetime, IPersistentIndexManager persistentIndexManager)
+            : base(lifetime, persistentIndexManager, AngularJsCacheItems.Marshaller)
+        {
+#if DEBUG
+            // TODO: Useful for testing. Remove for release
+            ClearOnLoad = true;
+#endif
+
+            CacheUpdated = new SimpleSignal(lifetime, "AngularJsCache");
+        }
+
+        public ISimpleSignal CacheUpdated { get; private set; }
+
+        // TODO: Override Version when the format changes
+
+        protected override bool IsApplicable(IPsiSourceFile sf)
+        {
+            return sf.IsLanguageSupported<JavaScriptLanguage>();
+        }
+
+        public override object Build(IPsiSourceFile sourceFile, bool isStartup)
+        {
+            if (!IsApplicable(sourceFile))
+                return null;
+
+            // TODO: Check if this works for JS islands in HTML
+            var jsFile = sourceFile.GetDominantPsiFile<JavaScriptLanguage>() as IJavaScriptFile;
+            if (jsFile == null)
+                return null;
+
+            var processor = new RecursiveElementProcessor();
+            jsFile.ProcessDescendants(processor);
+            return processor.CacheObject.IsEmpty ? null : processor.CacheObject;
+        }
+
+        public override void Drop(IPsiSourceFile sourceFile)
+        {
+            // We can't use IsApplicable here, as the source file might be no longer valid.
+            // But only clear the cache if the cache is changing
+            if (Map.ContainsKey(sourceFile))
+                ClearCache();
+            base.Drop(sourceFile);
+        }
+
+        public override void Merge(IPsiSourceFile sourceFile, object builtPart)
+        {
+            if (IsApplicable(sourceFile))
+            {
+                ClearCache();
+                base.Merge(sourceFile, builtPart);
+            }
+        }
+
+        public IEnumerable<Directive> Directives
+        {
+            get
+            {
+                if (!LoadCompleted)
+                    return EmptyArray<Directive>.Instance;
+                return Map.Values.SelectMany(v => v.Directives);
+            }
+        }
+
+        public IEnumerable<Filter> Filters
+        {
+            get
+            {
+                if (!LoadCompleted)
+                    return EmptyArray<Filter>.Instance;
+                return Map.Values.SelectMany(v => v.Filters);
+            }
+        }
+
+        private void ClearCache()
+        {
+            CacheUpdated.Fire();
+        }
+
+        private class RecursiveElementProcessor : IRecursiveElementProcessor
+        {
+            private readonly AngularJsCacheItemsBuilder cacheItemsBuilder;
+            private readonly JsDocFileProcessor jsDocFileProcessor;
+            private readonly JsInvocationProcessor jsInvocationProcessor;
+
+            public RecursiveElementProcessor()
+            {
+                cacheItemsBuilder = new AngularJsCacheItemsBuilder();
+                jsDocFileProcessor = new JsDocFileProcessor(cacheItemsBuilder);
+                jsInvocationProcessor = new JsInvocationProcessor(cacheItemsBuilder);
+            }
+
+            public bool InteriorShouldBeProcessed(ITreeNode element)
+            {
+                return true;
+            }
+
+            public void ProcessBeforeInterior(ITreeNode element)
+            {
+                var jsDocComment = element as IJavaScriptCommentNode;
+                if (jsDocComment != null && jsDocComment.JsDocPsi != null && jsDocComment.JsDocPsi.JsDocFile != null)
+                    jsDocFileProcessor.ProcessJsDocFile(jsDocComment.JsDocPsi.JsDocFile);
+
+                var jsInvocation = element as IInvocationExpression;
+                if (jsInvocation != null)
+                    jsInvocationProcessor.ProcessInvocationExpression(jsInvocation);
+
+                // TODO: What about TypeScript?
+                // var tsInvocation = element as ITsInvocationExpression;
+            }
+
+            public void ProcessAfterInterior(ITreeNode element)
+            {
+            }
+
+            public bool ProcessingIsFinished
+            {
+                get { return false; }
+            }
+
+            public AngularJsCacheItems CacheObject
+            {
+                get { return cacheItemsBuilder.Build(); }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using System.Linq;
+using JetBrains.Util.PersistentMap;
+
+namespace JetBrains.ReSharper.Plugins.AngularJS.Feature.Services.Caches
+{
+    // All the cached items in a file, directives + filters
+    public class AngularJsCacheItems
+    {
+        public static readonly IUnsafeMarshaller<AngularJsCacheItems> Marshaller =
+            new UniversalMarshaller<AngularJsCacheItems>(Read, Write);
+
+        private readonly IList<Directive> directives;
+        private readonly IList<Filter> filters;
+
+        public AngularJsCacheItems(IList<Directive> directives, IList<Filter> filters)
+        {
+            this.directives = directives;
+            this.filters = filters;
+        }
+
+        public IEnumerable<Directive> Directives { get { return directives; } }
+        public IEnumerable<Filter> Filters { get { return filters; } }
+
+        public bool IsEmpty
+        {
+            get { return directives.Count == 0 && filters.Count == 0; }
+        }
+
+        private static AngularJsCacheItems Read(UnsafeReader reader)
+        {
+            var directives = reader.ReadCollection(Directive.Read, count => new List<Directive>(count));
+            var filters = reader.ReadCollection(Filter.Read, count => new List<Filter>(count));
+            return new AngularJsCacheItems(directives, filters);
+        }
+
+        private static void Write(UnsafeWriter writer, AngularJsCacheItems value)
+        {
+            writer.Write<Directive, ICollection<Directive>>((w, directive) => directive.Write(w), value.Directives.ToList());
+            writer.Write<Filter, ICollection<Filter>>((w, filter) => filter.Write(w), value.Filters.ToList());
+        }
+    }
+}

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

@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+
+namespace JetBrains.ReSharper.Plugins.AngularJS.Feature.Services.Caches
+{
+    public class AngularJsCacheItemsBuilder
+    {
+        private readonly IList<Directive> directives = new List<Directive>();
+        private readonly IList<Filter> filters = new List<Filter>();
+
+        public AngularJsCacheItems Build()
+        {
+            return new AngularJsCacheItems(directives, filters);
+        }
+
+        public void Add(Directive directive)
+        {
+            directives.Add(directive);
+        }
+
+        public void Add(Filter filter)
+        {
+            filters.Add(filter);
+        }
+    }
+}