Merge pull request #3 from matkoch/master

Update to new ReSharper SDK 2017.1
StyleCop · Apr 6, 2017 · b6d5149 · b6d5149
2 parents 061bbb1 + e1b6876
commit b6d5149
Show file tree

Hide file tree

Showing 9 changed files with 190 additions and 137 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,7 @@ install/*.nupkg
 *.user
 *.suo
 .vs/
+
+# ReSharper is a .NET coding add-in
+_ReSharper*
+_dotTrace*
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.3.2</version>
+    <version>2017.1.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 2017.1
+
+From 2016.3.2:
 &#8226; Fix some Cleanup rules that modify single line comments, should not apply to file headers (#1)
 &#8226; Fix Cleanup bug that would insert blank line before comment if it was first line after a switch label (#1)
 Thanks @SanjayGuntur for the PR!
@@ -60,7 +63,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="[7.0]" />
+      <dependency id="Wave" version="[8.0]" />
     </dependencies>
     <tags>StyleCop analysis</tags>
   </metadata>

diff --git a/src/StyleCop.ReSharper/BulbItems/Readability/FormatLineBulbItem.cs b/src/StyleCop.ReSharper/BulbItems/Readability/FormatLineBulbItem.cs
@@ -48,7 +48,7 @@ public override void ExecuteTransactionInner(ISolution solution, ITextControl te
             ITreeNode element = Utils.GetElementAtCaret(solution, textControl);
             IUsingDirective containingElement = element.GetContainingNode<IUsingDirective>(true);
 
-            Utils.FormatLines(solution, textControl.Document, line.Minus1(), line.Plus1());
+            Utils.FormatLines(element.Language, solution, textControl.Document, line.Minus1(), line.Plus1());
 
             if (containingElement != null)
             {

diff --git a/src/StyleCop.ReSharper/CodeCleanup/Rules/LayoutRules.cs b/src/StyleCop.ReSharper/CodeCleanup/Rules/LayoutRules.cs
@@ -363,7 +363,7 @@ private static void CommentsMustBePreceededByBlankLine(ITreeNode node)
                                     continue;
                                 }
 
-                                if (siblingMinus3 is ISwitchLabelStatement)
+                                if (siblingMinus3 is ISwitchCaseLabel)
                                 {
                                     // if we're the start of a switch block then don't insert a new line. 
                                     continue;

diff --git a/src/StyleCop.ReSharper/CodeCleanup/Rules/ReadabilityRules.cs b/src/StyleCop.ReSharper/CodeCleanup/Rules/ReadabilityRules.cs
@@ -211,7 +211,7 @@ public static void ReplaceEmptyStringsWithStringDotEmpty(ITreeNode node)
                     if (tokenNode.GetTokenType().IsStringLiteral)
                     {
                         IAttribute attribute = tokenNode.GetContainingNode<IAttribute>(true);
-                        ISwitchLabelStatement switchLabelStatement = tokenNode.GetContainingNode<ISwitchLabelStatement>(true);
+                        ISwitchCaseLabel switchLabelStatement = tokenNode.GetContainingNode<ISwitchCaseLabel>(true);
                         IConstantDeclaration constantDeclaration = tokenNode.GetContainingNode<IConstantDeclaration>(true);
                         IRegularParameterDeclaration parameterDeclaration = tokenNode.GetContainingNode<IRegularParameterDeclaration>(true);
 
@@ -465,20 +465,17 @@ private static void DeleteChildRange(ITokenNode first, ITokenNode last)
         /// <summary>
         /// Process for each variable declaration.
         /// </summary>
-        /// <param name="foreachVariableDeclaration">
+        /// <param name="singleVariableDesignation">
         /// The for each variable declaration.
         /// </param>
-        private static void ProcessForeachVariableDeclaration(IForeachVariableDeclaration foreachVariableDeclaration)
+        private static void ProcessSingleVariableDesignation (ISingleVariableDesignation singleVariableDesignation)
         {
-            ILocalVariable variable = foreachVariableDeclaration.DeclaredElement;
-            if (variable != null)
+            ILocalVariable variable = singleVariableDesignation.DeclaredElement;
+            if (!singleVariableDesignation.IsVar)
             {
-                if (!foreachVariableDeclaration.IsVar)
+                using (WriteLockCookie.Create(true))
                 {
-                    using (WriteLockCookie.Create(true))
-                    {
-                        foreachVariableDeclaration.SetType(variable.Type);
-                    }
+                    singleVariableDesignation.SetType(variable.Type);
                 }
             }
         }
@@ -653,9 +650,9 @@ private static void SwapVariableDeclarationToBuiltInType(IVariableDeclaration va
             {
                 ProcessLocalVariableDeclaration((ILocalVariableDeclaration)variableDeclaration);
             }
-            else if (variableDeclaration is IForeachVariableDeclaration)
+            else if (variableDeclaration is ISingleVariableDesignation)
             {
-                ProcessForeachVariableDeclaration((IForeachVariableDeclaration)variableDeclaration);
+                ProcessSingleVariableDesignation((ISingleVariableDesignation) variableDeclaration);
             }
             else
             {

diff --git a/src/StyleCop.ReSharper/Core/Utils.cs b/src/StyleCop.ReSharper/Core/Utils.cs
@@ -519,6 +519,7 @@ public static void FormatLineForTextControl(ISolution solution, ITextControl tex
         /// The line to end the formatting.
         /// </param>
         public static void FormatLines(
+            PsiLanguageType language,
             ISolution solution, 
             IDocument document, 
             JetBrains.Util.dataStructures.TypedIntrinsics.Int32<DocLine> startLine,
@@ -539,9 +540,9 @@ public static void FormatLines(
             int startOffset = document.GetLineStartOffset(startLine);
             int endOffset = document.GetLineEndOffsetNoLineBreak(endLine);
 
-            ICSharpCodeFormatter codeFormatter = (ICSharpCodeFormatter)CSharpLanguage.Instance.LanguageService().CodeFormatter;
-            codeFormatter.Format(
-                solution, 
+            CodeFormatterHelper.Format (
+                language,
+                solution,
                 new DocumentRange(document, new JetBrains.Util.TextRange(startOffset, endOffset)), 
                 CodeFormatProfile.DEFAULT, 
                 true,