Skip to content

Commit 72e3251

Browse files
committed
Support ReSharper 2016.3
1 parent 893f618 commit 72e3251

File tree

6 files changed

+317
-109
lines changed

6 files changed

+317
-109
lines changed

install/StyleCop.nuspec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33
<metadata>
44
<id>StyleCop.StyleCop</id>
55
<title>StyleCop by JetBrains</title>
6-
<version>2016.2.1</version>
6+
<version>2016.3.0</version>
77
<authors>Matt Ellis, Andy Reeves</authors>
88
<owners>JetBrains, Matt Ellis</owners>
99
<summary>StyleCop analyzes C# source code to enforce a set of style and consistency rules. Maintained by JetBrains</summary>
1010
<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>
1111
<releaseNotes>
12+
&#8226; Updated to ReSharper 2016.3
13+
14+
From 2016.2.1:
1215
&#8226; Remove NUnit file layout pattern, since it doesn't match StyleCop guidelines
1316

1417
From 2016.2.0:
@@ -49,7 +52,7 @@ From previous releases:
4952
<licenseUrl>https://github.com/StyleCop/StyleCop/blob/master/License.html</licenseUrl>
5053
<iconUrl>https://raw.githubusercontent.com/StyleCop/StyleCop/master/logo.png</iconUrl>
5154
<dependencies>
52-
<dependency id="Wave" version="[6.0]" />
55+
<dependency id="Wave" version="[7.0]" />
5356
</dependencies>
5457
<tags>StyleCop analysis</tags>
5558
</metadata>

src/StyleCop.ReSharper/BulbItems/Framework/SuppressMessageBulbItem.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ namespace StyleCop.ReSharper.BulbItems.Framework
2121
using JetBrains.Application.Settings;
2222
using JetBrains.ProjectModel;
2323
using JetBrains.ReSharper.Psi;
24-
using JetBrains.ReSharper.Psi.CodeStyle;
2524
using JetBrains.ReSharper.Psi.CSharp;
26-
using JetBrains.ReSharper.Psi.CSharp.CodeStyle;
2725
using JetBrains.ReSharper.Psi.CSharp.Tree;
2826
using JetBrains.TextControl;
2927

@@ -51,7 +49,7 @@ internal class SuppressMessageBulbItem : V5BulbItemImpl
5149
/// </param>
5250
public override void ExecuteTransactionInner(ISolution solution, ITextControl textControl)
5351
{
54-
ICSharpModifiersOwnerDeclaration declaration = Utils.GetTypeClosestToTextControl<ICSharpModifiersOwnerDeclaration>(solution, textControl);
52+
IAttributesOwnerDeclaration declaration = Utils.GetTypeClosestToTextControl<IAttributesOwnerDeclaration>(solution, textControl);
5553

5654
if (declaration != null)
5755
{

src/StyleCop.ReSharper/Options/HighlightingRegistering.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ private void Register(StyleCopCore core)
125125
Severity.WARNING,
126126
false,
127127
false,
128+
null,
128129
null);
129130
configurableSeverityItems.Add(Tuple.Create((PsiLanguageType)CSharpLanguage.Instance, severityItem));
130131
}

src/StyleCop.ReSharper/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@
3434
// Many of the R# base types are not CLS compliant so we can't be.
3535
[assembly: CLSCompliant(false)]
3636
[assembly: Guid("1064F4C2-0AB3-43EA-AE01-0408B2D4DDFE")]
37-
[assembly: RegisterConfigurableSeverity("StyleCop.DefaultSeverity", null, HighlightingGroupIds.CodeSmell, "item title", "item description", Severity.WARNING, false)]
37+
[assembly: RegisterConfigurableSeverity("StyleCop.DefaultSeverity", null, HighlightingGroupIds.CodeSmell, "item title", "item description", Severity.WARNING)]

0 commit comments

Comments
 (0)