Support ReSharper 2016.3

StyleCop · Dec 14, 2016 · 72e3251 · 72e3251
1 parent 893f618
commit 72e3251
Show file tree

Hide file tree

Showing 6 changed files with 317 additions and 109 deletions.
diff --git a/install/StyleCop.nuspec b/install/StyleCop.nuspec
@@ -3,12 +3,15 @@
   <metadata>
     <id>StyleCop.StyleCop</id>
     <title>StyleCop by JetBrains</title>
-    <version>2016.2.1</version>
+    <version>2016.3.0</version>
     <authors>Matt Ellis, Andy Reeves</authors>
     <owners>JetBrains, Matt Ellis</owners>
     <summary>StyleCop analyzes C# source code to enforce a set of style and consistency rules. Maintained by JetBrains</summary>
     <description>StyleCop analyzes C# source code to enforce a set of style and consistency rules. This plugin is compatible with StyleCop 4.7.54, and maintained by JetBrains.</description>
     <releaseNotes>
+&#8226; Updated to ReSharper 2016.3
+
+From 2016.2.1:
 &#8226; Remove NUnit file layout pattern, since it doesn't match StyleCop guidelines
 
 From 2016.2.0:
@@ -49,7 +52,7 @@ From previous releases:
     <licenseUrl>https://github.com/StyleCop/StyleCop/blob/master/License.html</licenseUrl>
     <iconUrl>https://raw.githubusercontent.com/StyleCop/StyleCop/master/logo.png</iconUrl>
     <dependencies>
-      <dependency id="Wave" version="[6.0]" />
+      <dependency id="Wave" version="[7.0]" />
     </dependencies>
     <tags>StyleCop analysis</tags>
   </metadata>

diff --git a/src/StyleCop.ReSharper/BulbItems/Framework/SuppressMessageBulbItem.cs b/src/StyleCop.ReSharper/BulbItems/Framework/SuppressMessageBulbItem.cs
@@ -21,9 +21,7 @@ namespace StyleCop.ReSharper.BulbItems.Framework
     using JetBrains.Application.Settings;
     using JetBrains.ProjectModel;
     using JetBrains.ReSharper.Psi;
-    using JetBrains.ReSharper.Psi.CodeStyle;
     using JetBrains.ReSharper.Psi.CSharp;
-    using JetBrains.ReSharper.Psi.CSharp.CodeStyle;
     using JetBrains.ReSharper.Psi.CSharp.Tree;
     using JetBrains.TextControl;
 
@@ -51,7 +49,7 @@ internal class SuppressMessageBulbItem : V5BulbItemImpl
         /// </param>
         public override void ExecuteTransactionInner(ISolution solution, ITextControl textControl)
         {
-            ICSharpModifiersOwnerDeclaration declaration = Utils.GetTypeClosestToTextControl<ICSharpModifiersOwnerDeclaration>(solution, textControl);
+            IAttributesOwnerDeclaration declaration = Utils.GetTypeClosestToTextControl<IAttributesOwnerDeclaration>(solution, textControl);
 
             if (declaration != null)
             {

diff --git a/src/StyleCop.ReSharper/Options/HighlightingRegistering.cs b/src/StyleCop.ReSharper/Options/HighlightingRegistering.cs
@@ -125,6 +125,7 @@ private void Register(StyleCopCore core)
                         Severity.WARNING,
                         false,
                         false,
+                        null,
                         null);
                     configurableSeverityItems.Add(Tuple.Create((PsiLanguageType)CSharpLanguage.Instance, severityItem));
                 }

diff --git a/src/StyleCop.ReSharper/Properties/AssemblyInfo.cs b/src/StyleCop.ReSharper/Properties/AssemblyInfo.cs
@@ -34,4 +34,4 @@
 // Many of the R# base types are not CLS compliant so we can't be.
 [assembly: CLSCompliant(false)]
 [assembly: Guid("1064F4C2-0AB3-43EA-AE01-0408B2D4DDFE")]
-[assembly: RegisterConfigurableSeverity("StyleCop.DefaultSeverity", null, HighlightingGroupIds.CodeSmell, "item title", "item description", Severity.WARNING, false)]
+[assembly: RegisterConfigurableSeverity("StyleCop.DefaultSeverity", null, HighlightingGroupIds.CodeSmell, "item title", "item description", Severity.WARNING)]
-Original file line number
+Diff line change
@@ Expand Up / @@ -125,6 +125,7 @@ private void Register(StyleCopCore core) @@
                             Severity.WARNING,
                             false,
                             false,
+                            null,
                             null);
                         configurableSeverityItems.Add(Tuple.Create((PsiLanguageType)CSharpLanguage.Instance, severityItem));
                     }
@@ Expand Down @@