Fixes #301. Fix up ConvertAutoPropertyToPropertyTest

DocGenerator.2017/DocGenerator.csproj

@@ -57,29 +57,29 @@
     <Reference Include="Esent.Interop, Version=1.9.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\ManagedEsent.1.9.4\lib\net40\Esent.Interop.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.0.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.1.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.0.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.1.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.2.0.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.2.1.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.Elfie, Version=0.10.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CodeAnalysis.Elfie.0.10.6\lib\net46\Microsoft.CodeAnalysis.Elfie.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.VisualBasic, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.2.0.0\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.VisualBasic, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.2.1.0\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.2.0.0\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.2.1.0\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.0.0\lib\net46\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.1.0\lib\net46\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.0.0\lib\net46\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.1.0\lib\net46\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

DocGenerator.2017/packages.config

@@ -2,13 +2,13 @@
 <packages>
   <package id="ManagedEsent" version="1.9.4" targetFramework="net461" />
   <package id="Microsoft.CodeAnalysis.Analyzers" version="1.2.0-beta2" targetFramework="net461" />
-  <package id="Microsoft.CodeAnalysis.Common" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.CodeAnalysis.CSharp" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="2.0.0" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.Common" version="2.1.0" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="2.1.0" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="2.1.0" targetFramework="net461" />
   <package id="Microsoft.CodeAnalysis.Elfie" version="0.10.6" targetFramework="net461" />
-  <package id="Microsoft.CodeAnalysis.VisualBasic" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="2.0.0" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.VisualBasic" version="2.1.0" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="2.1.0" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="2.1.0" targetFramework="net461" />
   <package id="Microsoft.Composition" version="1.0.30" targetFramework="net461" />
   <package id="Microsoft.DiaSymReader.Native" version="1.5.0" targetFramework="net461" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net461" />

README.md

