Merge branch 'f/3-fix-interface-injection-code-action' into develop

inyutin-maxim · inyutin-maxim · commit 2c8f9b46189b · 2019-04-18T17:31:26.000+03:00
diff --git a/Roslyn.Testing/Roslyn.Testing.csproj b/Roslyn.Testing/Roslyn.Testing.csproj
@@ -7,7 +7,7 @@
 
     <ItemGroup>
       <PackageReference Include="JetBrains.Annotations" Version="2019.1.1" />
-      <PackageReference Include="Microsoft.CodeAnalysis" Version="2.10.0" />
+      <PackageReference Include="Microsoft.CodeAnalysis" Version="3.0.0" />
       <PackageReference Include="Shouldly" Version="3.0.2" />
     </ItemGroup>
 
diff --git a/System.IO.Abstractions.Analyzers.Tests/Analyzers/FileServiceInterfaceInjectionAnalyzerTests.cs b/System.IO.Abstractions.Analyzers.Tests/Analyzers/FileServiceInterfaceInjectionAnalyzerTests.cs
@@ -11,6 +11,7 @@ public class FileServiceInterfaceInjectionAnalyzerTests : CSharpDiagnosticAnalyz
 	{
 		[Theory]
 		[InlineData("Valid.txt")]
+		[InlineData("Valid2.txt")]
 		public void Analyzer_is_not_triggered(string filename)
 		{
 			var source = ReadFile(filename);
diff --git a/System.IO.Abstractions.Analyzers.Tests/CodeFixes/FileServiceInterfaceInjectionCodeFixTests.cs b/System.IO.Abstractions.Analyzers.Tests/CodeFixes/FileServiceInterfaceInjectionCodeFixTests.cs
@@ -13,6 +13,7 @@ public class FileServiceInterfaceInjectionCodeFixTests :
 		[Theory]
 		[InlineData("BeforeFix.txt", "AfterFix.txt")]
 		[InlineData("BeforeFixWithoutConstructor.txt", "AfterFix.txt")]
+		[InlineData("BeforeFixExistsAbstractionsUsing.txt", "AfterFix.txt")]
 		public void CodeFix(string sourceBefore, string sourceAfter)
 		{
 			var sourceBeforeFix = ReadFile(sourceBefore);
diff --git a/System.IO.Abstractions.Analyzers.Tests/TestData/Analyzer/FileServiceInterfaceInjectionAnalyzer/Valid2.txt b/System.IO.Abstractions.Analyzers.Tests/TestData/Analyzer/FileServiceInterfaceInjectionAnalyzer/Valid2.txt
@@ -0,0 +1,15 @@
+using System.IO;
+using System.IO.Abstractions;
+
+namespace SomeNameSpace
+{
+	public class Valid
+	{
+		private readonly IFileSystem _fileSystem;
+
+		public Valid(IFileSystem fileSystem)
+		{
+			_fileSystem = fileSystem;
+		}
+	}
+}
diff --git a/System.IO.Abstractions.Analyzers.Tests/TestData/CodeFix/FileServiceInterfaceInjectionCodeFix/AfterFix.txt b/System.IO.Abstractions.Analyzers.Tests/TestData/CodeFix/FileServiceInterfaceInjectionCodeFix/AfterFix.txt
@@ -1,3 +1,4 @@
+using System.IO;
 using System.IO.Abstractions;
 
 namespace SomeNameSpace
diff --git a/System.IO.Abstractions.Analyzers.Tests/TestData/CodeFix/FileServiceInterfaceInjectionCodeFix/BeforeFixExistsAbstractionsUsing.txt b/System.IO.Abstractions.Analyzers.Tests/TestData/CodeFix/FileServiceInterfaceInjectionCodeFix/BeforeFixExistsAbstractionsUsing.txt
@@ -0,0 +1,18 @@
+using System.IO;
+using System.IO.Abstractions;
+
+namespace SomeNameSpace
+{
+	public class WithOutFileSystem
+	{
+		public void SomeMethod()
+		{
+			const string filePath = "C:\\temp.txt";
+
+			if (File.Exists(filePath))
+			{
+				File.Delete(filePath);
+			}
+		}
+	}
+}
diff --git a/System.IO.Abstractions.Analyzers/Analyzers/FileServiceInterfaceInjectionAnalyzer.cs b/System.IO.Abstractions.Analyzers/Analyzers/FileServiceInterfaceInjectionAnalyzer.cs
@@ -66,7 +66,7 @@ protected override void AnalyzeCompilation(CompilationStartAnalysisContext compi
 
 					var fileSystem = classDeclarationSyntax.Members.OfType<FieldDeclarationSyntax>()
 						.FirstOrDefault(x =>
-							x.NormalizeWhitespace().ToFullString() == fileSystemContext.FileSystemType.Name);
+							x.Declaration.Type.NormalizeWhitespace().ToFullString() == fileSystemContext.FileSystemType.Name);
 
 					if (fileSystem == null)
 					{
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/FileServiceInterfaceInjectionCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/FileServiceInterfaceInjectionCodeAction.cs
@@ -48,9 +48,27 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
 
 			var compilationUnitSyntax = RoslynClassFileSystem.GetCompilationUnit(_class);
 
-			if (compilationUnitSyntax.Usings.Any())
+			if (!compilationUnitSyntax.Usings.Any())
 			{
-				editor.ReplaceNode(RoslynClassFileSystem.GetSystemIoUsing(compilationUnitSyntax),
+				return editor.GetChangedDocument();
+			}
+
+			var fileSystem = RoslynClassFileSystem.GetUsing(compilationUnitSyntax, Constants.FileSystemNameSpace);
+
+			if (fileSystem != default(UsingDirectiveSyntax))
+			{
+				return editor.GetChangedDocument();
+			}
+
+			var systemIo = RoslynClassFileSystem.GetSystemIoUsing(compilationUnitSyntax);
+
+			if (systemIo == default(UsingDirectiveSyntax))
+			{
+				editor.InsertBefore(compilationUnitSyntax.Usings.FirstOrDefault(),
+					RoslynClassFileSystem.GetFileSystemUsing());
+			} else
+			{
+				editor.InsertAfter(compilationUnitSyntax.Usings.FirstOrDefault(),
 					RoslynClassFileSystem.GetFileSystemUsing());
 			}
 
diff --git a/System.IO.Abstractions.Analyzers/RoslynToken/RoslynClassFileSystem.cs b/System.IO.Abstractions.Analyzers/RoslynToken/RoslynClassFileSystem.cs
@@ -42,9 +42,14 @@ public static UsingDirectiveSyntax GetFileSystemUsing()
 		}
 
 		public static UsingDirectiveSyntax GetSystemIoUsing(CompilationUnitSyntax unit)
+		{
+			return GetUsing(unit, typeof(Path).Namespace);
+		}
+
+		public static UsingDirectiveSyntax GetUsing(CompilationUnitSyntax unit, string usingName)
 		{
 			return unit.Usings.FirstOrDefault(x =>
-				x.Name.NormalizeWhitespace().ToFullString().Equals(typeof(Path).Namespace));
+				x.Name.NormalizeWhitespace().ToFullString().Equals(usingName));
 		}
 
 		public static FieldDeclarationSyntax CreateFileSystemFieldDeclaration()
diff --git a/System.IO.Abstractions.Analyzers/System.IO.Abstractions.Analyzers.csproj b/System.IO.Abstractions.Analyzers/System.IO.Abstractions.Analyzers.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>netstandard1.4</TargetFramework>
+		<TargetFramework>netstandard2.0</TargetFramework>
 		<PackageTargetFallback>portable-net45+win8+wp8+wpa81</PackageTargetFallback>
 		<IncludeBuildOutput>false</IncludeBuildOutput>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
@@ -17,7 +17,7 @@
 	</PropertyGroup>
 	<PropertyGroup>
 		<PackageId>Roslyn.System.IO.Abstractions.Analyzers</PackageId>
-		<PackageVersion>4.0.0</PackageVersion>
+		<PackageVersion>4.0.1</PackageVersion>
 		<Authors>inyutin_maxim</Authors>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageProjectUrl>https://github.com/System-IO-Abstractions/System.IO.Abstractions.Analyzers/</PackageProjectUrl>
@@ -37,8 +37,8 @@
 	<ItemGroup>
 		<PackageReference Include="JetBrains.Annotations" Version="2019.1.1" PrivateAssets="all" />
 		<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.9.1" PrivateAssets="all" />
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.10.0" PrivateAssets="all" />
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.10.0" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.0.0" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.0.0" PrivateAssets="all" />
 		<PackageReference Update="NETStandard.Library" PrivateAssets="all" />
 		<PackageReference Include="Microsoft.CodeQuality.Analyzers" Version="2.9.1" PrivateAssets="all" />
 		<PackageReference Include="Roslyn.Diagnostics.Analyzers" Version="2.9.1" PrivateAssets="all" />

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ public class FileServiceInterfaceInjectionAnalyzerTests : CSharpDiagnosticAnalyz`
`11`	`11`	`{`
`12`	`12`	`[Theory]`
`13`	`13`	`[InlineData("Valid.txt")]`
	`14`	`+ [InlineData("Valid2.txt")]`
`14`	`15`	`public void Analyzer_is_not_triggered(string filename)`
`15`	`16`	`{`
`16`	`17`	`var source = ReadFile(filename);`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ public class FileServiceInterfaceInjectionCodeFixTests :`
`13`	`13`	`[Theory]`
`14`	`14`	`[InlineData("BeforeFix.txt", "AfterFix.txt")]`
`15`	`15`	`[InlineData("BeforeFixWithoutConstructor.txt", "AfterFix.txt")]`
	`16`	`+ [InlineData("BeforeFixExistsAbstractionsUsing.txt", "AfterFix.txt")]`
`16`	`17`	`public void CodeFix(string sourceBefore, string sourceAfter)`
`17`	`18`	`{`
`18`	`19`	`var sourceBeforeFix = ReadFile(sourceBefore);`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using System.IO;`
`1`	`2`	`using System.IO.Abstractions;`
`2`	`3`
`3`	`4`	`namespace SomeNameSpace`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ protected override void AnalyzeCompilation(CompilationStartAnalysisContext compi`
`66`	`66`
`67`	`67`	`var fileSystem = classDeclarationSyntax.Members.OfType<FieldDeclarationSyntax>()`
`68`	`68`	`.FirstOrDefault(x =>`
`69`		`- x.NormalizeWhitespace().ToFullString() == fileSystemContext.FileSystemType.Name);`
	`69`	`+ x.Declaration.Type.NormalizeWhitespace().ToFullString() == fileSystemContext.FileSystemType.Name);`
`70`	`70`
`71`	`71`	`if (fileSystem == null)`
`72`	`72`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,14 @@ public static UsingDirectiveSyntax GetFileSystemUsing()`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public static UsingDirectiveSyntax GetSystemIoUsing(CompilationUnitSyntax unit)`
	`45`	`+ {`
	`46`	`+ return GetUsing(unit, typeof(Path).Namespace);`
	`47`	`+ }`
	`48`	`+`
	`49`	`+ public static UsingDirectiveSyntax GetUsing(CompilationUnitSyntax unit, string usingName)`
`45`	`50`	`{`
`46`	`51`	`return unit.Usings.FirstOrDefault(x =>`
`47`		`- x.Name.NormalizeWhitespace().ToFullString().Equals(typeof(Path).Namespace));`
	`52`	`+ x.Name.NormalizeWhitespace().ToFullString().Equals(usingName));`
`48`	`53`	`}`
`49`	`54`
`50`	`55`	`public static FieldDeclarationSyntax CreateFileSystemFieldDeclaration()`