Updated to ReSharper 2016.2

citizenmatt · citizenmatt · commit 661772db6160 · 2016-09-02T14:40:58.000+01:00
diff --git a/install/resharper-angularjs.nuspec b/install/resharper-angularjs.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>JetBrains.AngularJS</id>
     <title>AngularJS</title>
-    <version>1.5.1</version>
+    <version>1.6.1</version>
     <authors>JetBrains</authors>
     <owners>JetBrains</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -12,6 +12,10 @@
     <iconUrl>https://raw.github.com/JetBrains/resharper-angularjs/master/icon.png</iconUrl>
     <description>Code completion and live templates for AngularJS</description>
     <releaseNotes>
+&#8226; Updated to ReSharper 2016.2
+&#8226; Initial 1.6.0 release was incorrect, re-compiled and re-released as 1.6.1
+
+From 1.5.1:
 &#8226; Fixed exceptions in ReSharper 2016.1.2
 &#8226; Fixed warning if directive is declared in code and JSDoc
 
@@ -33,16 +37,16 @@ From 1.2.2:
 &#8226; Added angular icons to the code completion items
     </releaseNotes>
     <dependencies>
-      <dependency id="Wave" version="[5.0]" />
+      <dependency id="Wave" version="[6.0]" />
     </dependencies>
     <tags>resharper angular angularjs javascript js typescript</tags>
   </metadata>
   <files>
-    <file src="..\src\resharper-angularjs\bin\Debug\JetBrains.ReSharper.Plugins.AngularJS.dll"
+    <file src="..\src\resharper-angularjs\bin\Release\JetBrains.ReSharper.Plugins.AngularJS.dll"
           target="dotFiles\" />
 
     <!-- Templates -->
-    <file src="..\src\resharper-angularjs\bin\Debug\templates.dotSettings"
+    <file src="..\src\resharper-angularjs\bin\Release\templates.dotSettings"
           target="dotFiles\Extensions\JetBrains.AngularJS\settings\" />
   </files>
 </package>
