diff --git a/Project/Src/InstallSupport/TestCop.nuspec b/Project/Src/InstallSupport/TestCop.nuspec index be65964..6682a87 100644 --- a/Project/Src/InstallSupport/TestCop.nuspec +++ b/Project/Src/InstallSupport/TestCop.nuspec @@ -4,10 +4,11 @@ Resharper.TestCop.R9 0.0.0-internal - TestCop for ReSharper 2023 + TestCop for ReSharper 2024 Alcaeus Easily switch between unit tests and code. Create missing associated files. Includes highlightings and test templates to keep test projects neat and tidy. Works with NUnit, MSTest, xUnit ... + 1.10.21.243 Recompiled with R# SDK 2024.3.0 1.10.21.2 Recompiled with R# SDK 2023.3.2 1.10.21.0 Recompiled with R# SDK 2023.3.1 1.10.20.0 Recompiled with R# SDK 2023.2.0 diff --git a/Project/Src/TestCop.Plugin.Tests/CSharpHighlightingWithinSolutionTestBase.cs b/Project/Src/TestCop.Plugin.Tests/CSharpHighlightingWithinSolutionTestBase.cs index 196434a..71c24e5 100644 --- a/Project/Src/TestCop.Plugin.Tests/CSharpHighlightingWithinSolutionTestBase.cs +++ b/Project/Src/TestCop.Plugin.Tests/CSharpHighlightingWithinSolutionTestBase.cs @@ -118,14 +118,9 @@ protected static void ClearRegExSettingsPriorToRun(IContextBoundSettingsStore se protected virtual TestHighlightingDumper CreateHighlightDumper(IPsiSourceFile sourceFile, TextWriter writer) { - return new TestHighlightingDumper(sourceFile, writer, GetActiveStages(sourceFile.GetSolution()), HighlightingPredicate, CompilerIdsLanguage); + return new TestHighlightingDumper(sourceFile, writer, HighlightingPredicate, CompilerIdsLanguage); } - protected virtual IReadOnlyCollection GetActiveStages(ISolution solution) - { - return DaemonStageManager.GetInstance(solution).Stages; - } - protected virtual bool HighlightingPredicate(IHighlighting highlighting, IPsiSourceFile sourceFile, IContextBoundSettingsStore settingsStore) { return true; @@ -225,7 +220,7 @@ protected virtual IExecutableAction GetShortcutAction(TextWriter textwriter) protected ITextControl OpenTextControl(IProjectFile projectFile, int? caretOffset = null) { IEditorManager editorManager = projectFile.GetSolution().GetComponent(); - Task openProjectFileAsync = editorManager.OpenProjectFileAsync(projectFile, new OpenFileOptions(true)); + Task openProjectFileAsync = editorManager.OpenProjectFileAsync(projectFile, new OpenFileOptions(FireAndForget: true)); openProjectFileAsync.Wait(); return openProjectFileAsync.Result; } diff --git a/Project/Src/TestCop.Plugin.Tests/TestCop.Plugin.Tests.csproj b/Project/Src/TestCop.Plugin.Tests/TestCop.Plugin.Tests.csproj index 070117c..08141a5 100644 --- a/Project/Src/TestCop.Plugin.Tests/TestCop.Plugin.Tests.csproj +++ b/Project/Src/TestCop.Plugin.Tests/TestCop.Plugin.Tests.csproj @@ -1,89 +1,90 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -163,6 +164,12 @@ ..\..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll + + ..\..\packages\BouncyCastle.Cryptography.2.4.0\lib\net461\BouncyCastle.Cryptography.dll + + + ..\..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll + ..\..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll @@ -182,25 +189,31 @@ ..\..\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll - ..\..\packages\JetBrains.Annotations.2023.3.0\lib\net20\JetBrains.Annotations.dll + ..\..\packages\JetBrains.Annotations.2024.3.0\lib\net20\JetBrains.Annotations.dll ..\..\packages\JetBrains.AppStore.NotaryApi.1.0.10\lib\netstandard2.0\JetBrains.AppStore.NotaryApi.dll - ..\..\packages\JetBrains.Build.Platform.DistributedCache.1.0.20230909.199\lib\netstandard2.0\JetBrains.Build.Platform.DistributedCache.dll + ..\..\packages\JetBrains.Build.Platform.DistributedCache.1.1.20240726.221\lib\netstandard2.0\JetBrains.Build.Platform.DistributedCache.dll - - ..\..\packages\JetBrains.FormatRipper.2.0.1\lib\net35\JetBrains.FormatRipper.dll + + ..\..\packages\JetBrains.FormatRipper.2.2.2\lib\net35\JetBrains.FormatRipper.dll - - ..\..\packages\JetBrains.HabitatDetector.1.0.2\lib\net35\JetBrains.HabitatDetector.dll + + ..\..\packages\JetBrains.HabitatDetector.1.4.3\lib\net35\JetBrains.HabitatDetector.dll ..\..\packages\JetBrains.SharpZipLib.Stripped.1.3.3.30\lib\net\JetBrains.ICSharpCode.SharpZipLib.dll + + ..\..\packages\JetBrains.JsonRpc.1.0.2\lib\netstandard2.0\JetBrains.JsonRpc.dll + - ..\..\packages\JetBrains.Lifetimes.2023.3.0\lib\net472\JetBrains.Lifetimes.dll + ..\..\packages\JetBrains.Lifetimes.2024.3.0\lib\net472\JetBrains.Lifetimes.dll + + + ..\..\packages\JetBrains.Microsoft.Diagnostics.Runtime.2.1.20241003.5\lib\net461\JetBrains.Microsoft.Diagnostics.Runtime.dll ..\..\packages\JetBrains.Platform.MSBuild.Logger.1.0.20170331.0\lib\net\JetBrains.MSBuild.Logger.dll @@ -210,44 +223,44 @@ ..\..\packages\JetBrains.Platform.MSBuild.Logger.Api.1.0.20170809\lib\net\JetBrains.MSBuild.Logger.Api.dll True - - ..\..\packages\JetBrains.Profiler.Api.1.4.0\lib\net20\JetBrains.Profiler.Api.dll + + ..\..\packages\JetBrains.Profiler.Api.1.4.8\lib\net20\JetBrains.Profiler.Api.dll - - ..\..\packages\JetBrains.Profiler.SelfApi.2.5.0\lib\net46\JetBrains.Profiler.SelfApi.dll + + ..\..\packages\JetBrains.Profiler.SelfApi.2.5.12\lib\net46\JetBrains.Profiler.SelfApi.dll - ..\..\packages\JetBrains.RdFramework.2023.3.0\lib\net472\JetBrains.RdFramework.dll + ..\..\packages\JetBrains.RdFramework.2024.3.0\lib\net472\JetBrains.RdFramework.dll - ..\..\packages\JetBrains.RdFramework.Reflection.2023.3.0\lib\net472\JetBrains.RdFramework.Reflection.dll + ..\..\packages\JetBrains.RdFramework.Reflection.2024.3.0\lib\net472\JetBrains.RdFramework.Reflection.dll - - ..\..\packages\JetBrains.ReSharper.TestRunner.Abstractions.2.11.1\lib\net40\JetBrains.ReSharper.TestRunner.Abstractions.dll + + ..\..\packages\JetBrains.ReSharper.TestRunner.Abstractions.2.16.1\lib\net40\JetBrains.ReSharper.TestRunner.Abstractions.dll - - ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.MsTest.Tasks.2.11.1.11\lib\net35\JetBrains.ReSharper.TestRunner.Adapters.MsTest.Tasks.dll + + ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.MsTest.Tasks.2.16.1.12\lib\net35\JetBrains.ReSharper.TestRunner.Adapters.MsTest.Tasks.dll - - ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.NUnit2.Tasks.2.11.1.11\lib\net40\JetBrains.ReSharper.TestRunner.Adapters.NUnit2.Tasks.dll + + ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.NUnit2.Tasks.2.16.1.11\lib\net40\JetBrains.ReSharper.TestRunner.Adapters.NUnit2.Tasks.dll - - ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.NUnit3.Tasks.2.11.1.19\lib\net40\JetBrains.ReSharper.TestRunner.Adapters.NUnit3.Tasks.dll + + ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.NUnit3.Tasks.2.16.1.20\lib\net40\JetBrains.ReSharper.TestRunner.Adapters.NUnit3.Tasks.dll - - ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.UWP.Tasks.2.11.1.1\lib\net40\JetBrains.ReSharper.TestRunner.Adapters.UWP.Tasks.dll + + ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.UWP.Tasks.2.16.1.1\lib\net40\JetBrains.ReSharper.TestRunner.Adapters.UWP.Tasks.dll - - ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.VsTest.Tasks.2.11.1.1\lib\net35\JetBrains.ReSharper.TestRunner.Adapters.VsTest.Tasks.dll + + ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.VsTest.Tasks.2.16.1.1\lib\net35\JetBrains.ReSharper.TestRunner.Adapters.VsTest.Tasks.dll - - ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.XUnit.Tasks.2.11.1.9\lib\net40\JetBrains.ReSharper.TestRunner.Adapters.XUnit.Tasks.dll + + ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.XUnit.Tasks.2.16.1.11\lib\net35\JetBrains.ReSharper.TestRunner.Adapters.XUnit.Tasks.dll - - ..\..\packages\JetBrains.ReSharper.TestRunner.Utilities.2.11.1.14\lib\net40\JetBrains.ReSharper.TestRunner.Utilities.dll + + ..\..\packages\JetBrains.ReSharper.TestRunner.Utilities.2.16.1.15\lib\net40\JetBrains.ReSharper.TestRunner.Utilities.dll - - ..\..\packages\JetBrains.SignatureVerifier.2.0.2\lib\netstandard2.0\JetBrains.SignatureVerifier.dll + + ..\..\packages\JetBrains.SignatureVerifier.2.2.2\lib\netstandard2.0\JetBrains.SignatureVerifier.dll ..\..\packages\JetBrains.System.Reflection.Metadata.20170417.0.0.0\lib\net45\JetBrains.System.Reflection.Metadata.dll @@ -259,63 +272,60 @@ ..\..\packages\JetBrains.MahApps.Metro.1.5.0.1\lib\net45\MahApps.Metro.dll - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.CSharp.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.CSharp.Features.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Features.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.CSharp.Scripting.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Scripting.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.CSharp.Workspaces.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Workspaces.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.Elfie.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.Elfie.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.ExpressionEvaluator.ExpressionCompiler.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.ExpressionEvaluator.ExpressionCompiler.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.Features.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.Features.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.LanguageServer.Protocol.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.LanguageServer.Protocol.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.Scripting.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.Scripting.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.VisualBasic.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.VisualBasic.Features.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.Features.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.Workspaces.dll - - - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CommonLanguageServerProtocol.Framework.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.Workspaces.dll @@ -327,41 +337,47 @@ ..\..\packages\JetBrains.Microsoft.Deployment.WindowsInstaller.3.11.0\lib\net20\Microsoft.Deployment.WindowsInstaller.dll + + ..\..\packages\Microsoft.Diagnostics.NETCore.Client.0.2.221401\lib\netstandard2.0\Microsoft.Diagnostics.NETCore.Client.dll + ..\..\packages\Microsoft.Extensions.DependencyModel.3.0.0\lib\net451\Microsoft.Extensions.DependencyModel.dll - - ..\..\packages\Microsoft.Extensions.FileProviders.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.FileProviders.Abstractions.dll + + ..\..\packages\Microsoft.Extensions.FileProviders.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.FileProviders.Abstractions.dll ..\..\packages\Microsoft.Extensions.FileSystemGlobbing.6.0.0\lib\net461\Microsoft.Extensions.FileSystemGlobbing.dll - - ..\..\packages\Microsoft.Extensions.Primitives.7.0.0\lib\net462\Microsoft.Extensions.Primitives.dll + + ..\..\packages\Microsoft.Extensions.Primitives.8.0.0\lib\net462\Microsoft.Extensions.Primitives.dll + + + ..\..\packages\Microsoft.IdentityModel.Abstractions.6.35.0\lib\net472\Microsoft.IdentityModel.Abstractions.dll - - ..\..\packages\Microsoft.IdentityModel.JsonWebTokens.6.17.0\lib\net472\Microsoft.IdentityModel.JsonWebTokens.dll + + ..\..\packages\Microsoft.IdentityModel.JsonWebTokens.6.35.0\lib\net472\Microsoft.IdentityModel.JsonWebTokens.dll - - ..\..\packages\Microsoft.IdentityModel.Logging.6.17.0\lib\net472\Microsoft.IdentityModel.Logging.dll + + ..\..\packages\Microsoft.IdentityModel.Logging.6.35.0\lib\net472\Microsoft.IdentityModel.Logging.dll - - ..\..\packages\Microsoft.IdentityModel.Tokens.6.17.0\lib\net472\Microsoft.IdentityModel.Tokens.dll + + ..\..\packages\Microsoft.IdentityModel.Tokens.6.35.0\lib\net472\Microsoft.IdentityModel.Tokens.dll - - ..\..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll + + ..\..\packages\Microsoft.Owin.4.2.2\lib\net45\Microsoft.Owin.dll - - ..\..\packages\Microsoft.Owin.FileSystems.3.0.1\lib\net45\Microsoft.Owin.FileSystems.dll + + ..\..\packages\Microsoft.Owin.FileSystems.4.2.2\lib\net45\Microsoft.Owin.FileSystems.dll - - ..\..\packages\Microsoft.Owin.Host.HttpListener.3.0.1\lib\net45\Microsoft.Owin.Host.HttpListener.dll + + ..\..\packages\Microsoft.Owin.Host.HttpListener.4.2.2\lib\net45\Microsoft.Owin.Host.HttpListener.dll - - ..\..\packages\Microsoft.Owin.Hosting.3.0.1\lib\net45\Microsoft.Owin.Hosting.dll + + ..\..\packages\Microsoft.Owin.Hosting.4.2.2\lib\net45\Microsoft.Owin.Hosting.dll - - ..\..\packages\Microsoft.Owin.StaticFiles.3.0.1\lib\net45\Microsoft.Owin.StaticFiles.dll + + ..\..\packages\Microsoft.Owin.StaticFiles.4.2.2\lib\net45\Microsoft.Owin.StaticFiles.dll ..\..\packages\JetBrains.Microsoft.TestPlatform.TranslationLayer.16.0.0.20191015\lib\net451\Microsoft.TestPlatform.CommunicationUtilities.dll @@ -401,6 +417,9 @@ ..\..\packages\JetBrains.Windows7APICodePack.Stripped.1.1.20210120.1\lib\netstandard2.0\Microsoft.WindowsAPICodePack.Shell.dll + + ..\..\packages\Moq.4.16.1\lib\net45\Moq.dll + ..\..\packages\JetBrains.Toolset.RefAsm.Net461.NetStandard.2.0.20210225.212946\lib\net461\netstandard.dll True @@ -412,47 +431,47 @@ ..\..\packages\NHunspell.1.2.5554.16953\lib\net\NHunspell.dll - - ..\..\packages\JetBrains.NuGet.Commands.6.9.20240222.127\lib\net472\NuGet.Commands.dll + + ..\..\packages\JetBrains.NuGet.Commands.6.12.20241007.141\lib\net472\NuGet.Commands.dll - - ..\..\packages\JetBrains.NuGet.Common.6.9.20240222.127\lib\net472\NuGet.Common.dll + + ..\..\packages\JetBrains.NuGet.Common.6.12.20241007.141\lib\net472\NuGet.Common.dll - - ..\..\packages\JetBrains.NuGet.Configurations.6.9.20240222.127\lib\net472\NuGet.Configuration.dll + + ..\..\packages\JetBrains.NuGet.Configurations.6.12.20241007.141\lib\net472\NuGet.Configuration.dll ..\..\packages\JetBrains.NuGet.Core.2.14.2.20220408\lib\net\NuGet.Core.dll - - ..\..\packages\JetBrains.NuGet.Credentials.6.9.20240222.127\lib\net472\NuGet.Credentials.dll + + ..\..\packages\JetBrains.NuGet.Credentials.6.12.20241007.141\lib\net472\NuGet.Credentials.dll - - ..\..\packages\JetBrains.NuGet.DependencyResolver.Core.6.9.20240222.127\lib\net472\NuGet.DependencyResolver.Core.dll + + ..\..\packages\JetBrains.NuGet.DependencyResolver.Core.6.12.20241007.141\lib\net472\NuGet.DependencyResolver.Core.dll - - ..\..\packages\JetBrains.NuGet.Frameworks.6.9.20240222.127\lib\net472\NuGet.Frameworks.dll + + ..\..\packages\JetBrains.NuGet.Frameworks.6.12.20241007.141\lib\net472\NuGet.Frameworks.dll - - ..\..\packages\JetBrains.NuGet.LibraryModel.6.9.20240222.127\lib\net472\NuGet.LibraryModel.dll + + ..\..\packages\JetBrains.NuGet.LibraryModel.6.12.20241007.141\lib\net472\NuGet.LibraryModel.dll - - ..\..\packages\JetBrains.NuGet.PackageManagement.6.9.20240222.127\lib\net472\NuGet.PackageManagement.dll + + ..\..\packages\JetBrains.NuGet.PackageManagement.6.12.20241007.141\lib\net472\NuGet.PackageManagement.dll - - ..\..\packages\JetBrains.NuGet.Packaging.6.9.20240222.127\lib\net472\NuGet.Packaging.dll + + ..\..\packages\JetBrains.NuGet.Packaging.6.12.20241007.141\lib\net472\NuGet.Packaging.dll - - ..\..\packages\JetBrains.NuGet.ProjectModel.6.9.20240222.127\lib\net472\NuGet.ProjectModel.dll + + ..\..\packages\JetBrains.NuGet.ProjectModel.6.12.20241007.141\lib\net472\NuGet.ProjectModel.dll - - ..\..\packages\JetBrains.NuGet.Protocol.6.9.20240222.127\lib\net472\NuGet.Protocol.dll + + ..\..\packages\JetBrains.NuGet.Protocol.6.12.20241007.141\lib\net472\NuGet.Protocol.dll - - ..\..\packages\JetBrains.NuGet.Resolver.6.9.20240222.127\lib\net472\NuGet.Resolver.dll + + ..\..\packages\JetBrains.NuGet.Resolver.6.12.20241007.141\lib\net472\NuGet.Resolver.dll - - ..\..\packages\JetBrains.NuGet.Versioning.6.9.20240222.127\lib\net472\NuGet.Versioning.dll + + ..\..\packages\JetBrains.NuGet.Versioning.6.12.20241007.141\lib\net472\NuGet.Versioning.dll ..\..\packages\NUnit.3.13.2\lib\net45\nunit.framework.dll @@ -476,25 +495,30 @@ ..\..\packages\JetBrains.Should.1.1.20\lib\Should.dll - - ..\..\packages\Sprache.JetBrains.2.1.0\lib\net40\Sprache.dll + + ..\..\packages\Sprache.JetBrains.2.3.1\lib\net45\Sprache.dll ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + ..\..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll + - - ..\..\packages\System.Collections.Immutable.7.0.0\lib\net462\System.Collections.Immutable.dll + + ..\..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll + + - - ..\..\packages\System.Drawing.Common.7.0.0\lib\net462\System.Drawing.Common.dll + + ..\..\packages\System.Drawing.Common.8.0.0\lib\net462\System.Drawing.Common.dll @@ -507,9 +531,13 @@ ..\..\packages\System.IO.FileSystem.AccessControl.5.0.0\lib\net461\System.IO.FileSystem.AccessControl.dll + + ..\..\packages\System.IO.Packaging.8.0.0\lib\net462\System.IO.Packaging.dll + ..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + ..\..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll True @@ -520,8 +548,11 @@ ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\packages\System.Reflection.Metadata.7.0.0\lib\net462\System.Reflection.Metadata.dll + + ..\..\packages\System.Reactive.5.0.0\lib\net472\System.Reactive.dll + + + ..\..\packages\System.Reflection.Metadata.8.0.0\lib\net462\System.Reflection.Metadata.dll ..\..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll @@ -559,22 +590,35 @@ True True + + ..\..\packages\System.Security.Permissions.8.0.0\lib\net462\System.Security.Permissions.dll + ..\..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll - - ..\..\packages\System.Text.Encoding.CodePages.7.0.0\lib\net462\System.Text.Encoding.CodePages.dll + + + ..\..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll + + + ..\..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll + + + ..\..\packages\System.Text.Json.8.0.4\lib\net462\System.Text.Json.dll - - ..\..\packages\System.Threading.Channels.6.0.0\lib\net461\System.Threading.Channels.dll + + ..\..\packages\System.Threading.Channels.8.0.0\lib\net462\System.Threading.Channels.dll ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + ..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + + ..\..\packages\JetBrains.System.Windows.Interactivity.3.0.40218.1\lib\netstandard2.0\System.Windows.Interactivity.dll @@ -684,255 +728,258 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Project/Src/TestCop.Plugin.Tests/app.config b/Project/Src/TestCop.Plugin.Tests/app.config index b16606d..3e923cd 100644 --- a/Project/Src/TestCop.Plugin.Tests/app.config +++ b/Project/Src/TestCop.Plugin.Tests/app.config @@ -4,15 +4,15 @@ - + - + - + @@ -48,7 +48,7 @@ - + @@ -62,6 +62,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Project/Src/TestCop.Plugin.Tests/packages.config b/Project/Src/TestCop.Plugin.Tests/packages.config index da0bea5..4d99ed6 100644 --- a/Project/Src/TestCop.Plugin.Tests/packages.config +++ b/Project/Src/TestCop.Plugin.Tests/packages.config @@ -5,60 +5,65 @@ + + - + - + - - - - + + + + - - - - - - + + + + + + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + @@ -80,125 +85,130 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + + - + + - + - - - - - - - - - + + + + + + + + + + + @@ -208,23 +218,30 @@ - + - - + + + + - + + + - - + + + + + - + diff --git a/Project/Src/TestCop.Plugin/Helper/JumpToTestMenuHelper.cs b/Project/Src/TestCop.Plugin/Helper/JumpToTestMenuHelper.cs index 9a90b27..3b65a8e 100644 --- a/Project/Src/TestCop.Plugin/Helper/JumpToTestMenuHelper.cs +++ b/Project/Src/TestCop.Plugin/Helper/JumpToTestMenuHelper.cs @@ -33,9 +33,9 @@ namespace TestCop.Plugin.Helper using JetBrains.Util.Media; public static class JumpToTestMenuHelper - { + { //------------------------------------------------------------------------------------------------------------------------ - public static void PromptToOpenOrCreateClassFiles(Action menuDisplayer,Lifetime lifetime, IDataContext context, ISolution solution + public static void PromptToOpenOrCreateClassFiles(Action menuDisplayer, Lifetime lifetime, IDataContext context, ISolution solution , IProject project, IClrTypeName clrTypeClassName, IList targetProjects , List preferred, List fullList) { @@ -48,7 +48,7 @@ public static void PromptToOpenOrCreateClassFiles(Action clrDeclaredElements, @@ -86,7 +86,7 @@ private static void AppendNavigateToMenuItems(Lifetime lifetime, ISolution solut declaredElement , p => async () => - await editorManager.OpenProjectFileAsync(p, new OpenFileOptions(true)).ConfigureAwait(false) + await editorManager.OpenProjectFileAsync(p, new OpenFileOptions(FireAndForget: true)).ConfigureAwait(false) ); menuItems.AddRange(simpleMenuItems); } @@ -104,8 +104,8 @@ private static void PositionPopMenuCorrectly(IDataContext context, Lifetime life //------------------------------------------------------------------------------------------------------------------------ private static IList DescribeFilesAssociatedWithDeclaredElement(Lifetime lifetime, DocumentManager documentManager, IClrDeclaredElement declaredElement, Func clickAction) { - IList menuItems = new List(); - + IList menuItems = new List(); + var projectFiles = GetProjectFiles(documentManager, declaredElement); foreach (var projectFile in projectFiles) @@ -163,7 +163,7 @@ public static void MoveBestMatchesToTopWhenSwitchingFromTestToCode(IList associatedTargetProjects, IList currentMenus, @@ -178,9 +178,9 @@ public static bool DeriveRelatedFileNameAndAddCreateMenus(IDataContext context, bool currentFileisTestFile = baseFileName.EndsWith(settings.TestClassSuffixes()); foreach (var testClassSuffix in settings.GetAppropriateTestClassSuffixes(baseFileName)) - { + { var targetFile = ResharperHelper.UsingFileNameGetClassName(baseFileName).RemoveTrailing(testClassSuffix); - + if (!currentFileisTestFile) { targetFile += testClassSuffix; @@ -230,20 +230,20 @@ private static List AddCreateFileMenuItem(Lifetime lifetime, Tes SimpleMenuItem result = new SimpleMenuItem("Create associated file" , null , ResharperHelper.ProtectActionFromReEntry(lifetime, "TestingMenuNavigation" - , () => ResharperHelper.CreateFileWithinProject(projectItem, targetFile))) + , () => ResharperHelper.CreateFileWithinProject(projectItem, targetFile))) { Style = MenuItemStyle.Enabled, Icon = UnnamedThemedIcons.Agent16x16.Id, Text = new RichText("Create ", TextStyle.FromForeColor(JetRgbaColor.FromArgb(Color.Green.A, Color.Green.R, Color.Green.G, Color.Green.B))) .Append(targetFile, TextStyle.FromForeColor(TextStyle.DefaultForegroundColor)), ShortcutText = new RichText("(" + projectItem.Project.GetPresentableProjectPath() - + projectItem.SubNamespaceFolder.FullPath.RemoveLeading(projectItem.Project.ProjectFileLocation.Directory.FullPath) - + ")", + + projectItem.SubNamespaceFolder.FullPath.RemoveLeading(projectItem.Project.ProjectFileLocation.Directory.FullPath) + + ")", TextStyle.FromForeColor(JetRgbaColor.FromArgb(Color.LightGray.A, Color.LightGray.R, Color.LightGray.G, Color.LightGray.B))) }; menuItems.Add(result); return menuItems; - } + } //------------------------------------------------------------------------------------------------------------------------ private static IList GetProjectFiles(DocumentManager documentManager, IDeclaredElement declaredElement) { diff --git a/Project/Src/TestCop.Plugin/OptionsPage/TestCopOptionPage.xaml.cs b/Project/Src/TestCop.Plugin/OptionsPage/TestCopOptionPage.xaml.cs index d0c4fc8..d5a0aff 100644 --- a/Project/Src/TestCop.Plugin/OptionsPage/TestCopOptionPage.xaml.cs +++ b/Project/Src/TestCop.Plugin/OptionsPage/TestCopOptionPage.xaml.cs @@ -33,7 +33,7 @@ using System.Windows.Controls; using System.Windows.Data; using System.Windows.Media; - +using JetBrains.UI.CrossFramework; using TestCop.Plugin.Extensions; using TestCop.Plugin.Helper; diff --git a/Project/Src/TestCop.Plugin/ProjectAnalysisElementProcessor.cs b/Project/Src/TestCop.Plugin/ProjectAnalysisElementProcessor.cs index ab8f398..e0b73d3 100644 --- a/Project/Src/TestCop.Plugin/ProjectAnalysisElementProcessor.cs +++ b/Project/Src/TestCop.Plugin/ProjectAnalysisElementProcessor.cs @@ -37,7 +37,7 @@ protected void AddHighlighting(DocumentRange range, IHighlighting highlighting) public IReadOnlyList Highlightings { - get { return _highlightingConsumer.Highlightings.AsIReadOnlyList(); } + get { return _highlightingConsumer.CollectHighlightings(); } } public ProjectAnalysisElementProcessor(ProjectAnalysisDaemonStageProcess stageProcess, IDaemonProcess process, diff --git a/Project/Src/TestCop.Plugin/RenameTestFilesTooRefactoring.cs b/Project/Src/TestCop.Plugin/RenameTestFilesTooRefactoring.cs index 46ac932..748a14a 100644 --- a/Project/Src/TestCop.Plugin/RenameTestFilesTooRefactoring.cs +++ b/Project/Src/TestCop.Plugin/RenameTestFilesTooRefactoring.cs @@ -83,7 +83,7 @@ public IEnumerable GetFileRenames(IDeclaredElement declaredElement, IEditorManager editorManager = solution.GetComponent(); //TODO EditorManager.GetInstance(solution).OpenProjectFile(projectFileMatch.ProjectFile, new OpenFileOptions(false)); - editorManager.OpenProjectFileAsync(projectFileMatch.ProjectFile, new OpenFileOptions(false)); + editorManager.OpenProjectFileAsync(projectFileMatch.ProjectFile, new OpenFileOptions(FireAndForget:false)); //need to ensure class within file is renamed tooo yield return new FileRename(psiModule.GetPsiServices(), projectFileMatch.ProjectFile, newTestClassName); diff --git a/Project/Src/TestCop.Plugin/TestAnalysisDaemonStage.cs b/Project/Src/TestCop.Plugin/TestAnalysisDaemonStage.cs index 1e2b158..eeba970 100644 --- a/Project/Src/TestCop.Plugin/TestAnalysisDaemonStage.cs +++ b/Project/Src/TestCop.Plugin/TestAnalysisDaemonStage.cs @@ -9,11 +9,12 @@ using JetBrains.Application.Threading; using JetBrains.ReSharper.Feature.Services.CSharp.Daemon; using JetBrains.ReSharper.Feature.Services.Daemon; +using JetBrains.ReSharper.Features.ReSpeller.ReSharperSpecific.Daemon.Highlighting; using JetBrains.ReSharper.Psi.CSharp.Tree; namespace TestCop.Plugin { - [DaemonStage(StagesBefore = new [] {typeof(FilteringHighlightingDaemonStage)})] + [DaemonStage(StagesBefore = new [] {typeof(HighlightingDaemonStage)})] public class TestAnalysisDaemonStage : CSharpDaemonStageBase { private readonly IShellLocks myShellLocks; @@ -37,7 +38,7 @@ protected override IDaemonStageProcess CreateProcess(IDaemonProcess process, ICo } } - [DaemonStage(StagesBefore = new [] {typeof(FilteringHighlightingDaemonStage)})] + [DaemonStage(StagesBefore = new [] {typeof(HighlightingDaemonStage)})] public class TestAnalysisProjectDaemonStage : CSharpDaemonStageBase { /// diff --git a/Project/Src/TestCop.Plugin/TestCop.Plugin.csproj b/Project/Src/TestCop.Plugin/TestCop.Plugin.csproj index 5097e54..ed724f2 100644 --- a/Project/Src/TestCop.Plugin/TestCop.Plugin.csproj +++ b/Project/Src/TestCop.Plugin/TestCop.Plugin.csproj @@ -1,88 +1,89 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -156,6 +157,12 @@ ..\..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll + + ..\..\packages\BouncyCastle.Cryptography.2.4.0\lib\net461\BouncyCastle.Cryptography.dll + + + ..\..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll + ..\..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll @@ -175,68 +182,74 @@ ..\..\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll - ..\..\packages\JetBrains.Annotations.2023.3.0\lib\net20\JetBrains.Annotations.dll + ..\..\packages\JetBrains.Annotations.2024.3.0\lib\net20\JetBrains.Annotations.dll ..\..\packages\JetBrains.AppStore.NotaryApi.1.0.10\lib\netstandard2.0\JetBrains.AppStore.NotaryApi.dll - ..\..\packages\JetBrains.Build.Platform.DistributedCache.1.0.20230909.199\lib\netstandard2.0\JetBrains.Build.Platform.DistributedCache.dll + ..\..\packages\JetBrains.Build.Platform.DistributedCache.1.1.20240726.221\lib\netstandard2.0\JetBrains.Build.Platform.DistributedCache.dll - - ..\..\packages\JetBrains.FormatRipper.2.0.1\lib\net35\JetBrains.FormatRipper.dll + + ..\..\packages\JetBrains.FormatRipper.2.2.2\lib\net35\JetBrains.FormatRipper.dll - - ..\..\packages\JetBrains.HabitatDetector.1.0.2\lib\net35\JetBrains.HabitatDetector.dll + + ..\..\packages\JetBrains.HabitatDetector.1.4.3\lib\net35\JetBrains.HabitatDetector.dll ..\..\packages\JetBrains.SharpZipLib.Stripped.1.3.3.30\lib\net\JetBrains.ICSharpCode.SharpZipLib.dll + + ..\..\packages\JetBrains.JsonRpc.1.0.2\lib\netstandard2.0\JetBrains.JsonRpc.dll + - ..\..\packages\JetBrains.Lifetimes.2023.3.0\lib\net472\JetBrains.Lifetimes.dll + ..\..\packages\JetBrains.Lifetimes.2024.3.0\lib\net472\JetBrains.Lifetimes.dll + + + ..\..\packages\JetBrains.Microsoft.Diagnostics.Runtime.2.1.20241003.5\lib\net461\JetBrains.Microsoft.Diagnostics.Runtime.dll ..\..\packages\JetBrains.Platform.MSBuild.Logger.Api.1.0.20170809\lib\net\JetBrains.MSBuild.Logger.Api.dll True - - ..\..\packages\JetBrains.Profiler.Api.1.4.0\lib\net20\JetBrains.Profiler.Api.dll + + ..\..\packages\JetBrains.Profiler.Api.1.4.8\lib\net20\JetBrains.Profiler.Api.dll - - ..\..\packages\JetBrains.Profiler.SelfApi.2.5.0\lib\net46\JetBrains.Profiler.SelfApi.dll + + ..\..\packages\JetBrains.Profiler.SelfApi.2.5.12\lib\net46\JetBrains.Profiler.SelfApi.dll - ..\..\packages\JetBrains.RdFramework.2023.3.0\lib\net472\JetBrains.RdFramework.dll + ..\..\packages\JetBrains.RdFramework.2024.3.0\lib\net472\JetBrains.RdFramework.dll - ..\..\packages\JetBrains.RdFramework.Reflection.2023.3.0\lib\net472\JetBrains.RdFramework.Reflection.dll + ..\..\packages\JetBrains.RdFramework.Reflection.2024.3.0\lib\net472\JetBrains.RdFramework.Reflection.dll - - ..\..\packages\JetBrains.ReSharper.TestRunner.Abstractions.2.11.1\lib\net40\JetBrains.ReSharper.TestRunner.Abstractions.dll + + ..\..\packages\JetBrains.ReSharper.TestRunner.Abstractions.2.16.1\lib\net40\JetBrains.ReSharper.TestRunner.Abstractions.dll - - ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.MsTest.Tasks.2.11.1.11\lib\net35\JetBrains.ReSharper.TestRunner.Adapters.MsTest.Tasks.dll + + ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.MsTest.Tasks.2.16.1.12\lib\net35\JetBrains.ReSharper.TestRunner.Adapters.MsTest.Tasks.dll - - ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.NUnit2.Tasks.2.11.1.11\lib\net40\JetBrains.ReSharper.TestRunner.Adapters.NUnit2.Tasks.dll + + ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.NUnit2.Tasks.2.16.1.11\lib\net40\JetBrains.ReSharper.TestRunner.Adapters.NUnit2.Tasks.dll - - ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.NUnit3.Tasks.2.11.1.19\lib\net40\JetBrains.ReSharper.TestRunner.Adapters.NUnit3.Tasks.dll + + ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.NUnit3.Tasks.2.16.1.20\lib\net40\JetBrains.ReSharper.TestRunner.Adapters.NUnit3.Tasks.dll - - ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.UWP.Tasks.2.11.1.1\lib\net40\JetBrains.ReSharper.TestRunner.Adapters.UWP.Tasks.dll + + ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.UWP.Tasks.2.16.1.1\lib\net40\JetBrains.ReSharper.TestRunner.Adapters.UWP.Tasks.dll - - ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.VsTest.Tasks.2.11.1.1\lib\net35\JetBrains.ReSharper.TestRunner.Adapters.VsTest.Tasks.dll + + ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.VsTest.Tasks.2.16.1.1\lib\net35\JetBrains.ReSharper.TestRunner.Adapters.VsTest.Tasks.dll - - ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.XUnit.Tasks.2.11.1.9\lib\net40\JetBrains.ReSharper.TestRunner.Adapters.XUnit.Tasks.dll + + ..\..\packages\JetBrains.ReSharper.TestRunner.Adapters.XUnit.Tasks.2.16.1.11\lib\net35\JetBrains.ReSharper.TestRunner.Adapters.XUnit.Tasks.dll - - ..\..\packages\JetBrains.ReSharper.TestRunner.Utilities.2.11.1.14\lib\net40\JetBrains.ReSharper.TestRunner.Utilities.dll + + ..\..\packages\JetBrains.ReSharper.TestRunner.Utilities.2.16.1.15\lib\net40\JetBrains.ReSharper.TestRunner.Utilities.dll - - ..\..\packages\JetBrains.SignatureVerifier.2.0.2\lib\netstandard2.0\JetBrains.SignatureVerifier.dll + + ..\..\packages\JetBrains.SignatureVerifier.2.2.2\lib\netstandard2.0\JetBrains.SignatureVerifier.dll ..\..\packages\JetBrains.Toolset.ScriptSourcesCompiler.Interface.1.0.20170420.1\lib\netstandard2.0\JetBrains.Toolset.ScriptSourcesCompiler.Interface.dll @@ -245,63 +258,60 @@ ..\..\packages\JetBrains.MahApps.Metro.1.5.0.1\lib\net45\MahApps.Metro.dll - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.CSharp.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.CSharp.Features.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Features.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.CSharp.Scripting.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Scripting.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.CSharp.Workspaces.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Workspaces.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.Elfie.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.Elfie.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.ExpressionEvaluator.ExpressionCompiler.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.ExpressionEvaluator.ExpressionCompiler.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.Features.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.Features.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.LanguageServer.Protocol.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.LanguageServer.Protocol.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.Scripting.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.Scripting.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.VisualBasic.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.VisualBasic.Features.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.Features.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CodeAnalysis.Workspaces.dll - - - ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20240223.153841\Lib\Net\Microsoft.CommonLanguageServerProtocol.Framework.dll + ..\..\packages\JetBrains.Roslyn.References.Repack.42.42.20241023.43555\lib\netstandard2.0\Microsoft.CodeAnalysis.Workspaces.dll @@ -313,41 +323,47 @@ ..\..\packages\JetBrains.Microsoft.Deployment.WindowsInstaller.3.11.0\lib\net20\Microsoft.Deployment.WindowsInstaller.dll + + ..\..\packages\Microsoft.Diagnostics.NETCore.Client.0.2.221401\lib\netstandard2.0\Microsoft.Diagnostics.NETCore.Client.dll + ..\..\packages\Microsoft.Extensions.DependencyModel.3.0.0\lib\net451\Microsoft.Extensions.DependencyModel.dll - - ..\..\packages\Microsoft.Extensions.FileProviders.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.FileProviders.Abstractions.dll + + ..\..\packages\Microsoft.Extensions.FileProviders.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.FileProviders.Abstractions.dll ..\..\packages\Microsoft.Extensions.FileSystemGlobbing.6.0.0\lib\net461\Microsoft.Extensions.FileSystemGlobbing.dll - - ..\..\packages\Microsoft.Extensions.Primitives.7.0.0\lib\net462\Microsoft.Extensions.Primitives.dll + + ..\..\packages\Microsoft.Extensions.Primitives.8.0.0\lib\net462\Microsoft.Extensions.Primitives.dll + + + ..\..\packages\Microsoft.IdentityModel.Abstractions.6.35.0\lib\net472\Microsoft.IdentityModel.Abstractions.dll - - ..\..\packages\Microsoft.IdentityModel.JsonWebTokens.6.17.0\lib\net472\Microsoft.IdentityModel.JsonWebTokens.dll + + ..\..\packages\Microsoft.IdentityModel.JsonWebTokens.6.35.0\lib\net472\Microsoft.IdentityModel.JsonWebTokens.dll - - ..\..\packages\Microsoft.IdentityModel.Logging.6.17.0\lib\net472\Microsoft.IdentityModel.Logging.dll + + ..\..\packages\Microsoft.IdentityModel.Logging.6.35.0\lib\net472\Microsoft.IdentityModel.Logging.dll - - ..\..\packages\Microsoft.IdentityModel.Tokens.6.17.0\lib\net472\Microsoft.IdentityModel.Tokens.dll + + ..\..\packages\Microsoft.IdentityModel.Tokens.6.35.0\lib\net472\Microsoft.IdentityModel.Tokens.dll - - ..\..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll + + ..\..\packages\Microsoft.Owin.4.2.2\lib\net45\Microsoft.Owin.dll - - ..\..\packages\Microsoft.Owin.FileSystems.3.0.1\lib\net45\Microsoft.Owin.FileSystems.dll + + ..\..\packages\Microsoft.Owin.FileSystems.4.2.2\lib\net45\Microsoft.Owin.FileSystems.dll - - ..\..\packages\Microsoft.Owin.Host.HttpListener.3.0.1\lib\net45\Microsoft.Owin.Host.HttpListener.dll + + ..\..\packages\Microsoft.Owin.Host.HttpListener.4.2.2\lib\net45\Microsoft.Owin.Host.HttpListener.dll - - ..\..\packages\Microsoft.Owin.Hosting.3.0.1\lib\net45\Microsoft.Owin.Hosting.dll + + ..\..\packages\Microsoft.Owin.Hosting.4.2.2\lib\net45\Microsoft.Owin.Hosting.dll - - ..\..\packages\Microsoft.Owin.StaticFiles.3.0.1\lib\net45\Microsoft.Owin.StaticFiles.dll + + ..\..\packages\Microsoft.Owin.StaticFiles.4.2.2\lib\net45\Microsoft.Owin.StaticFiles.dll ..\..\packages\JetBrains.Microsoft.TestPlatform.TranslationLayer.16.0.0.20191015\lib\net451\Microsoft.TestPlatform.CommunicationUtilities.dll @@ -390,6 +406,9 @@ ..\..\packages\JetBrains.Windows7APICodePack.Stripped.1.1.20210120.1\lib\netstandard2.0\Microsoft.WindowsAPICodePack.Shell.dll + + ..\..\packages\Moq.4.16.1\lib\net45\Moq.dll + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll @@ -397,47 +416,47 @@ ..\..\packages\NHunspell.1.2.5554.16953\lib\net\NHunspell.dll - - ..\..\packages\JetBrains.NuGet.Commands.6.9.20240222.127\lib\net472\NuGet.Commands.dll + + ..\..\packages\JetBrains.NuGet.Commands.6.12.20241007.141\lib\net472\NuGet.Commands.dll - - ..\..\packages\JetBrains.NuGet.Common.6.9.20240222.127\lib\net472\NuGet.Common.dll + + ..\..\packages\JetBrains.NuGet.Common.6.12.20241007.141\lib\net472\NuGet.Common.dll - - ..\..\packages\JetBrains.NuGet.Configurations.6.9.20240222.127\lib\net472\NuGet.Configuration.dll + + ..\..\packages\JetBrains.NuGet.Configurations.6.12.20241007.141\lib\net472\NuGet.Configuration.dll ..\..\packages\JetBrains.NuGet.Core.2.14.2.20220408\lib\net\NuGet.Core.dll - - ..\..\packages\JetBrains.NuGet.Credentials.6.9.20240222.127\lib\net472\NuGet.Credentials.dll + + ..\..\packages\JetBrains.NuGet.Credentials.6.12.20241007.141\lib\net472\NuGet.Credentials.dll - - ..\..\packages\JetBrains.NuGet.DependencyResolver.Core.6.9.20240222.127\lib\net472\NuGet.DependencyResolver.Core.dll + + ..\..\packages\JetBrains.NuGet.DependencyResolver.Core.6.12.20241007.141\lib\net472\NuGet.DependencyResolver.Core.dll - - ..\..\packages\JetBrains.NuGet.Frameworks.6.9.20240222.127\lib\net472\NuGet.Frameworks.dll + + ..\..\packages\JetBrains.NuGet.Frameworks.6.12.20241007.141\lib\net472\NuGet.Frameworks.dll - - ..\..\packages\JetBrains.NuGet.LibraryModel.6.9.20240222.127\lib\net472\NuGet.LibraryModel.dll + + ..\..\packages\JetBrains.NuGet.LibraryModel.6.12.20241007.141\lib\net472\NuGet.LibraryModel.dll - - ..\..\packages\JetBrains.NuGet.PackageManagement.6.9.20240222.127\lib\net472\NuGet.PackageManagement.dll + + ..\..\packages\JetBrains.NuGet.PackageManagement.6.12.20241007.141\lib\net472\NuGet.PackageManagement.dll - - ..\..\packages\JetBrains.NuGet.Packaging.6.9.20240222.127\lib\net472\NuGet.Packaging.dll + + ..\..\packages\JetBrains.NuGet.Packaging.6.12.20241007.141\lib\net472\NuGet.Packaging.dll - - ..\..\packages\JetBrains.NuGet.ProjectModel.6.9.20240222.127\lib\net472\NuGet.ProjectModel.dll + + ..\..\packages\JetBrains.NuGet.ProjectModel.6.12.20241007.141\lib\net472\NuGet.ProjectModel.dll - - ..\..\packages\JetBrains.NuGet.Protocol.6.9.20240222.127\lib\net472\NuGet.Protocol.dll + + ..\..\packages\JetBrains.NuGet.Protocol.6.12.20241007.141\lib\net472\NuGet.Protocol.dll - - ..\..\packages\JetBrains.NuGet.Resolver.6.9.20240222.127\lib\net472\NuGet.Resolver.dll + + ..\..\packages\JetBrains.NuGet.Resolver.6.12.20241007.141\lib\net472\NuGet.Resolver.dll - - ..\..\packages\JetBrains.NuGet.Versioning.6.9.20240222.127\lib\net472\NuGet.Versioning.dll + + ..\..\packages\JetBrains.NuGet.Versioning.6.12.20241007.141\lib\net472\NuGet.Versioning.dll ..\..\packages\NUnit.3.13.2\lib\net45\nunit.framework.dll @@ -459,25 +478,30 @@ ..\..\packages\JetBrains.Should.1.1.20\lib\Should.dll - - ..\..\packages\Sprache.JetBrains.2.1.0\lib\net40\Sprache.dll + + ..\..\packages\Sprache.JetBrains.2.3.1\lib\net45\Sprache.dll ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + ..\..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll + - - ..\..\packages\System.Collections.Immutable.7.0.0\lib\net462\System.Collections.Immutable.dll + + ..\..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll + + - - ..\..\packages\System.Drawing.Common.7.0.0\lib\net462\System.Drawing.Common.dll + + ..\..\packages\System.Drawing.Common.8.0.0\lib\net462\System.Drawing.Common.dll @@ -490,17 +514,24 @@ ..\..\packages\System.IO.FileSystem.AccessControl.5.0.0\lib\net461\System.IO.FileSystem.AccessControl.dll + + ..\..\packages\System.IO.Packaging.8.0.0\lib\net462\System.IO.Packaging.dll + ..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\packages\System.Reflection.Metadata.7.0.0\lib\net462\System.Reflection.Metadata.dll + + ..\..\packages\System.Reactive.5.0.0\lib\net472\System.Reactive.dll + + + ..\..\packages\System.Reflection.Metadata.8.0.0\lib\net462\System.Reflection.Metadata.dll ..\..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll @@ -539,22 +570,35 @@ True True + + ..\..\packages\System.Security.Permissions.8.0.0\lib\net462\System.Security.Permissions.dll + ..\..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll - - ..\..\packages\System.Text.Encoding.CodePages.7.0.0\lib\net462\System.Text.Encoding.CodePages.dll + + + ..\..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll + + + ..\..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll + + + ..\..\packages\System.Text.Json.8.0.4\lib\net462\System.Text.Json.dll - - ..\..\packages\System.Threading.Channels.6.0.0\lib\net461\System.Threading.Channels.dll + + ..\..\packages\System.Threading.Channels.8.0.0\lib\net462\System.Threading.Channels.dll ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + ..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + + ..\..\packages\JetBrains.System.Windows.Interactivity.3.0.40218.1\lib\netstandard2.0\System.Windows.Interactivity.dll @@ -716,254 +760,257 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Project/Src/TestCop.Plugin/TestFileAnalysisElementProcessor.cs b/Project/Src/TestCop.Plugin/TestFileAnalysisElementProcessor.cs index 5724438..a068077 100644 --- a/Project/Src/TestCop.Plugin/TestFileAnalysisElementProcessor.cs +++ b/Project/Src/TestCop.Plugin/TestFileAnalysisElementProcessor.cs @@ -37,7 +37,7 @@ public class TestFileAnalysisElementProcessor : IRecursiveElementProcessor public IReadOnlyList Highlightings { - get { return _highlightingConsumer.Highlightings.AsIReadOnlyList(); } + get { return _highlightingConsumer.CollectHighlightings(); } } protected void AddHighlighting(DocumentRange range, IHighlighting highlighting) @@ -46,10 +46,10 @@ protected void AddHighlighting(DocumentRange range, IHighlighting highlighting) } public TestFileAnalysisElementProcessor(TestFileAnalysisDaemonStageProcess stageProcess, IDaemonProcess process, IContextBoundSettingsStore settings) - { + { _highlightingConsumer = new FilteringHighlightingConsumer(stageProcess.File.GetSourceFile(), stageProcess.File, settings); _process = process; - _settings = settings; + _settings = settings; } private ISolution Solution { get { return _process.Solution; } } @@ -70,7 +70,7 @@ private IList TestAttributes return testingAttributes; } } - + private TestFileAnalysisSettings Settings { get { return _settings.GetKey(SettingsOptimization.OptimizeDefault); } @@ -80,11 +80,11 @@ private IList BDDPrefixes { get { - var prefix = Settings.BddPrefixes(); + var prefix = Settings.BddPrefixes(); return prefix; } } - + public bool InteriorShouldBeProcessed(ITreeNode element) { return true; @@ -95,38 +95,38 @@ public void ProcessBeforeInterior(ITreeNode element) } public void ProcessAfterInterior(ITreeNode element) - { + { var functionDeclaration = element as ICSharpFunctionDeclaration; - + if (functionDeclaration != null) { - ProcessFunctionDeclaration(functionDeclaration); + ProcessFunctionDeclaration(functionDeclaration); } - + var typeDeclaration = element as ICSharpTypeDeclaration; if (typeDeclaration != null) { - ProcessTypeDeclaration(typeDeclaration); + ProcessTypeDeclaration(typeDeclaration); } } - + private void ProcessTypeDeclaration(ICSharpTypeDeclaration declaration) { if (declaration.GetContainingNode() != null) { return;//Dont instpect types already within a type } - + var testingAttributes = FindTestingAttributes(declaration, TestAttributes); if (testingAttributes.Count == 0) { /* type is missing attributes - lets check the body */ if (!CheckMethodsForTestingAttributes(declaration, TestAttributes)) return; } - + //We have a testing attribute so now check some conformance. CheckElementIsPublicAndCreateWarningIfNot(declaration, testingAttributes); - + if (CheckNamingOfTypeEndsWithTestSuffix(declaration)) { if (CheckNamingOfFileAgainstTypeAndCreateWarningIfNot(declaration)) @@ -136,14 +136,14 @@ private void ProcessTypeDeclaration(ICSharpTypeDeclaration declaration) } } - - private static bool CheckMethodsForTestingAttributes(ICSharpTypeDeclaration declaration, IList testAttributes ) + + private static bool CheckMethodsForTestingAttributes(ICSharpTypeDeclaration declaration, IList testAttributes) { var sourceFile = declaration.GetSourceFile(); if (declaration.DeclaredElement == null) return false; foreach (var m in declaration.DeclaredElement.Methods.SelectMany(m => m.GetDeclarationsIn(sourceFile)).OfType()) { - if (Enumerable.Any(FindTestingAttributes(m, testAttributes))) return true; + if (Enumerable.Any(FindTestingAttributes(m, testAttributes))) return true; } return false; } @@ -160,8 +160,8 @@ private void ProcessFunctionDeclaration(ICSharpFunctionDeclaration declaration) // Nothing to calculate if (declaration.Body == null) return; - var testingAttributes = FindTestingAttributes(declaration, TestAttributes); - if (testingAttributes.Count==0) return; + var testingAttributes = FindTestingAttributes(declaration, TestAttributes); + if (testingAttributes.Count == 0) return; CheckElementIsPublicAndCreateWarningIfNot(declaration, testingAttributes); CheckTestMethodHasCodeAndCreateWarningIfNot(declaration); @@ -169,13 +169,13 @@ private void ProcessFunctionDeclaration(ICSharpFunctionDeclaration declaration) public bool ProcessingIsFinished { - get { return _process.InterruptFlag; } + get { return _process.InterruptFlag; } } private bool CheckNamingOfTypeEndsWithTestSuffix(ICSharpTypeDeclaration declaration) { if (declaration.IsAbstract) return true; - + var declaredClassName = declaration.DeclaredName; if (!declaredClassName.StartsWith(Enumerable.ToArray(BDDPrefixes))) { @@ -191,7 +191,7 @@ private bool CheckNamingOfTypeEndsWithTestSuffix(ICSharpTypeDeclaration declarat } private bool CheckNamingOfFileAgainstTypeAndCreateWarningIfNot(ICSharpTypeDeclaration declaration) - { + { var declaredClassName = declaration.DeclaredName; if (declaredClassName.StartsWith(Enumerable.ToArray(BDDPrefixes))) return false; @@ -204,37 +204,37 @@ private bool CheckNamingOfFileAgainstTypeAndCreateWarningIfNot(ICSharpTypeDeclar var testClassNameFromFileName = currentFileName.Replace(".", ""); - + if (testClassNameFromFileName != declaredClassName) { - var testingWarning = new TestClassNameDoesNotMatchFileNameWarning( declaredClassName, testClassNameFromFileName, declaration); + var testingWarning = new TestClassNameDoesNotMatchFileNameWarning(declaredClassName, testClassNameFromFileName, declaration); AddHighlighting(declaration.GetNameDocumentRange(), testingWarning); return false; } return true; } - + private void CheckTestMethodHasCodeAndCreateWarningIfNot(ICSharpFunctionDeclaration declaration) { var statements = declaration.Body.Statements; - + if (!statements.Any()) { IHighlighting highlighting = new TestMethodMissingCodeWarning(declaration, "Test method is empty"); AddHighlighting(declaration.GetNameDocumentRange(), highlighting); - } + } } private void CheckElementIsPublicAndCreateWarningIfNot(IAccessRightsOwnerDeclaration declaration, IEnumerable testingAttributes) { AccessRights accessRights = declaration.GetAccessRights(); if (accessRights == AccessRights.PUBLIC) return; - + foreach (var attribute in testingAttributes) { - IHighlighting highlighting; - + IHighlighting highlighting; + if (declaration.DeclaredElement.IsClass()) { highlighting = new ClassShouldBePublicWarning(attribute.Name.QualifiedName, declaration); @@ -248,11 +248,11 @@ private void CheckElementIsPublicAndCreateWarningIfNot(IAccessRightsOwnerDeclara return; } } - + private void CheckClassnameInFileNameActuallyExistsAndCreateWarningIfNot(ICSharpTypeDeclaration thisDeclaration) - { + { if (thisDeclaration.IsAbstract) return; - + var currentFileName = CurrentSourceFile.GetLocation().NameWithoutExtension; var appropriateTestClassSuffixes = TestCopSettingsManager.Instance.Settings.GetAppropriateTestClassSuffixes(currentFileName); @@ -260,7 +260,7 @@ private void CheckClassnameInFileNameActuallyExistsAndCreateWarningIfNot(ICSharp foreach (var testClassSuffix in appropriateTestClassSuffixes) { var className = - currentFileName.Split(new[] {'.'}, 2)[0].RemoveTrailing(testClassSuffix); + currentFileName.Split(new[] { '.' }, 2)[0].RemoveTrailing(testClassSuffix); var declaredElements = ResharperHelper.FindClass(Solution, className); @@ -315,14 +315,14 @@ private void CheckClassnameInFileNameActuallyExistsAndCreateWarningIfNot(ICSharp } private void CheckClassNamespaceOfTestMatchesClassUnderTest(ICSharpTypeDeclaration thisDeclaration, List declaredElements) - { + { var thisProject = thisDeclaration.GetProject(); if (thisProject == null) return; var associatedProject = thisProject.GetAssociatedProjects(CurrentSourceFile.ToProjectFile()).FirstOrDefault(); if (associatedProject == null) return; - ResharperHelper.RemoveElementsNotInProjects(declaredElements,new []{associatedProject.Project}); + ResharperHelper.RemoveElementsNotInProjects(declaredElements, new[] { associatedProject.Project }); var thisProjectsDefaultNamespace = thisProject.GetDefaultNamespace(); if (string.IsNullOrEmpty(thisProjectsDefaultNamespace)) return; @@ -332,11 +332,11 @@ private void CheckClassNamespaceOfTestMatchesClassUnderTest(ICSharpTypeDeclarati //var nsToBeFoundShouldBe = associatedProject.Project.GetDefaultNamespace()+associatedProject.SubNamespace; var nsToBeFoundShouldBe = associatedProject.FullNamespace(); - + //Lookup the namespaces of the declaredElements we've found that possibly match this test IList foundNameSpaces = new List(); foreach (var declaredTestElement in declaredElements) - { + { var cls = declaredTestElement as TypeElement; if (cls == null) continue; var ns = cls.OwnerNamespaceDeclaration(); @@ -354,16 +354,16 @@ private void CheckClassNamespaceOfTestMatchesClassUnderTest(ICSharpTypeDeclarati { //TODO: Review this can be probably be replaced with associatedProject method calls var targetsubNameSpace = ns.Substring(associatedProjectsDefaultNameSpace.Length).TrimStart(new[] { '.' }); - string suggestedNameSpace = thisProjectsDefaultNamespace.AppendIfNotNull(".", targetsubNameSpace ); + string suggestedNameSpace = thisProjectsDefaultNamespace.AppendIfNotNull(".", targetsubNameSpace); var targetFolder = thisProject.Location.Combine(targetsubNameSpace.Replace(".", @"\")); - + var highlight = new TestFileNameSpaceWarning(CurrentSourceFile.ToProjectFile(), thisDeclaration, suggestedNameSpace , thisProject, targetFolder); - - AddHighlighting(thisDeclaration.GetNameDocumentRange(), highlight); + + AddHighlighting(thisDeclaration.GetNameDocumentRange(), highlight); } - } - } + } + } } } \ No newline at end of file diff --git a/Project/Src/TestCop.Plugin/app.config b/Project/Src/TestCop.Plugin/app.config index 1028c9d..5ed886f 100644 --- a/Project/Src/TestCop.Plugin/app.config +++ b/Project/Src/TestCop.Plugin/app.config @@ -4,15 +4,15 @@ - + - + - + @@ -32,7 +32,7 @@ - + @@ -46,6 +46,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Project/Src/TestCop.Plugin/packages.config b/Project/Src/TestCop.Plugin/packages.config index 5a450a1..69a3ee6 100644 --- a/Project/Src/TestCop.Plugin/packages.config +++ b/Project/Src/TestCop.Plugin/packages.config @@ -5,60 +5,65 @@ + + - + - + - - - - + + + + - - - - - - + + + + + + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + @@ -80,124 +85,129 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + + - + - - - - - - - - - + + + + + + + + + + + @@ -205,23 +215,30 @@ - + - - + + + + - + + + - - + + + + + - +