From c33b91895de5b56a47dfbe4048861baaf3299cfa Mon Sep 17 00:00:00 2001 From: Saul Rennison Date: Tue, 5 May 2020 20:10:40 +0100 Subject: [PATCH 1/3] Add FSharpTestCheckerService --- .../src/Checker/FSharpCheckerService.fs | 9 +- .../Module functions and values.fs | 6 +- .../Module functions and values.fs.gold | 6 +- .../Pattern - Record 02 - Nested.fs | 4 +- .../Pattern - Record 02 - Nested.gold | 20 +++- .../features/naming/AppExpr 03 - Partial.fs | 2 +- .../naming/AppExpr 03 - Partial.fs.gold | 2 +- .../naming/Pipe - Left 02 - Nested.fs | 2 +- .../naming/Pipe - Left 02 - Nested.fs.gold | 2 +- .../FSharp.Tests/Actions/TypingAssistTest.fs | 3 + .../test/src/FSharp.Tests/Common.fs | 92 ++++++++++++++++++- .../Daemon/ErrorsHighlightingTest.fs | 2 + .../FormatSpecifiersHighlightingTest.fs | 3 +- .../Daemon/InheritanceGutterMarksTest.fs | 5 +- .../Daemon/PipeChainTypeHintStageTest.fs | 5 +- .../Daemon/RedundantAttributeParensTest.fs | 2 + .../RedundantAttributeSuffixAnalyzerTest.fs | 3 +- .../Debugger/ExpressionEvaluationInfoTest.fs | 2 +- .../src/FSharp.Tests/FSharpCompletionTest.fs | 2 +- .../FSharp.Tests/FSharpOccurenceKindTest.fs | 18 ++-- .../FSharp.Tests/Intentions/InvertIfTest.fs | 3 +- .../FSharp.Tests/Parsing/FSharpParserTest.fs | 4 +- .../FSharp.Tests/QuickFixes/AddIgnoreTest.fs | 6 +- .../FSharp.Tests/QuickFixes/AddParensTest.fs | 1 + .../GenerateMissingRecordFieldsTest.fs | 1 + .../FSharp.Tests/QuickFixes/ImportTypeTest.fs | 1 + .../QuickFixes/RemoveInlineTest.fs | 1 + .../RemoveRedundantAttributeParensTest.fs | 1 + .../RemoveUnexpectedArgumentsTest.fs | 1 + .../ReplaceLetWithExpressionTest.fs | 2 + .../QuickFixes/ReplaceUseWithLetTest.fs | 2 +- .../QuickFixes/ReplaceWithWildPatTest.fs | 2 +- .../QuickFixes/ToAbstractFixTest.fs | 1 + .../FSharp.Tests/QuickFixes/ToMutableTest.fs | 1 + .../QuickFixes/ToRecursiveFunctionTest.fs | 1 + .../QuickFixes/ToRecursiveLetBindingsTest.fs | 1 + .../FSharp.Tests/QuickFixes/ToUpcastTest.fs | 2 +- .../FSharp.Tests/Refactotings/RenameTest.fs | 2 +- .../Service/FSharpCodeFormatterTest.fs | 6 +- .../FSharp.Tests/Service/FSharpNamingTest.fs | 2 +- 40 files changed, 182 insertions(+), 49 deletions(-) diff --git a/ReSharper.FSharp/src/FSharp.Common/src/Checker/FSharpCheckerService.fs b/ReSharper.FSharp/src/FSharp.Common/src/Checker/FSharpCheckerService.fs index aa99275328..dfb63a1ca2 100644 --- a/ReSharper.FSharp/src/FSharp.Common/src/Checker/FSharpCheckerService.fs +++ b/ReSharper.FSharp/src/FSharp.Common/src/Checker/FSharpCheckerService.fs @@ -58,7 +58,8 @@ type FSharpCheckerService member val OptionsProvider = Unchecked.defaultof with get, set member x.Checker = checker.Value - member x.ParseFile(path: FileSystemPath, document: IDocument, parsingOptions: FSharpParsingOptions) = + abstract ParseFile : path: FileSystemPath * document: IDocument * parsingOptions: FSharpParsingOptions -> FSharpParseFileResults option + default x.ParseFile(path: FileSystemPath, document: IDocument, parsingOptions: FSharpParsingOptions) = let source = SourceText.ofString (document.GetText()) try let parseResults = x.Checker.ParseFile(path.FullPath, source, parsingOptions).RunAsTask() @@ -74,8 +75,10 @@ type FSharpCheckerService let parsingOptions = x.OptionsProvider.GetParsingOptions(sourceFile) x.ParseFile(sourceFile.GetLocation(), sourceFile.Document, parsingOptions) - member x.ParseAndCheckFile([] file: IPsiSourceFile, opName, - [] allowStaleResults) = + abstract ParseAndCheckFile : [] file: IPsiSourceFile * opName: string * [] allowStaleResults: bool -> FSharpParseAndCheckResults option + + default x.ParseAndCheckFile([] file: IPsiSourceFile, opName, + [] allowStaleResults) = match x.OptionsProvider.GetProjectOptions(file) with | None -> None | Some options -> diff --git a/ReSharper.FSharp/test/data/features/daemon/inferredTypeCodeVision/Module functions and values.fs b/ReSharper.FSharp/test/data/features/daemon/inferredTypeCodeVision/Module functions and values.fs index 4d4b0cd500..c92ea042bd 100644 --- a/ReSharper.FSharp/test/data/features/daemon/inferredTypeCodeVision/Module functions and values.fs +++ b/ReSharper.FSharp/test/data/features/daemon/inferredTypeCodeVision/Module functions and values.fs @@ -4,6 +4,6 @@ let x = 1 let f x = x let g = fun x -> x + 1 let h f g x y = f x + g y -let f (x, y) z (a, b, c) = x + y + a + string b + c -let f (x, y) = x + y -let f (x, y) z = x + y + z +let i (x, y) z (a, b, c) = x + y + a + string b + c +let j (x, y) = x + y +let k (x, y) z = x + y + z diff --git a/ReSharper.FSharp/test/data/features/daemon/inferredTypeCodeVision/Module functions and values.fs.gold b/ReSharper.FSharp/test/data/features/daemon/inferredTypeCodeVision/Module functions and values.fs.gold index 8259e0e73a..cb294d8e36 100644 --- a/ReSharper.FSharp/test/data/features/daemon/inferredTypeCodeVision/Module functions and values.fs.gold +++ b/ReSharper.FSharp/test/data/features/daemon/inferredTypeCodeVision/Module functions and values.fs.gold @@ -4,9 +4,9 @@ let |x|(0) = 1 let |f|(1) x = x let |g|(2) = fun x -> x + 1 let |h|(3) f g x y = f x + g y -let |f|(4) (x, y) z (a, b, c) = x + y + a + string b + c -let |f|(5) (x, y) = x + y -let |f|(6) (x, y) z = x + y + z +let |i|(4) (x, y) z (a, b, c) = x + y + a + string b + c +let |j|(5) (x, y) = x + y +let |k|(6) (x, y) z = x + y + z --------------------------------------------------------- (0): CodeInsights: int diff --git a/ReSharper.FSharp/test/data/features/findUsages/occurenceKinds/Pattern - Record 02 - Nested.fs b/ReSharper.FSharp/test/data/features/findUsages/occurenceKinds/Pattern - Record 02 - Nested.fs index c66b099304..0771f0516b 100644 --- a/ReSharper.FSharp/test/data/features/findUsages/occurenceKinds/Pattern - Record 02 - Nested.fs +++ b/ReSharper.FSharp/test/data/features/findUsages/occurenceKinds/Pattern - Record 02 - Nested.fs @@ -1 +1,3 @@ -let { Foo = { Bar.Baz = 1 } } = () +type Bar = { Baz : int } +type Record = { Foo : Bar } +let { Foo = { Bar.Baz = 1 } } = failwith "" diff --git a/ReSharper.FSharp/test/data/features/findUsages/occurenceKinds/Pattern - Record 02 - Nested.gold b/ReSharper.FSharp/test/data/features/findUsages/occurenceKinds/Pattern - Record 02 - Nested.gold index 6a35c45668..401084038b 100644 --- a/ReSharper.FSharp/test/data/features/findUsages/occurenceKinds/Pattern - Record 02 - Nested.gold +++ b/ReSharper.FSharp/test/data/features/findUsages/occurenceKinds/Pattern - Record 02 - Nested.gold @@ -1,11 +1,23 @@ -Pattern +Field declaration --- -TO: [O] let { |Foo| = { Bar.Baz = 1 } } = () RANGE: (6,9) @ Pattern - Record 02 - Nested.fs -TO: [O] let { Foo = { Bar.|Baz| = 1 } } = () RANGE: (18,21) @ Pattern - Record 02 - Nested.fs +TO: [O] type Bar = { Baz : |int| } RANGE: (19,22) @ Pattern - Record 02 - Nested.fs +TO: [O] type Record = { Foo : |Bar| } RANGE: (48,51) @ Pattern - Record 02 - Nested.fs + + +Pattern, Read access +--- +TO: [R] let { |Foo| = { Bar.Baz = 1 } } = failwith "" RANGE: (61,64) @ Pattern - Record 02 - Nested.fs +TO: [R] let { Foo = { Bar.|Baz| = 1 } } = failwith "" RANGE: (73,76) @ Pattern - Record 02 - Nested.fs Other --- -TO: [O] let { Foo = { |Bar|.Baz = 1 } } = () RANGE: (14,17) @ Pattern - Record 02 - Nested.fs +TO: [O] let { Foo = { |Bar|.Baz = 1 } } = failwith "" RANGE: (69,72) @ Pattern - Record 02 - Nested.fs +TO: [O] let { Foo = { Bar.Baz = 1 } } = |failwith| "" RANGE: (87,95) @ Pattern - Record 02 - Nested.fs + + +New instance creation +--- +TO: [O] let { Foo = { Bar.Baz = 1 } } = |failwith| "" RANGE: (87,95) @ Pattern - Record 02 - Nested.fs diff --git a/ReSharper.FSharp/test/data/features/naming/AppExpr 03 - Partial.fs b/ReSharper.FSharp/test/data/features/naming/AppExpr 03 - Partial.fs index 45035cca18..193ad0ed78 100644 --- a/ReSharper.FSharp/test/data/features/naming/AppExpr 03 - Partial.fs +++ b/ReSharper.FSharp/test/data/features/naming/AppExpr 03 - Partial.fs @@ -1,4 +1,4 @@ module Module -let getName _ _ = "" +let getName _ (_: int) = "" let x{caret} = getName () diff --git a/ReSharper.FSharp/test/data/features/naming/AppExpr 03 - Partial.fs.gold b/ReSharper.FSharp/test/data/features/naming/AppExpr 03 - Partial.fs.gold index b25d27bfe2..28cb8931bf 100644 --- a/ReSharper.FSharp/test/data/features/naming/AppExpr 03 - Partial.fs.gold +++ b/ReSharper.FSharp/test/data/features/naming/AppExpr 03 - Partial.fs.gold @@ -1,3 +1,3 @@ name -objectFunc +int32Func func diff --git a/ReSharper.FSharp/test/data/features/naming/Pipe - Left 02 - Nested.fs b/ReSharper.FSharp/test/data/features/naming/Pipe - Left 02 - Nested.fs index 7b43a1749c..5f46246161 100644 --- a/ReSharper.FSharp/test/data/features/naming/Pipe - Left 02 - Nested.fs +++ b/ReSharper.FSharp/test/data/features/naming/Pipe - Left 02 - Nested.fs @@ -1,5 +1,5 @@ module Module -let getName _ = () +let getName _ _ = () let foo _ = () let x{caret} = getName <| foo <| 1 diff --git a/ReSharper.FSharp/test/data/features/naming/Pipe - Left 02 - Nested.fs.gold b/ReSharper.FSharp/test/data/features/naming/Pipe - Left 02 - Nested.fs.gold index 534bfcb266..0e45a4ad4c 100644 --- a/ReSharper.FSharp/test/data/features/naming/Pipe - Left 02 - Nested.fs.gold +++ b/ReSharper.FSharp/test/data/features/naming/Pipe - Left 02 - Nested.fs.gold @@ -1,2 +1,2 @@ name -o +unit diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/Actions/TypingAssistTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/Actions/TypingAssistTest.fs index 9fdc9c43a0..ba750f8996 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/Actions/TypingAssistTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/Actions/TypingAssistTest.fs @@ -7,6 +7,7 @@ open JetBrains.ReSharper.FeaturesTestFramework.TypingAssist open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.TypingAssist open JetBrains.ReSharper.Plugins.FSharp.Services.Formatter open JetBrains.ReSharper.Plugins.FSharp.Tests +open JetBrains.ReSharper.Plugins.FSharp.Tests.Common open JetBrains.ReSharper.Plugins.FSharp.Util open JetBrains.ReSharper.Psi.CachingLexers open JetBrains.ReSharper.TestFramework @@ -14,6 +15,7 @@ open JetBrains.TextControl open NUnit.Framework [)>] +[] type FSharpTypingAssistTest() = inherit TypingAssistTestBase() @@ -291,6 +293,7 @@ type LineIndentsTest() = writer.WriteLine(getLineIndent x.CachingLexerService textControl line) [] +[] type NestedIndentsTest() = inherit LineIndentsTestBase() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/Common.fs b/ReSharper.FSharp/test/src/FSharp.Tests/Common.fs index c1dafc489c..b843247b86 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/Common.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/Common.fs @@ -2,18 +2,23 @@ module JetBrains.ReSharper.Plugins.FSharp.Tests.Common open System +open System.Collections.Concurrent +open System.Reflection +open System.Runtime.InteropServices open System.Threading open FSharp.Compiler.SourceCodeServices +open JetBrains.Annotations +open JetBrains.Application open JetBrains.Application.Components open JetBrains.Application.platforms open JetBrains.DataFlow +open JetBrains.DocumentModel open JetBrains.Lifetimes open JetBrains.ProjectModel open JetBrains.ProjectModel.MSBuild open JetBrains.ProjectModel.Properties.Managed open JetBrains.ReSharper.Plugins.FSharp open JetBrains.ReSharper.Plugins.FSharp.Checker -open JetBrains.ReSharper.Plugins.FSharp.Checker.ProjectOptions open JetBrains.ReSharper.Plugins.FSharp.ProjectModel.ProjectProperties open JetBrains.ReSharper.Psi open JetBrains.ReSharper.TestFramework @@ -22,6 +27,7 @@ open JetBrains.Util.Dotnet.TargetFrameworkIds open Moq open NUnit.Framework +[] [] do() @@ -53,6 +59,90 @@ type FSharpScriptTestAttribute() = inherit FSharpTestAttribute(FSharpScriptProjectFileType.FsxExtension) +[] +type ExpectErrors ([] errorCodes: int[]) = + inherit Attribute() + + new () = ExpectErrors [||] + + member __.ErrorCodes = errorCodes + + +[] +type FSharpTestCheckerService(lifetime, logger, onSolutionCloseNotifier, settingsStore, settingsSchema) = + inherit FSharpCheckerService(lifetime, logger, onSolutionCloseNotifier, settingsStore, settingsSchema) + + let baseExpectedCodes = + set [ + 222 // FS0222: Files in libraries or multiple-file applications must begin with a namespace or module + ] + + let expectedErrorCodeCache = ConcurrentDictionary() + + let getExpectedErrorCodes () = + expectedErrorCodeCache.GetOrAdd(TestContext.CurrentContext.Test.FullName, fun _ -> + let assembly = Assembly.GetExecutingAssembly() + let typ = assembly.GetType(TestContext.CurrentContext.Test.ClassName, true) + let testMethod = typ.GetMethod(TestContext.CurrentContext.Test.MethodName) + + testMethod.GetCustomAttributes() + |> Seq.tryExactlyOne + |> Option.orElseWith (fun () -> typ.GetCustomAttributes() |> Seq.tryExactlyOne) + |> Option.map (fun attr -> attr.ErrorCodes)) + + let validateErrors (errors: FSharpErrorInfo[]) = + match getExpectedErrorCodes() with + | Some [||] -> + // All errors are expected + () + | extraExpectedCodes -> + + let expectedErrorCodes = + baseExpectedCodes + |> Set.union (Set.ofArray (defaultArg extraExpectedCodes [||])) + + let unexpectedErrors = + errors + |> Array.filter (fun err -> + err.Severity = FSharpErrorSeverity.Error && + not (expectedErrorCodes |> Set.contains err.ErrorNumber)) + + if unexpectedErrors.Length = 0 then () else + + unexpectedErrors + |> Array.map (fun err -> + sprintf + "(%d,%d)-(%d,%d): %s %d: %s" + err.Range.StartLine err.Range.StartColumn + err.Range.EndLine err.Range.EndColumn + err.Subcategory err.ErrorNumber + err.Message) + |> String.concat "\n" + |> sprintf "Unexpected compile errors:\n%s\n" + |> Assert.Fail + + interface IHideImplementation + + override x.ParseFile(path: FileSystemPath, document: IDocument, parsingOptions: FSharpParsingOptions) = + let results = base.ParseFile(path, document, parsingOptions) + + match results with + | None -> failwithf "ParseFile failed unexpectedly" + | Some results -> validateErrors results.Errors + + results + + override x.ParseAndCheckFile([] file: IPsiSourceFile, opName, + [] allowStaleResults) = + let results = base.ParseAndCheckFile(file, opName, allowStaleResults) + + match results with + | None -> failwithf "ParseAndCheckFile failed unexpectedly" + | Some results -> validateErrors results.CheckResults.Errors + + results + + [] type FSharpTestProjectOptionsBuilder(checkerService, logger) = inherit FSharpProjectOptionsBuilder(checkerService, logger, Mock<_>().Object) diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/ErrorsHighlightingTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/ErrorsHighlightingTest.fs index d0a34aad40..9693a478fe 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/ErrorsHighlightingTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/ErrorsHighlightingTest.fs @@ -1,9 +1,11 @@ namespace JetBrains.ReSharper.Plugins.FSharp.Tests.Features.Daemon open JetBrains.ReSharper.Plugins.FSharp +open JetBrains.ReSharper.Plugins.FSharp.Tests.Common open JetBrains.ReSharper.TestFramework open NUnit.Framework +[] type ErrorsHighlightingTest() = inherit FSharpHighlightingTestBase() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/FormatSpecifiersHighlightingTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/FormatSpecifiersHighlightingTest.fs index 2895b10dc8..b6df343e1b 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/FormatSpecifiersHighlightingTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/FormatSpecifiersHighlightingTest.fs @@ -1,6 +1,7 @@ namespace JetBrains.ReSharper.Plugins.FSharp.Tests.Features.Daemon open JetBrains.ReSharper.Daemon.Impl +open JetBrains.ReSharper.Plugins.FSharp.Tests.Common open NUnit.Framework type FormatSpecifiersHighlightingTest() = @@ -16,7 +17,7 @@ type FormatSpecifiersHighlightingTest() = [] member x.``Escaped strings``() = x.DoNamedTest() [] member x.``Triple quoted strings``() = x.DoNamedTest() [] member x.``Multi line strings``() = x.DoNamedTest() - [] member x.``Malformed formatters``() = x.DoNamedTest() + [] member x.``Malformed formatters``() = x.DoNamedTest() [] member x.``kprintf bprintf fprintf``() = x.DoNamedTest() [] member x.``Plane strings``() = x.DoNamedTest() [] member x.``Extensions``() = x.DoNamedTest() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/InheritanceGutterMarksTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/InheritanceGutterMarksTest.fs index 07c91e1bf1..5a241d39aa 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/InheritanceGutterMarksTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/InheritanceGutterMarksTest.fs @@ -1,6 +1,7 @@ namespace JetBrains.ReSharper.Plugins.FSharp.Tests.Features.Daemon open JetBrains.ReSharper.Feature.Services.Daemon +open JetBrains.ReSharper.Plugins.FSharp.Tests.Common open NUnit.Framework type InheritanceGutterMarks() = @@ -13,5 +14,5 @@ type InheritanceGutterMarks() = [] member x.``Inherited gutter mark``() = x.DoNamedTest() - [] member x.``Module 01``() = x.DoNamedTest() - [] member x.``Struct 01``() = x.DoNamedTest() + [] member x.``Module 01``() = x.DoNamedTest() + [] member x.``Struct 01``() = x.DoNamedTest() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/PipeChainTypeHintStageTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/PipeChainTypeHintStageTest.fs index b8fccc015f..9de3b30e42 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/PipeChainTypeHintStageTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/PipeChainTypeHintStageTest.fs @@ -3,6 +3,7 @@ open JetBrains.ReSharper.FeaturesTestFramework.Daemon open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Daemon.Highlightings open JetBrains.ReSharper.Plugins.FSharp.Settings +open JetBrains.ReSharper.Plugins.FSharp.Tests.Common open JetBrains.ReSharper.TestFramework open NUnit.Framework @@ -27,8 +28,8 @@ type PipeChainTypeHintStageTest() = [] [] member x.``Multi line 03 - Same line``() = x.DoNamedTest() - [] member x.``Error 01 - Invalid reference``() = x.DoNamedTest() - [] member x.``Error 02 - Syntax error``() = x.DoNamedTest() + [] member x.``Error 01 - Invalid reference``() = x.DoNamedTest() + [] member x.``Error 02 - Syntax error``() = x.DoNamedTest() [] member x.``Skipped 01 - Other binary op``() = x.DoNamedTest() [] member x.``Skipped 02 - Shadowed pipe op``() = x.DoNamedTest() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/RedundantAttributeParensTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/RedundantAttributeParensTest.fs index 1b4d403729..ef5b9c1de0 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/RedundantAttributeParensTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/RedundantAttributeParensTest.fs @@ -1,9 +1,11 @@ namespace JetBrains.ReSharper.Plugins.FSharp.Tests.Features.Daemon open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Daemon.Highlightings +open JetBrains.ReSharper.Plugins.FSharp.Tests.Common open JetBrains.ReSharper.Plugins.FSharp.Tests.Features.Daemon open NUnit.Framework +[] type RedundantAttributeParensTest() = inherit FSharpHighlightingTestBase() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/RedundantAttributeSuffixAnalyzerTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/RedundantAttributeSuffixAnalyzerTest.fs index 65ca867c1c..d6743bee14 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/RedundantAttributeSuffixAnalyzerTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/Daemon/RedundantAttributeSuffixAnalyzerTest.fs @@ -1,6 +1,7 @@ namespace JetBrains.ReSharper.Plugins.FSharp.Tests.Features.Daemon open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Daemon.Highlightings +open JetBrains.ReSharper.Plugins.FSharp.Tests.Common open JetBrains.ReSharper.Plugins.FSharp.Tests.Features.Daemon open NUnit.Framework @@ -16,4 +17,4 @@ type RedundantAttributeAnalyzerTest() = [] member x.``Single attribute 02 - Needed suffix``() = x.DoNamedTest() [] member x.``Single attribute 03 - With constructor``() = x.DoNamedTest() [] member x.``Single attribute 04 - With target``() = x.DoNamedTest() - [] member x.``Single attribute 05 - Name is just Attribute``() = x.DoNamedTest() + [] member x.``Single attribute 05 - Name is just Attribute``() = x.DoNamedTest() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/Debugger/ExpressionEvaluationInfoTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/Debugger/ExpressionEvaluationInfoTest.fs index 7f600b7558..33ec2ef4a9 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/Debugger/ExpressionEvaluationInfoTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/Debugger/ExpressionEvaluationInfoTest.fs @@ -22,7 +22,7 @@ type ExpressionEvaluationInfoTest() = writer.WriteLine(textToEvaluate)) |> ignore [] member x.``Id 01``() = x.DoNamedTest() - [] member x.``Id 02 - Qualifier``() = x.DoNamedTest() + [] member x.``Id 02 - Qualifier``() = x.DoNamedTest() [] member x.``SelfId 01 - Member``() = x.DoNamedTest() [] member x.``SelfId 02 - Type``() = x.DoNamedTest() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/FSharpCompletionTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/FSharpCompletionTest.fs index ceba7dfe8e..9f847856ba 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/FSharpCompletionTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/FSharpCompletionTest.fs @@ -6,7 +6,7 @@ open JetBrains.ReSharper.Plugins.FSharp.Tests.Common open JetBrains.ReSharper.TestFramework open NUnit.Framework -[] +[] type FSharpCompletionTest() = inherit CodeCompletionTestBase() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/FSharpOccurenceKindTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/FSharpOccurenceKindTest.fs index b556654958..810ef0f4f6 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/FSharpOccurenceKindTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/FSharpOccurenceKindTest.fs @@ -20,10 +20,10 @@ type FSharpOccurenceKindTest() = [] member x.``Unions 02 - Single empty case``() = x.DoNamedTest() [] member x.``Exception - Singleton 01``() = x.DoNamedTest() - [] member x.``Exception - Singleton 02 - Type specification``() = x.DoNamedTest() + [] member x.``Exception - Singleton 02 - Type specification``() = x.DoNamedTest() [] member x.``Exception - Singleton 03 - Members``() = x.DoNamedTest() [] member x.``Exception - Fields 01``() = x.DoNamedTest() - [] member x.``Exception - Fields 02 - Type specification``() = x.DoNamedTest() + [] member x.``Exception - Fields 02 - Type specification``() = x.DoNamedTest() [] member x.``Exception - Fields 03 - Members``() = x.DoNamedTest() [] member x.``Base Type 01``() = x.DoNamedTest() @@ -35,19 +35,19 @@ type FSharpOccurenceKindTest() = [] member x.``Base Type - Object expressions 02 - Interface``() = x.DoNamedTest() [] member x.``Base Type - Object expressions 03 - Secondary interfaces``() = x.DoNamedTest() - [] member x.``Type Argument 01``() = x.DoNamedTest() - [] member x.``Type Argument 02 - Pattern``() = x.DoNamedTest() - [] member x.``Type Argument 03 - Tuple``() = x.DoNamedTest() + [] member x.``Type Argument 01``() = x.DoNamedTest() + [] member x.``Type Argument 02 - Pattern``() = x.DoNamedTest() + [] member x.``Type Argument 03 - Tuple``() = x.DoNamedTest() [] member x.``Type Argument 04 - Array``() = x.DoNamedTest() - [] member x.``Type Argument 05 - Return type``() = x.DoNamedTest() - [] member x.``Type Argument 06 - ML``() = x.DoNamedTest() + [] member x.``Type Argument 05 - Return type``() = x.DoNamedTest() + [] member x.``Type Argument 06 - ML``() = x.DoNamedTest() [] member x.``Type Argument 07 - Tuple abbreviation``() = x.DoNamedTest() [] member x.``Type Cast 01 - Upcast``() = x.DoNamedTest() [] member x.``Type Cast 02 - Downcast``() = x.DoNamedTest() - [] member x.``Type Test 01 - Expr``() = x.DoNamedTest() - [] member x.``Type Test 02 - Pattern``() = x.DoNamedTest() + [] member x.``Type Test 01 - Expr``() = x.DoNamedTest() + [] member x.``Type Test 02 - Pattern``() = x.DoNamedTest() [] member x.``Type abbreviation 01``() = x.DoNamedTest() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/Intentions/InvertIfTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/Intentions/InvertIfTest.fs index a9551b3060..9ef6cf3c5b 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/Intentions/InvertIfTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/Intentions/InvertIfTest.fs @@ -1,6 +1,7 @@ namespace JetBrains.ReSharper.Plugins.FSharp.Tests.Features open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Intentions +open JetBrains.ReSharper.Plugins.FSharp.Tests.Common open JetBrains.ReSharper.TestFramework open NUnit.Framework @@ -37,7 +38,7 @@ type InvertIfTest() = [] member x.``Single line expressions 01``() = x.DoNamedTest() [] member x.``Single line expressions 02 - App``() = x.DoNamedTest() [] member x.``Single line expressions 03 - Typed``() = x.DoNamedTest() - [] member x.``Single line expressions 04 - Typed``() = x.DoNamedTest() + [] member x.``Single line expressions 04 - Typed``() = x.DoNamedTest() [] member x.``Single line expressions 05 - Lazy``() = x.DoNamedTest() [] member x.``Deindent - Single line expressions 01``() = x.DoNamedTest() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/Parsing/FSharpParserTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/Parsing/FSharpParserTest.fs index d2fb8ebbfa..c9bf5193fd 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/Parsing/FSharpParserTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/Parsing/FSharpParserTest.fs @@ -208,6 +208,7 @@ type FSharpParserTest() = [] member x.``Expr - ObjExpr 01``() = x.DoNamedTest() [] member x.``Expr - ObjExpr 02 - Interface``() = x.DoNamedTest() + // todo: (4,0)-(4,1): parse 10: Unexpected symbol '}' in expression [] member x.``Expr - ImplicitZero 01``() = x.DoNamedTest() [] member x.``Expr - LetOrUseBang 01``() = x.DoNamedTest() @@ -303,7 +304,7 @@ type FSharpParserTest() = [] member x.``Module member - Open 01``() = x.DoNamedTest() [] member x.``Module member - Open 02 - Qualifier``() = x.DoNamedTest() - [] member x.``Pattern - Record 01``() = x.DoNamedTest() + [] member x.``Pattern - Record 01``() = x.DoNamedTest() [] member x.``Pattern - Record 02 - Qualified name``() = x.DoNamedTest() [] member x.``Pattern - As - Wild 01``() = x.DoNamedTest() @@ -341,6 +342,7 @@ type FSharpSignatureParserTest() = [] +[] type FSharpErrorsParserTest() = inherit ParserTestBase() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/AddIgnoreTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/AddIgnoreTest.fs index 8d70bc6bc3..792a728925 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/AddIgnoreTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/AddIgnoreTest.fs @@ -36,12 +36,12 @@ type AddIgnoreTest() = [] member x.``New line - Match 02``() = x.DoNamedTest() [] member x.``New line - Match 03 - Single line``() = x.DoNamedTest() - [] member x.``Inner expression - If 01``() = x.DoNamedTest() + [] member x.``Inner expression - If 01``() = x.DoNamedTest() [] member x.``Inner expression - Match 01``() = x.DoNamedTest() - [] member x.``Inner expression - Try 01 - With``() = x.DoNamedTest() + [] member x.``Inner expression - Try 01 - With``() = x.DoNamedTest() [] member x.``Inner expression - Try 02 - Finally``() = x.DoNamedTest() - [] member x.``Missing else branch 01``() = x.DoNamedTest() + [] member x.``Missing else branch 01``() = x.DoNamedTest() override x.DoTestOnTextControlAndExecuteWithGold(project, textControl, projectFile) = let occurrenceName = QuickFixTestBase.GetSetting(textControl, OccurrenceName) diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/AddParensTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/AddParensTest.fs index b3ca492bce..47e82dcbfd 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/AddParensTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/AddParensTest.fs @@ -6,6 +6,7 @@ open JetBrains.ReSharper.Plugins.FSharp.Tests.Common open NUnit.Framework [] +[] type AddParensTest() = inherit QuickFixTestBase() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/GenerateMissingRecordFieldsTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/GenerateMissingRecordFieldsTest.fs index d7eed9e168..69e26b014f 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/GenerateMissingRecordFieldsTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/GenerateMissingRecordFieldsTest.fs @@ -6,6 +6,7 @@ open JetBrains.ReSharper.Plugins.FSharp.Tests.Common open NUnit.Framework [] +[] type GenerateMissingRecordFieldsTest() = inherit QuickFixTestBase() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ImportTypeTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ImportTypeTest.fs index 890cd85502..307daf0ee0 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ImportTypeTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ImportTypeTest.fs @@ -7,6 +7,7 @@ open JetBrains.ReSharper.TestFramework open NUnit.Framework [] +[] type ImportTypeTest() = inherit QuickFixTestBase() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/RemoveInlineTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/RemoveInlineTest.fs index 25606a8af4..101abec583 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/RemoveInlineTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/RemoveInlineTest.fs @@ -6,6 +6,7 @@ open JetBrains.ReSharper.Plugins.FSharp.Tests.Common open NUnit.Framework [] +[] type RemoveInlineTest() = inherit QuickFixTestBase() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/RemoveRedundantAttributeParensTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/RemoveRedundantAttributeParensTest.fs index 226fd42c80..c6be18e4f0 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/RemoveRedundantAttributeParensTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/RemoveRedundantAttributeParensTest.fs @@ -6,6 +6,7 @@ open JetBrains.ReSharper.Plugins.FSharp.Tests.Common open NUnit.Framework [] +[] type RemoveRedundantAttributeParensTest() = inherit QuickFixTestBase() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/RemoveUnexpectedArgumentsTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/RemoveUnexpectedArgumentsTest.fs index 11bb7b0a5e..2925797e41 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/RemoveUnexpectedArgumentsTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/RemoveUnexpectedArgumentsTest.fs @@ -6,6 +6,7 @@ open JetBrains.ReSharper.Plugins.FSharp.Tests.Common open NUnit.Framework [] +[] type RemoveUnexpectedArgumentsTest() = inherit QuickFixTestBase() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ReplaceLetWithExpressionTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ReplaceLetWithExpressionTest.fs index e501da6a1d..198735b152 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ReplaceLetWithExpressionTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ReplaceLetWithExpressionTest.fs @@ -6,6 +6,7 @@ open JetBrains.ReSharper.Plugins.FSharp.Tests.Common open NUnit.Framework [] +[] type ReplaceLetWithExpressionTest() = inherit QuickFixTestBase() @@ -21,6 +22,7 @@ type ReplaceLetWithExpressionTest() = [] +[] type ReplaceLetWithExpressionAvailabilityTest() = inherit QuickFixAvailabilityTestBase() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ReplaceUseWithLetTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ReplaceUseWithLetTest.fs index 83ef439e2b..e7407f0d34 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ReplaceUseWithLetTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ReplaceUseWithLetTest.fs @@ -12,4 +12,4 @@ type ReplaceUseWithLet() = override x.RelativeTestDataPath = "features/quickFixes/replaceUseWithLet" [] member x.``Module 01``() = x.DoNamedTest() - [] member x.``Type let binding 01``() = x.DoNamedTest() + [] member x.``Type let binding 01``() = x.DoNamedTest() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ReplaceWithWildPatTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ReplaceWithWildPatTest.fs index cdf63725d2..046493c1b6 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ReplaceWithWildPatTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ReplaceWithWildPatTest.fs @@ -19,7 +19,7 @@ type ReplaceWithWildPatTest() = [] member x.``Param - Method 01``() = x.DoNamedTest() [] member x.``Match clause pat 01``() = x.DoNamedTest() - [] member x.``Pattern 01``() = x.DoNamedTest() + [] member x.``Pattern 01``() = x.DoNamedTest() [] type ReplaceWithWildPatAvailabilityTest() = diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ToAbstractFixTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ToAbstractFixTest.fs index 0fa7993e5e..26352ad1da 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ToAbstractFixTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ToAbstractFixTest.fs @@ -7,6 +7,7 @@ open JetBrains.ReSharper.TestFramework open NUnit.Framework [] +[] type ToAbstractFixTest() = inherit QuickFixTestBase() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ToMutableTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ToMutableTest.fs index 0f3dc09a9a..a17264cd05 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ToMutableTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ToMutableTest.fs @@ -9,6 +9,7 @@ open NUnit.Framework // todo: add test with signature files [] +[] type ToMutableFixTest() = inherit QuickFixTestBase() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ToRecursiveFunctionTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ToRecursiveFunctionTest.fs index 566a2b64dd..88d84fe9e5 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ToRecursiveFunctionTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ToRecursiveFunctionTest.fs @@ -6,6 +6,7 @@ open JetBrains.ReSharper.Plugins.FSharp.Tests.Common open NUnit.Framework [] +[] type ToRecursiveFunctionTest() = inherit QuickFixTestBase() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ToRecursiveLetBindingsTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ToRecursiveLetBindingsTest.fs index 23e0e37d71..ab9e13a5e9 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ToRecursiveLetBindingsTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ToRecursiveLetBindingsTest.fs @@ -6,6 +6,7 @@ open JetBrains.ReSharper.Plugins.FSharp.Tests.Common open NUnit.Framework [] +[] type ToRecursiveLetBindingsTest() = inherit QuickFixTestBase() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ToUpcastTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ToUpcastTest.fs index c8285c2ab0..2a05bf7307 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ToUpcastTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ToUpcastTest.fs @@ -11,4 +11,4 @@ type ToUpcastTest() = override x.RelativeTestDataPath = "features/quickFixes/toUpcast" - [] member x.``Simple 01``() = x.DoNamedTest() + [] member x.``Simple 01``() = x.DoNamedTest() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/Refactotings/RenameTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/Refactotings/RenameTest.fs index c553cb964b..aafd38117b 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/Refactotings/RenameTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/Refactotings/RenameTest.fs @@ -175,4 +175,4 @@ type FSharpRenameTest() = [] member x.``Anon record 01``() = x.DoNamedTest() [] member x.``Anon record 02 - Invalid name``() = x.DoNamedTest() - [] member x.``Error - If 01``() = x.DoNamedTest() + [] member x.``Error - If 01``() = x.DoNamedTest() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/Service/FSharpCodeFormatterTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/Service/FSharpCodeFormatterTest.fs index bd05851116..b8a98ba40a 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/Service/FSharpCodeFormatterTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/Service/FSharpCodeFormatterTest.fs @@ -22,9 +22,9 @@ type FSharpCodeFormatterTest() = [] member x.``Top binding indent 02 - Correct indent``() = x.DoNamedTest() [] member x.``Top binding indent 03 - Big indent``() = x.DoNamedTest() - [] member x.``Local binding indent 01 - No indent``() = x.DoNamedTest() - [] member x.``Local binding indent 02 - Correct indent``() = x.DoNamedTest() - [] member x.``Local binding indent 03 - Big indent``() = x.DoNamedTest() + [] member x.``Local binding indent 01 - No indent``() = x.DoNamedTest() + [] member x.``Local binding indent 02 - Correct indent``() = x.DoNamedTest() + [] member x.``Local binding indent 03 - Big indent``() = x.DoNamedTest() [] member x.``Let module decl binding indent 01 - Correct indent``() = x.DoNamedTest() [] member x.``Let expr binding indent 01 - Correct indent``() = x.DoNamedTest() diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/Service/FSharpNamingTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/Service/FSharpNamingTest.fs index b620580e2e..62fdd60279 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/Service/FSharpNamingTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/Service/FSharpNamingTest.fs @@ -37,7 +37,7 @@ type FSharpNamingTest() = [] member x.``Type 01``() = x.DoNamedTest() [] member x.``AppExpr 01``() = x.DoNamedTest() - [] member x.``AppExpr 02 - More args``() = x.DoNamedTest() + [] member x.``AppExpr 02 - More args``() = x.DoNamedTest() [] member x.``AppExpr 03 - Partial``() = x.DoNamedTest() [] member x.``Pipe - Right 01``() = x.DoNamedTest() From 3269aa32933520c400773fcb6f6b8f2734a365fc Mon Sep 17 00:00:00 2001 From: Saul Rennison Date: Tue, 5 May 2020 20:12:03 +0100 Subject: [PATCH 2/3] Revert parallelism --- ReSharper.FSharp/test/src/FSharp.Tests/Common.fs | 1 - 1 file changed, 1 deletion(-) diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/Common.fs b/ReSharper.FSharp/test/src/FSharp.Tests/Common.fs index b843247b86..6d4e271136 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/Common.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/Common.fs @@ -27,7 +27,6 @@ open JetBrains.Util.Dotnet.TargetFrameworkIds open Moq open NUnit.Framework -[] [] do() From 54250b731d7bf6ec42caeb3d1dbcf69b83bfdddd Mon Sep 17 00:00:00 2001 From: Saul Rennison Date: Sat, 9 May 2020 14:26:54 +0100 Subject: [PATCH 3/3] Fix test compile errors --- .../test/src/FSharp.Tests/Service/FSharpElementFactoryTest.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/Service/FSharpElementFactoryTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/Service/FSharpElementFactoryTest.fs index 922cfd31b4..1022ab1772 100644 --- a/ReSharper.FSharp/test/src/FSharp.Tests/Service/FSharpElementFactoryTest.fs +++ b/ReSharper.FSharp/test/src/FSharp.Tests/Service/FSharpElementFactoryTest.fs @@ -22,7 +22,7 @@ type FSharpElementFactoryTest() = member x.DoTest(action: IFSharpElementFactory -> unit) = testAction <- action - x.DoTestSolution() + x.DoTestSolution Array.empty override x.DoTest(_, project: IProject) = let psiModule = project.GetPsiModules().Single()