diff --git a/src/resharper-angularjs/Feature/Services/CodeCompletion/AbbreviatedItemsProvider.cs b/src/resharper-angularjs/Feature/Services/CodeCompletion/AbbreviatedItemsProvider.cs
@@ -38,6 +38,20 @@
 
 namespace JetBrains.ReSharper.Plugins.AngularJS.Feature.Services.CodeCompletion
 {
+    // TODO: Use ReSharper 2016.2's AbbreviatedItemsProviderOfSymbolTableBase<T>
+    // I'm not using it right now, as it doesn't behave in quite the same way. Namely, it will
+    // hide items that match the typed prefix if there are more than one with the same abbreviation.
+    // E.g. if the prefix is `mbox`, it would display `-ms-box-decoration-break`, because that's the
+    // only item in `-ms` that matches. It will also display `-moz-...` because there is more than
+    // one item in `-moz-` that matches. But when you select `-moz-...`, the prefix is overwritten
+    // and your context is lost. I think it should expand whenever there's a match.
+    // It would also make things a lot easier if HtmlReferencedItemsProvider derived from this
+    // class and we could extend the list of abbreviations with an interface.
+    // It would require changes here - when adding items from the symbol table in `GetElement`,
+    // add a user data item to the generated lookup item. In `TransformItems`, remove anything
+    // that matches but doesn't have the user data item. This will remove our items from the completion
+    // provided by `HtmlReferencedItemsProvider` (ideally, HRIP would derive from `AbbreviatedItemsProvider...`)
+    // See notes on RSRP-458780
     [Language(typeof(HtmlLanguage))]
     public class AbbreviatedItemsProvider : ItemsProviderOfSpecificContext<HtmlCodeCompletionContext>
     {
@@ -341,8 +355,8 @@ private static AbbreviatedTextLookupItem CreateAbbreviatedLookupItem(string text
 
         private ISymbolTable GetSymbolTable(HtmlCodeCompletionContext context)
         {
-            var completeableReference = context.Reference as ICompleteableReference;
-            var smartCompleteableReference = completeableReference as IHtmlSmartCompleteableReference;
+            var completeableReference = context.Reference as ICompletableReference;
+            var smartCompleteableReference = completeableReference as IHtmlSmartCompletableReference;
 
             ISymbolTable symbolTable;
             if (context.BasicContext.CodeCompletionType == CodeCompletionType.SmartCompletion
diff --git a/src/resharper-angularjs/Hacks/CodeCompletion/AutomaticTagItemsProvider.cs b/src/resharper-angularjs/Hacks/CodeCompletion/AutomaticTagItemsProvider.cs
@@ -47,7 +47,7 @@ protected override bool IsAvailable(HtmlCodeCompletionContext context)
                     return false;
                 if (context.TreeNode != null && context.TreeNode.GetContainingNode<IHtmlTagFooter>() != null)
                     return false;
-                return context.Reference is ICompleteableReference;
+                return context.Reference is ICompletableReference;
             }
             return false;
         }
diff --git a/src/resharper-angularjs/Psi/Html/AngularJsHtmlAttributeDeclaredElement.cs b/src/resharper-angularjs/Psi/Html/AngularJsHtmlAttributeDeclaredElement.cs
@@ -81,7 +81,7 @@ public bool HasDeclarationsIn(IPsiSourceFile sourceFile)
         }
 
         public string ShortName { get; private set; }
-        public bool CaseSensistiveName { get { return false; } }
+        public bool CaseSensitiveName { get { return false; } }
         public PsiLanguageType PresentationLanguage { get { return HtmlLanguage.Instance; } }
         public AspNetVersion? SupportedVersion { get { return null; } }
         public bool Obsolete { get { return false; } }
diff --git a/src/resharper-angularjs/Psi/Html/AngularJsHtmlTagDeclaredElement.cs b/src/resharper-angularjs/Psi/Html/AngularJsHtmlTagDeclaredElement.cs
@@ -84,7 +84,7 @@ public bool HasDeclarationsIn(IPsiSourceFile sourceFile)
         }
 
         public string ShortName { get; private set; }
-        public bool CaseSensistiveName { get { return false; } }
+        public bool CaseSensitiveName { get { return false; } }
         public PsiLanguageType PresentationLanguage { get { return HtmlLanguage.Instance; } }
         public bool Obsolete { get { return false; } }
         public bool NonStandard { get { return false; } }
diff --git a/src/resharper-angularjs/packages.config b/src/resharper-angularjs/packages.config
@@ -3,49 +3,54 @@
   <package id="Antlr2.Runtime" version="2.7.7.02" targetFramework="net40" />
   <package id="Antlr2.Tools" version="2.7.6.4" targetFramework="net40" />
   <package id="AsyncBridge.JetBrains" version="0.1.1.0" targetFramework="net40" />
+  <package id="AsyncIO" version="0.1.18.0" targetFramework="net40" />
   <package id="DotNetZip.Reduced" version="1.9.1.8" targetFramework="net40" />
-  <package id="JetBrains.Annotations" version="10.1.4" targetFramework="net40" />
+  <package id="JetBrains.Annotations" version="10.1.5" targetFramework="net40" />
   <package id="JetBrains.Build.Platform.Tasks.ThemedIconsPacker" version="2.0.20151217.1" targetFramework="net40" developmentDependency="true" />
-  <package id="JetBrains.ExternalAnnotations" version="10.1.13" targetFramework="net40" />
+  <package id="JetBrains.ExternalAnnotations" version="10.2.0" targetFramework="net40" />
   <package id="JetBrains.Mono.Posix" version="0.1" targetFramework="net40" />
-  <package id="JetBrains.Platform.Core.Ide" version="105.0.20160522.80211" targetFramework="net40" />
-  <package id="JetBrains.Platform.Core.Shell" version="105.0.20160520.92915" targetFramework="net40" />
-  <package id="JetBrains.Platform.Core.Text" version="105.0.20160522.80211" targetFramework="net40" />
-  <package id="JetBrains.Platform.Installer" version="105.0.20160522.80211" targetFramework="net40" />
-  <package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop" version="105.0.20160522.80211" targetFramework="net40" />
+  <package id="JetBrains.Platform.Core.Ide" version="106.0.20160818.163532" targetFramework="net40" />
+  <package id="JetBrains.Platform.Core.Shell" version="106.0.20160818.163301" targetFramework="net40" />
+  <package id="JetBrains.Platform.Core.Text" version="106.0.20160818.163532" targetFramework="net40" />
+  <package id="JetBrains.Platform.Installer" version="106.0.20160818.163532" targetFramework="net40" />
+  <package id="JetBrains.Platform.Interop.dotMemoryUnit.Framework" version="106.0.20160818.163532" targetFramework="net40" />
+  <package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop" version="106.0.20160818.163532" targetFramework="net40" />
   <package id="JetBrains.Platform.Lib.DevExpress" version="2.0.20150224.0" targetFramework="net40" />
   <package id="JetBrains.Platform.Lib.Microsoft.Deployment.Compression.Cab" version="2.0.20140304.0" targetFramework="net40" />
   <package id="JetBrains.Platform.Lib.Microsoft.Deployment.WindowsInstaller" version="2.0.20140821.0" targetFramework="net40" />
   <package id="JetBrains.Platform.Lib.System.Windows.Interactivity" version="2.0.20140318.0" targetFramework="net40" />
   <package id="JetBrains.Platform.Lib.VisualStudio.AnyVs.ShellInterop.PrivateBuild" version="2.0.20140304.0" targetFramework="net40" />
   <package id="JetBrains.Platform.Lib.WpfContrib" version="2.0.20150225.0" targetFramework="net40" />
-  <package id="JetBrains.Platform.Symbols" version="105.0.20160522.80211" targetFramework="net40" />
-  <package id="JetBrains.Platform.Tests.Framework" version="105.0.20160522.80211" targetFramework="net40" />
-  <package id="JetBrains.Platform.VisualStudio" version="105.0.20160522.80211" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.Core" version="105.0.20160523.140224" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.Cpp.Src" version="105.0.20160523.141910" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.SolutionBuilder" version="105.0.20160523.140224" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.src" version="105.0.20160523.140224" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.Tasks" version="105.0.20160523.140224" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.test.Framework" version="105.0.20160523.140224" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.UnitTesting" version="105.0.20160523.140224" targetFramework="net40" />
-  <package id="JetBrains.Psi.Features.VisualStudio" version="105.0.20160523.140224" targetFramework="net40" />
-  <package id="JetBrains.ReSharper.SDK" version="2016.1.20160523.144409" targetFramework="net40" developmentDependency="true" />
-  <package id="JetBrains.ReSharper.SDK.Internal" version="105.0.20160523.144409" targetFramework="net40" />
+  <package id="JetBrains.Platform.RdProtocol" version="106.0.20160818.163532" targetFramework="net40" />
+  <package id="JetBrains.Platform.Symbols" version="106.0.20160818.163532" targetFramework="net40" />
+  <package id="JetBrains.Platform.Tests.Framework" version="106.0.20160818.163532" targetFramework="net40" />
+  <package id="JetBrains.Platform.VisualStudio" version="106.0.20160818.163532" targetFramework="net40" />
+  <package id="JetBrains.Psi.Features.Core" version="106.0.20160818.164034" targetFramework="net40" />
+  <package id="JetBrains.Psi.Features.Cpp.Src" version="106.0.20160818.165003" targetFramework="net40" />
+  <package id="JetBrains.Psi.Features.SolutionBuilder" version="106.0.20160818.164034" targetFramework="net40" />
+  <package id="JetBrains.Psi.Features.src" version="106.0.20160818.164034" targetFramework="net40" />
+  <package id="JetBrains.Psi.Features.Tasks" version="106.0.20160818.164034" targetFramework="net40" />
+  <package id="JetBrains.Psi.Features.test.Framework" version="106.0.20160818.164034" targetFramework="net40" />
+  <package id="JetBrains.Psi.Features.UnitTesting" version="106.0.20160818.164034" targetFramework="net40" />
+  <package id="JetBrains.Psi.Features.VisualStudio" version="106.0.20160818.164034" targetFramework="net40" />
+  <package id="JetBrains.ReSharper.SDK" version="2016.2.20160818.171542" targetFramework="net40" developmentDependency="true" />
+  <package id="JetBrains.ReSharper.SDK.Internal" version="106.0.20160818.171542" targetFramework="net40" />
   <package id="JetBrains.WinDbg.SymStore" version="10.0.10586.20151201" targetFramework="net40" developmentDependency="true" />
   <package id="Microsoft.VC100.CRT.JetBrains" version="10.00.40219.2" targetFramework="net40" />
   <package id="Microsoft.VC120.CRT.JetBrains" version="12.0.21005.2" targetFramework="net40" />
   <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net40" />
+  <package id="NetMQ" version="3.3.3.1" targetFramework="net40" />
   <package id="Newtonsoft35.Json" version="7.0.1" targetFramework="net40" />
-  <package id="NuGet.Core" version="2.10.1" targetFramework="net40" />
+  <package id="NuGet.Core" version="2.12.0" targetFramework="net40" />
+  <package id="NuGet.Core.Ultimate" version="3.3.2" targetFramework="net40" />
   <package id="NUnit" version="2.6.4" targetFramework="net40" />
   <package id="NUnit.ReSharperRunner2" version="2.6.408" targetFramework="net40" />
   <package id="NUnit.ReSharperRunner3" version="3.0.12" targetFramework="net40" />
   <package id="NVelocity" version="1.0.3" targetFramework="net40" />
   <package id="SharpZipLib.JetBrains.Stripped" version="0.86.20150204.1" targetFramework="net40" />
   <package id="Sprache.JetBrains" version="2.0.0.44" targetFramework="net40" />
   <package id="Vestris.ResourceLib.JetBrains" version="1.4.20150303.0" targetFramework="net40" />
-  <package id="Wave" version="5.0.0.0" targetFramework="net40" />
+  <package id="Wave" version="6.0.0.0" targetFramework="net40" />
   <package id="Windows7APICodePack.JetBrains.Stripped" version="1.1.20150225.0" targetFramework="net40" />
   <package id="xmlrpcnet" version="2.5.0" targetFramework="net40" />
   <package id="xunit.abstractions.JetBrains" version="2.0.0" targetFramework="net40" />
diff --git a/src/resharper-angularjs/resharper-angularjs.csproj b/src/resharper-angularjs/resharper-angularjs.csproj
diff --git a/test/src/test.resharper-angularjs/packages.config b/test/src/test.resharper-angularjs/packages.config
diff --git a/test/src/test.resharper-angularjs/tests.csproj b/test/src/test.resharper-angularjs/tests.csproj

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ protected override bool IsAvailable(HtmlCodeCompletionContext context)`
`47`	`47`	`return false;`
`48`	`48`	`if (context.TreeNode != null && context.TreeNode.GetContainingNode<IHtmlTagFooter>() != null)`
`49`	`49`	`return false;`
`50`		`- return context.Reference is ICompleteableReference;`
	`50`	`+ return context.Reference is ICompletableReference;`
`51`	`51`	`}`
`52`	`52`	`return false;`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public bool HasDeclarationsIn(IPsiSourceFile sourceFile)`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`public string ShortName { get; private set; }`
`84`		`- public bool CaseSensistiveName { get { return false; } }`
	`84`	`+ public bool CaseSensitiveName { get { return false; } }`
`85`	`85`	`public PsiLanguageType PresentationLanguage { get { return HtmlLanguage.Instance; } }`
`86`	`86`	`public AspNetVersion? SupportedVersion { get { return null; } }`
`87`	`87`	`public bool Obsolete { get { return false; } }`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public bool HasDeclarationsIn(IPsiSourceFile sourceFile)`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`public string ShortName { get; private set; }`
`87`		`- public bool CaseSensistiveName { get { return false; } }`
	`87`	`+ public bool CaseSensitiveName { get { return false; } }`
`88`	`88`	`public PsiLanguageType PresentationLanguage { get { return HtmlLanguage.Instance; } }`
`89`	`89`	`public bool Obsolete { get { return false; } }`
`90`	`90`	`public bool NonStandard { get { return false; } }`