@@ -2,6 +2,8 @@
 
 [![Join the chat at https://gitter.im/icsharpcode/RefactoringEssentials](https://badges.gitter.im/icsharpcode/RefactoringEssentials.svg)](https://gitter.im/icsharpcode/RefactoringEssentials?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
+[![](https://codescene.io/projects/842/status.svg) Get more details at **codescene.io**.](https://codescene.io/projects/842/jobs/latest-successful/results)
+
 [@vsrefactoring](https://twitter.com/vsrefactoring) | [vsrefactoringessentials.com](http://vsrefactoringessentials.com/)
 
 Refactorings Essentials sports the following features:
@@ -27,4 +29,5 @@ makes them easier to maintain and contribute to.
 Branch | Status 4.* (VS 2015) | Status 5.* (VS 2017)
 --- | --- | ---
 *master* (Development) | [![Build status](https://ci.appveyor.com/api/projects/status/5463mskexnsa0176/branch/master?svg=true)](https://ci.appveyor.com/project/icsharpcode/refactoringessentials/branch/master) | [![Build status](https://ci.appveyor.com/api/projects/status/r01wr5xdclj24y20/branch/master?svg=true)](https://ci.appveyor.com/project/icsharpcode/refactoringessentials-wgnsw/branch/master) 
-*release* (Latest Release) | [![Build status](https://ci.appveyor.com/api/projects/status/5463mskexnsa0176/branch/release?svg=true)](https://ci.appveyor.com/project/icsharpcode/refactoringessentials/branch/release) | [![Build status](https://ci.appveyor.com/api/projects/status/r01wr5xdclj24y20/branch/release?svg=true)](https://ci.appveyor.com/project/icsharpcode/refactoringessentials-wgnsw/branch/release)
+*release* (Latest Release) | [![Build status](https://ci.appveyor.com/api/projects/status/5463mskexnsa0176/branch/release?svg=true)](https://ci.appveyor.com/project/icsharpcode/refactoringessentials/branch/release) | [![Build status](https://ci.appveyor.com/api/projects/status/r01wr5xdclj24y20/branch/release?svg=true)](https://ci.appveyor.com/project/icsharpcode/refactoringessentials-wgnsw/branch/release)
+k

RefactoringEssentials.2017/RefactoringEssentials.csproj

@@ -197,6 +197,9 @@
     <Compile Include="..\RefactoringEssentials\CSharp\CodeRefactorings\Synced\ConvertAutoPropertyToPropertyCodeRefactoringProvider.cs">
       <Link>CSharp\CodeRefactorings\Synced\ConvertAutoPropertyToPropertyCodeRefactoringProvider.cs</Link>
     </Compile>
+    <Compile Include="..\RefactoringEssentials\CSharp\CodeRefactorings\Synced\ConvertAutoPropertyToPropertyManipulater.cs">
+	  <Link>CSharp\CodeRefactorings\Synced\ConvertAutoPropertyToPropertyManipulater.cs</Link>
+    </Compile>
     <Compile Include="..\RefactoringEssentials\CSharp\CodeRefactorings\Synced\ConvertCoalescingToConditionalExpressionCodeRefactoringProvider.cs">
       <Link>CSharp\CodeRefactorings\Synced\ConvertCoalescingToConditionalExpressionCodeRefactoringProvider.cs</Link>
     </Compile>
@@ -1331,6 +1334,18 @@
     <Compile Include="..\RefactoringEssentials\CSharp\SyntaxExtensions.cs">
       <Link>CSharp\SyntaxExtensions.cs</Link>
     </Compile>
+    <Compile Include="..\RefactoringEssentials\CSharp\CodeRefactoringStatementSyntax.cs">
+      <Link>CSharp\CodeRefactoringStatementSyntax.cs</Link>
+    </Compile>
+    <Compile Include="..\RefactoringEssentials\CSharp\DocumentManipulator.cs">
+      <Link>CSharp\DocumentManipulator.cs</Link>
+    </Compile>
+    <Compile Include="..\RefactoringEssentials\CSharp\PropertyDeclarationContext.cs">
+      <Link>CSharp\PropertyDeclarationContext.cs</Link>
+    </Compile>
+    <Compile Include="..\RefactoringEssentials\CSharp\PropertyDeclarationContextFinder.cs">
+      <Link>CSharp\PropertyDeclarationContextFinder.cs</Link>
+    </Compile>
     <Compile Include="..\RefactoringEssentials\Samples\CSharp\SampleAnalyzer.cs">
       <Link>Samples\CSharp\SampleAnalyzer.cs</Link>
     </Compile>
@@ -1694,10 +1709,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.0.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.0.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="2.0.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="2.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.3.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.3.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="2.3.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="2.3.2" />
   </ItemGroup>
   <ItemGroup>
     <None Update="RefactoringEssentials.Library.nuspec">

RefactoringEssentials/CSharp/CodeRefactoringStatementSyntax.cs

@@ -0,0 +1,26 @@
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace RefactoringEssentials.CSharp
+{
+    public class CodeRefactoringStatementSyntax
+    {
+        StatementSyntax StatementSyntax { get; }
+
+        public CodeRefactoringStatementSyntax(StatementSyntax statementSyntax)
+        {
+            StatementSyntax = statementSyntax;
+        }
+
+        public CodeRefactoringStatementSyntax WithAdditionalAnnotations(params SyntaxAnnotation[] annotations)
+        {
+            return new CodeRefactoringStatementSyntax(StatementSyntax.WithAdditionalAnnotations(annotations));
+        }
+
+        public BlockSyntax WrapInBlock()
+        {
+            return SyntaxFactory.Block(StatementSyntax);
+        }
+    }
+}

RefactoringEssentials/CSharp/CodeRefactorings/Custom/InitializeReadOnlyAutoPropertyFromConstructorParameterCodeRefactoringProvider.cs

@@ -43,7 +43,7 @@ static Task<Document> CreateAndInitialiseReadOnlyAutoPropertyFromConstructorPara
                 nodeToAdd: CreateAutoProperty(
                     type: context.Type, 
                     identifier: context.PropertyName, 
-                    accessors: GetAccessor(), 
+                    accessors: GetAutoAccessor(), 
                     accessibility: SyntaxKind.PublicKeyword));
 
             var rootWithAssignmentAndProperty = AddStatementToConstructorBody(

RefactoringEssentials/CSharp/CodeRefactorings/Synced/ContractEnsuresNotNullReturnRefactoringProvider.cs

@@ -99,18 +99,68 @@ static StatementSyntax CreateContractEnsuresCall(string returnType)
             return SyntaxFactory.ParseStatement($"Contract.Ensures(Contract.Result<{returnType}>() != null);\r\n").WithAdditionalAnnotations(Formatter.Annotation, Simplifier.Annotation);
         }
 
-        static bool HasReturnContract(BlockSyntax bodyStatement, string returnType)
+        static bool ValidateContractAccess(MemberAccessExpressionSyntax access, string method, string genericTypeName)
         {
-            var workspace = new AdhocWorkspace();
+            if (access == null)
+                return false;
+
+            var className = access.Expression.GetRightmostName() as SimpleNameSyntax;
+            if (className == null || className.Identifier.ValueText != "Contract")
+                return false;
+
+            var ensures = access.GetRightmostName() as SimpleNameSyntax;
+            if (ensures == null || ensures.Identifier.ValueText != method)
+                return false;
+
+            if (genericTypeName!= null)
+            {
+                var generic = ensures as GenericNameSyntax;
+                if (generic == null || generic.Arity != 1)
+                    return false;
+
+                var typeName = generic.TypeArgumentList.Arguments[0].GetRightmostName() as SimpleNameSyntax;
+                if (typeName == null || typeName.Identifier.ValueText != genericTypeName)
+                    return false;
+            }
+            return true;
+        }
 
-            var rhsEnsures = $"Contract.Ensures(Contract.Result<{returnType}>() != null);";
-            var lhsEnsures = $"Contract.Ensures(null != Contract.Result<{returnType}>());";
+        static bool HasReturnContract(BlockSyntax bodyStatement, string returnType)
+        {
+            var rhsEnsures = SyntaxFactory.ParseStatement($"Contract.Ensures(Contract.Result<{returnType}>() != null);");
+            var lhsEnsures = SyntaxFactory.ParseStatement($"Contract.Ensures(null != Contract.Result<{returnType}>());");
             foreach (var expression in bodyStatement.DescendantNodes().OfType<ExpressionStatementSyntax>())
             {
-                var formatted = Formatter.Format(expression, workspace).ToString();
+                var ies = expression.Expression as InvocationExpressionSyntax;
+                if (ies == null)
+                    continue;
+
+                var access = ies.Expression as MemberAccessExpressionSyntax;
+                if (access == null)
+                    continue;
+
+                if (!ValidateContractAccess(access, "Ensures", null))
+                    continue;
 
-                if (formatted == rhsEnsures || formatted == lhsEnsures)
-                    return true;
+                if (ies.ArgumentList.Arguments.Count != 1)
+                    continue;
+
+                var arg = ies.ArgumentList.Arguments[0].Expression as BinaryExpressionSyntax;
+                if (arg == null || !arg.OperatorToken.IsKind(SyntaxKind.ExclamationEqualsToken))
+                    continue;
+
+                if (arg.Left.IsKind(SyntaxKind.NullLiteralExpression))
+                {
+                    ies = arg.Right as InvocationExpressionSyntax;
+                }
+                else if (arg.Right.IsKind(SyntaxKind.NullLiteralExpression))
+                {
+                    ies = arg.Left as InvocationExpressionSyntax;
+                }
+                access = ies?.Expression as MemberAccessExpressionSyntax;
+                if (!ValidateContractAccess(access, "Result", returnType))
+                    continue;
+                return true;
             }
             return false;
         }