Code completion includes element directives

Directives that override standard HTML elements are not included.
Element parameters are not included.

Author: citizenmatt

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

@@ -35,6 +35,8 @@ namespace JetBrains.ReSharper.Plugins.AngularJS.Feature.Services.Caches
 {
     public class Directive
     {
+        public const string AnyTagName = "ANY";
+
         public readonly string OriginalName;
         public readonly string Name;
         public readonly string Restrictions;
@@ -58,24 +60,29 @@ public Directive(string originalName, string name, string restrictions, string[]
         public bool IsElement { get; private set; }
         public bool IsClass { get; private set; }
 
-        public bool IsForTag(string tag)
+        public bool IsForTag(string tagName)
         {
             foreach (var t in Tags)
             {
-                if (t.Equals("ANY", StringComparison.InvariantCultureIgnoreCase) ||
-                    t.Equals(tag, StringComparison.InvariantCultureIgnoreCase))
+                if (t.Equals(AnyTagName, StringComparison.InvariantCultureIgnoreCase) ||
+                    t.Equals(tagName, StringComparison.InvariantCultureIgnoreCase))
                 {
                     return true;
                 }
             }
             return false;
         }
 
+        public bool IsForTagSpecific(string tagName)
+        {
+            return Tags.Any(t => t.Equals(tagName, StringComparison.InvariantCultureIgnoreCase));
+        }
+
         public bool IsForAnyTag()
         {
             foreach (var t in Tags)
             {
-                if (t.Equals("ANY", StringComparison.InvariantCultureIgnoreCase))
+                if (t.Equals(AnyTagName, StringComparison.InvariantCultureIgnoreCase))
                     return true;
             }
             return false;

src/resharper-angularjs/Feature/Services/CodeCompletion/OverriddenAngularJsItemsRemover.cs

@@ -0,0 +1,41 @@
+using System.Linq;
+using JetBrains.ReSharper.Feature.Services.CodeCompletion.Infrastructure;
+using JetBrains.ReSharper.Feature.Services.CodeCompletion.Infrastructure.LookupItems;
+using JetBrains.ReSharper.Features.Intellisense.CodeCompletion.Html;
+using JetBrains.ReSharper.Plugins.AngularJS.Psi.Html;
+using JetBrains.ReSharper.Psi;
+using JetBrains.ReSharper.Psi.Html;
+
+namespace JetBrains.ReSharper.Plugins.AngularJS.Feature.Services.CodeCompletion
+{
+    // Removes the regular HTML declared elements that match AngularJS items, e.g. the
+    // `a` element is implemented by 
+    [Language(typeof (HtmlLanguage))]
+    public class OverriddenAngularJsItemsRemover : ItemsProviderOfSpecificContext<HtmlCodeCompletionContext>
+    {
+        protected override void TransformItems(HtmlCodeCompletionContext context, GroupedItemsCollector collector)
+        {
+            var angularItems = (from item in collector.Items
+                let unwrappedItem = GetDeclaredElementLookupItem(item)
+                where
+                    unwrappedItem != null &&
+                    unwrappedItem.GetPreferredDeclaredElement().Element is IAngularJsDeclaredElement
+                select item).ToHashSet();
+            var angularItemNames = angularItems.ToHashSet(i => i.DisplayName.Text);
+            var toRemove = from item in collector.Items
+                where !angularItems.Contains(item) && angularItemNames.Contains(item.DisplayName.Text)
+                select item;
+
+            foreach (var item in toRemove.ToList())
+                collector.Remove(item);
+        }
+
+        private static IDeclaredElementLookupItem GetDeclaredElementLookupItem(ILookupItem item)
+        {
+            var wrapped = item as IWrappedLookupItem;
+            if (wrapped != null)
+                return wrapped.Item as IDeclaredElementLookupItem;
+            return item as IDeclaredElementLookupItem;
+        }
+    }
+}

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

@@ -1,83 +1,130 @@
 using System.Collections.Generic;
 using System.Xml;
 using JetBrains.ReSharper.Psi;
+using JetBrains.ReSharper.Psi.Html;
 using JetBrains.ReSharper.Psi.Html.Html;
+using JetBrains.ReSharper.Psi.Html.Impl.Html;
+using JetBrains.ReSharper.Psi.Html.Impl.TagPrefixes;
 using JetBrains.ReSharper.Psi.Html.Tree;
 using JetBrains.ReSharper.Psi.Tree;
+using JetBrains.Util;
 using JetBrains.Util.DataStructures;
 
 namespace JetBrains.ReSharper.Plugins.AngularJS.Psi.Html
 {
-    public class AngularJsHtmlTagDeclaredElement : IHtmlTagDeclaredElement
+    public class AngularJsHtmlTagDeclaredElement : IHtmlTagDeclaredElement, IAngularJsDeclaredElement
     {
+        private readonly IPsiServices psiServices;
+        private readonly HtmlDeclaredElementsCache declaredElementsCache;
+
+        public AngularJsHtmlTagDeclaredElement(IPsiServices psiServices, HtmlDeclaredElementsCache declaredElementsCache,
+            string shortName, IEnumerable<AttributeInfo> ownAttributes, IEnumerable<AttributeInfo> inheritedAttributes)
+        {
+            ShortName = shortName;
+            this.psiServices = psiServices;
+            this.declaredElementsCache = declaredElementsCache;
+            OwnAttributes = ownAttributes;
+            InheritedAttributes = inheritedAttributes;
+        }
+
         public IPsiServices GetPsiServices()
         {
-            throw new System.NotImplementedException();
+            return psiServices;
         }
 
         public IList<IDeclaration> GetDeclarations()
         {
-            throw new System.NotImplementedException();
+            // TODO: Return proper declarations
+            // Can this work? Declaration might be a comment node!?
+            return EmptyList<IDeclaration>.InstanceList;
         }
 
         public IList<IDeclaration> GetDeclarationsIn(IPsiSourceFile sourceFile)
         {
-            throw new System.NotImplementedException();
+            // TODO: Return proper declarations
+            // Can this work? Declaration might be a comment node!?
+            return EmptyList<IDeclaration>.InstanceList;
         }
 
         public DeclaredElementType GetElementType()
         {
-            throw new System.NotImplementedException();
+            return HtmlDeclaredElementType.HTML_TAG;
         }
 
         public XmlNode GetXMLDoc(bool inherit)
         {
-            throw new System.NotImplementedException();
+            return null;
         }
 
         public XmlNode GetXMLDescriptionSummary(bool inherit)
         {
-            throw new System.NotImplementedException();
+            return null;
         }
 
         public bool IsValid()
         {
-            throw new System.NotImplementedException();
+            return true;
         }
 
         public bool IsSynthetic()
         {
-            throw new System.NotImplementedException();
+            return false;
         }
 
         public HybridCollection<IPsiSourceFile> GetSourceFiles()
         {
-            throw new System.NotImplementedException();
+            // TODO: Should be able to return source file
+            return HybridCollection<IPsiSourceFile>.Empty;
         }
 
         public bool HasDeclarationsIn(IPsiSourceFile sourceFile)
         {
-            throw new System.NotImplementedException();
+            // TODO: Should be able to return source file
+            return false;
         }
 
         public string ShortName { get; private set; }
-        public bool CaseSensistiveName { get; private set; }
-        public PsiLanguageType PresentationLanguage { get; private set; }
-        public bool Obsolete { get; private set; }
-        public bool NonStandard { get; private set; }
+        public bool CaseSensistiveName { get { return false; } }
+        public PsiLanguageType PresentationLanguage { get { return HtmlLanguage.Instance; } }
+        public bool Obsolete { get { return false; } }
+        public bool NonStandard { get { return false; } }
+
         public IEnumerable<AttributeInfo> GetAllowedAttributes(IPsiSourceFile sourceFile, bool strict = false)
         {
-            throw new System.NotImplementedException();
+            return CollectionUtil.EnumerateAll(OwnAttributes, InheritedAttributes,
+              declaredElementsCache.GetAdditionalAttributesForTag(sourceFile, this, strict));
         }
 
         public IType GetType(IHtmlTag treeTag)
         {
-            throw new System.NotImplementedException();
+            // This is used by asp.net, to map tags to controls, I think
+            return TypeFactory.CreateUnknownType(treeTag.GetPsiModule(), treeTag.GetResolveContext());
         }
 
-        public TagClosingRequirement ClosingRequirement { get; private set; }
+        public TagClosingRequirement ClosingRequirement { get { return TagClosingRequirement.REGULAR_TAG_CLOSING_REQUIRED; } }
+
+        // OwnAttributes are tag specific. InheritedAttributes are shared between tags (e.g. I18N, events, etc.)
+        // The only real difference here is sorting when showing a description - own are shown before inherited
         public IEnumerable<AttributeInfo> OwnAttributes { get; private set; }
         public IEnumerable<AttributeInfo> InheritedAttributes { get; private set; }
-        public bool OnlyOnce { get; private set; }
+
+        public bool OnlyOnce { get { return false; } }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(this, obj)) return true;
+
+            var attribute = obj as AngularJsHtmlAttributeDeclaredElement;
+            if (attribute == null) return false;
+
+            // TODO: Other fields?
+            return attribute.ShortName == ShortName;
+        }
+
+        public override int GetHashCode()
+        {
+            // TODO: Other fields?
+            return ShortName.GetHashCode();
+        }
     }
 }

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

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.0
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.

src/resharper-angularjs/Resources/Logo/ThemedIcons.Logo.Generated.cs

@@ -149,6 +149,7 @@
     <Compile Include="Feature\Services\Caches\AngularJsCache.cs" />
     <Compile Include="Feature\Services\CodeCompletion\AbbreviatedItemsProvider.cs" />
     <Compile Include="Feature\Services\CodeCompletion\AbbreviatedTextLookupItem.cs" />
+    <Compile Include="Feature\Services\CodeCompletion\OverriddenAngularJsItemsRemover.cs" />
     <Compile Include="Feature\Services\Descriptions\AngularJsHtmlElementDescriptionProvider.cs" />
     <Compile Include="Psi\Html\AngularJsDeclaredElementIconProvider.cs" />
     <Compile Include="Psi\Html\AngularJsHtmlAttributeDeclaredElement.cs" />