From a3b7800199af91876e0e7a4ab151f9de77944338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Cie=C5=9Blak?= Date: Sat, 20 Aug 2016 00:24:29 +0200 Subject: [PATCH 1/6] Update deps --- paket.dependencies | 3 +- paket.lock | 63 ++++----- .../FsAutoComplete.Core.fsproj | 53 +++----- src/FsAutoComplete.Suave/App.config | 32 ++--- .../FsAutoComplete.Suave.fsproj | 122 +++--------------- src/FsAutoComplete/FsAutoComplete.fsproj | 66 +++------- .../FsAutoComplete.Tests.fsproj | 49 ++----- 7 files changed, 121 insertions(+), 267 deletions(-) diff --git a/paket.dependencies b/paket.dependencies index 6a17aeb84..34804001b 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,3 +1,4 @@ +framework: net45 source https://www.nuget.org/api/v2/ nuget FSharp.Compiler.Service framework: >= net45 @@ -6,7 +7,7 @@ nuget Mono.Cecil nuget NDesk.Options nuget Newtonsoft.Json nuget FAKE -nuget NUnit +nuget NUnit nuget NUnit.Runners nuget Octokit nuget Suave diff --git a/paket.lock b/paket.lock index 105b7bb7e..ac00c76a2 100644 --- a/paket.lock +++ b/paket.lock @@ -1,36 +1,37 @@ +FRAMEWORK: NET45 NUGET remote: https://www.nuget.org/api/v2 - FAKE (4.29) + FAKE (4.37.2) FParsec (1.0.2) - FSharp.Compiler.Service (3.0) - FSharp.Compiler.Service.ProjectCracker (3.0) - FSharp.Core (4.0.0.1) - FSharpLint.Core (0.3.0-beta) - FParsec - FSharp.Compiler.Service - FSharp.Compiler.Service.ProjectCracker - Microsoft.Bcl (1.1.10) - framework: net10, net11, net20, net30, net35, net40, net40-full - Microsoft.Bcl.Build (>= 1.0.14) - Microsoft.Bcl.Build (1.0.21) - import_targets: false, framework: net10, net11, net20, net30, net35, net40, net40-full - Microsoft.Net.Http (2.2.29) - framework: net10, net11, net20, net30, net35, net40, net40-full - Microsoft.Bcl (>= 1.1.10) - Microsoft.Bcl.Build (>= 1.0.14) - Mono.Cecil (0.9.6.1) + FSharp.Compiler.Service (6.0.2) - framework: >= net45 + System.Collections.Immutable (>= 1.2) + System.Reflection.Metadata (>= 1.4.1-beta-24227-04) + FSharp.Compiler.Service.ProjectCracker (6.0.2) + FSharp.Core (4.0.0.1) - redirects: on + FSharpLint.Core (0.4.4) + FParsec (>= 1.0.2) + FSharp.Compiler.Service (>= 6.0) + FSharp.Compiler.Service.ProjectCracker (>= 6.0) + Mono.Cecil (0.9.6.4) NDesk.Options (0.2.1) - Newtonsoft.Json (8.0.3) - NUnit (3.2.1) - NUnit.ConsoleRunner (3.2.1) - NUnit.Extension.NUnitProjectLoader (3.2.1) - NUnit.Extension.NUnitV2Driver (3.2.1) - NUnit.Extension.NUnitV2ResultWriter (3.2.1) - NUnit.Extension.VSProjectLoader (3.2.1) - NUnit.Runners (3.2.1) - NUnit.ConsoleRunner (3.2.1) - NUnit.Extension.NUnitProjectLoader (3.2.1) - NUnit.Extension.NUnitV2Driver (3.2.1) - NUnit.Extension.NUnitV2ResultWriter (3.2.1) - NUnit.Extension.VSProjectLoader (3.2.1) - Octokit (0.20) - Microsoft.Net.Http - framework: net10, net11, net20, net30, net35, net40, net40-full - Suave (1.1.2) + Newtonsoft.Json (9.0.1) + NUnit (3.4.1) + NUnit.ConsoleRunner (3.4.1) + NUnit.Extension.NUnitProjectLoader (3.4.1) + NUnit.Extension.NUnitV2Driver (3.4.1) + NUnit.Extension.NUnitV2ResultWriter (3.4.1) + NUnit.Extension.TeamCityEventListener (1.0.1) + NUnit.Extension.VSProjectLoader (3.4.1) + NUnit.Runners (3.4.1) + NUnit.ConsoleRunner (>= 3.4.1) + NUnit.Extension.NUnitProjectLoader (>= 3.4.1) + NUnit.Extension.NUnitV2Driver (>= 3.4.1) + NUnit.Extension.NUnitV2ResultWriter (>= 3.4.1) + NUnit.Extension.TeamCityEventListener (>= 1.0.1) + NUnit.Extension.VSProjectLoader (>= 3.4.1) + Octokit (0.21.1) + Suave (1.1.3) FSharp.Core (>= 3.1.2.5) + System.Collections.Immutable (1.2) + System.Reflection.Metadata (1.4.1-beta-24227-04) + System.Collections.Immutable (>= 1.2) diff --git a/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj b/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj index 000670d17..c7735785a 100644 --- a/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj +++ b/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj @@ -51,7 +51,7 @@ - + <__paket__FSharp_Compiler_Service_ProjectCracker_targets>net45\FSharp.Compiler.Service.ProjectCracker @@ -89,7 +89,7 @@ - + ..\..\packages\FParsec\lib\net40-client\FParsec.dll @@ -103,15 +103,12 @@ - + + + - - ..\..\packages\FParsec\lib\portable-net45+netcore45+wpa81+wp8\FParsec.dll - True - True - - - ..\..\packages\FParsec\lib\portable-net45+netcore45+wpa81+wp8\FParsecCS.dll + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll True True @@ -119,19 +116,21 @@ - + - - ..\..\packages\FSharp.Compiler.Service\lib\net40\FSharp.Compiler.Service.dll + + ..\..\packages\FSharp.Compiler.Service.ProjectCracker\lib\net45\FSharp.Compiler.Service.ProjectCracker.dll True True - + + + - - ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll + + ..\..\packages\FSharpLint.Core\lib\net45\FSharpLint.Core.dll True True @@ -139,10 +138,10 @@ - + - - ..\..\packages\FSharp.Compiler.Service.ProjectCracker\lib\net45\FSharp.Compiler.Service.ProjectCracker.dll + + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll True True @@ -150,20 +149,10 @@ - + - - ..\..\packages\FSharpLint.Core\lib\net45\FSharpLint.Application.dll - True - True - - - ..\..\packages\FSharpLint.Core\lib\net45\FSharpLint.Framework.dll - True - True - - - ..\..\packages\FSharpLint.Core\lib\net45\FSharpLint.Rules.dll + + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll True True diff --git a/src/FsAutoComplete.Suave/App.config b/src/FsAutoComplete.Suave/App.config index 56388eec9..69676a0b0 100644 --- a/src/FsAutoComplete.Suave/App.config +++ b/src/FsAutoComplete.Suave/App.config @@ -4,20 +4,20 @@ - - - True - - - - - - - - - - - - - + + + + + + + + + + + + True + + + + \ No newline at end of file diff --git a/src/FsAutoComplete.Suave/FsAutoComplete.Suave.fsproj b/src/FsAutoComplete.Suave/FsAutoComplete.Suave.fsproj index d96046ca0..c6bf18265 100644 --- a/src/FsAutoComplete.Suave/FsAutoComplete.Suave.fsproj +++ b/src/FsAutoComplete.Suave/FsAutoComplete.Suave.fsproj @@ -72,7 +72,7 @@ - + <__paket__FSharp_Compiler_Service_ProjectCracker_targets>net45\FSharp.Compiler.Service.ProjectCracker @@ -86,16 +86,7 @@ --> - - - - ..\..\packages\FSharp.Compiler.Service\lib\net40\FSharp.Compiler.Service.dll - True - True - - - - + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll @@ -106,7 +97,7 @@ - + ..\..\packages\FSharp.Compiler.Service.ProjectCracker\lib\net45\FSharp.Compiler.Service.ProjectCracker.dll @@ -117,25 +108,7 @@ - - - - ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll - True - True - - - - + ..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll @@ -144,72 +117,9 @@ - - - - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll - True - True - - - - + ..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll @@ -218,19 +128,23 @@ - + + + - - ..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81+dnxcore50\Newtonsoft.Json.dll + + ..\..\packages\Suave\lib\net40\Suave.dll True True - + + + - - ..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll + + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll True True @@ -238,10 +152,10 @@ - + - - ..\..\packages\Suave\lib\net40\Suave.dll + + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll True True diff --git a/src/FsAutoComplete/FsAutoComplete.fsproj b/src/FsAutoComplete/FsAutoComplete.fsproj index ec0e2d137..4f4a04537 100644 --- a/src/FsAutoComplete/FsAutoComplete.fsproj +++ b/src/FsAutoComplete/FsAutoComplete.fsproj @@ -46,7 +46,7 @@ - + <__paket__FSharp_Compiler_Service_ProjectCracker_targets>net45\FSharp.Compiler.Service.ProjectCracker @@ -89,16 +89,7 @@ - - - - ..\..\packages\FSharp.Compiler.Service\lib\net40\FSharp.Compiler.Service.dll - True - True - - - - + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll @@ -109,7 +100,7 @@ - + ..\..\packages\FSharp.Compiler.Service.ProjectCracker\lib\net45\FSharp.Compiler.Service.ProjectCracker.dll @@ -119,42 +110,19 @@ - - - ..\..\packages\NDesk.Options\lib\NDesk.Options.dll - True - True - - - - - - ..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll - True - True - - - - + - - ..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll + + ..\..\packages\NDesk.Options\lib\NDesk.Options.dll True True - + + + ..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll @@ -163,19 +131,23 @@ - + + + - - ..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81+dnxcore50\Newtonsoft.Json.dll + + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll True True - + + + - - ..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll + + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll True True diff --git a/test/FsAutoComplete.Tests/FsAutoComplete.Tests.fsproj b/test/FsAutoComplete.Tests/FsAutoComplete.Tests.fsproj index 4b63928f1..30bf0a01e 100644 --- a/test/FsAutoComplete.Tests/FsAutoComplete.Tests.fsproj +++ b/test/FsAutoComplete.Tests/FsAutoComplete.Tests.fsproj @@ -80,16 +80,7 @@ - - - - ..\..\packages\FSharp.Compiler.Service\lib\net40\FSharp.Compiler.Service.dll - True - True - - - - + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll @@ -100,46 +91,32 @@ - + - ..\..\packages\NUnit\lib\net35\nunit.framework.dll - True - True - - - - - - - ..\..\packages\NUnit\lib\net20\nunit.framework.dll - True - True - - - - - - - ..\..\packages\NUnit\lib\net40\nunit.framework.dll + ..\..\packages\NUnit\lib\net45\nunit.framework.dll True True - + + + - - ..\..\packages\NUnit\lib\net45\nunit.framework.dll + + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll True True - + + + - - ..\..\packages\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll + + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll True True From df4e0d02c82910e893f270dcaeed430de1f3633e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Cie=C5=9Blak?= Date: Sat, 20 Aug 2016 00:27:01 +0200 Subject: [PATCH 2/6] Update F# version --- .../FsAutoComplete.Core.fsproj | 14 +++++----- .../FsAutoComplete.Suave.fsproj | 2 +- src/FsAutoComplete/FsAutoComplete.fsproj | 18 ++++++------ .../FsAutoComplete.Tests.fsproj | 28 +++++++++---------- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj b/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj index c7735785a..262468006 100644 --- a/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj +++ b/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj @@ -10,7 +10,7 @@ FsAutoComplete.Core FsAutoComplete.Core v4.5 - 4.3.1.0 + 4.4.0.0 FsAutoComplete.Core @@ -57,12 +57,12 @@ - diff --git a/src/FsAutoComplete.Suave/FsAutoComplete.Suave.fsproj b/src/FsAutoComplete.Suave/FsAutoComplete.Suave.fsproj index c6bf18265..e594e4581 100644 --- a/src/FsAutoComplete.Suave/FsAutoComplete.Suave.fsproj +++ b/src/FsAutoComplete.Suave/FsAutoComplete.Suave.fsproj @@ -10,7 +10,7 @@ FsAutoComplete.Suave FsAutoComplete.Suave v4.5 - 4.3.1.0 + 4.4.0.0 FsAutoComplete.Suave diff --git a/src/FsAutoComplete/FsAutoComplete.fsproj b/src/FsAutoComplete/FsAutoComplete.fsproj index 4f4a04537..8453c9c5b 100644 --- a/src/FsAutoComplete/FsAutoComplete.fsproj +++ b/src/FsAutoComplete/FsAutoComplete.fsproj @@ -13,7 +13,7 @@ ..\ FSharp.InteractiveAutocomplete False - 4.3.1.0 + 4.4.0.0 11 @@ -52,14 +52,14 @@ - diff --git a/test/FsAutoComplete.Tests/FsAutoComplete.Tests.fsproj b/test/FsAutoComplete.Tests/FsAutoComplete.Tests.fsproj index 30bf0a01e..1e4c41286 100644 --- a/test/FsAutoComplete.Tests/FsAutoComplete.Tests.fsproj +++ b/test/FsAutoComplete.Tests/FsAutoComplete.Tests.fsproj @@ -12,7 +12,7 @@ v4.5 ..\ False - 4.3.1.0 + 4.4.0.0 FsAutoComplete.Tests 11 @@ -45,20 +45,20 @@ $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - From d8254eae9d48ae61bf507236c8bcb5b7aab87814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Cie=C5=9Blak?= Date: Sat, 20 Aug 2016 00:36:16 +0200 Subject: [PATCH 3/6] Use Paket version of Octokit --- .gitignore | 1 + build.fsx | 5 ++--- paket.dependencies | 4 +++- paket.lock | 4 ++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c91a6aaf1..42a792ba0 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ pack/* packages .paket/paket.exe +paket-files/ TestResults.xml TestResult.xml diff --git a/build.fsx b/build.fsx index 67c72a613..683668a85 100644 --- a/build.fsx +++ b/build.fsx @@ -127,7 +127,7 @@ Target "SuaveReleaseArchive" (fun _ -> Target "LocalRelease" (fun _ -> ensureDirectory "bin/release" - CopyFiles "bin/release"( + CopyFiles "bin/release"( !! (buildReleaseDir + "/*.dll") ++ (buildReleaseDir + "/*.exe") ++ (buildReleaseDir + "/*.exe.config") @@ -137,8 +137,7 @@ Target "LocalRelease" (fun _ -> ) ) - -#load "lib/Octokit.fsx" +#load "paket-files/fsharp/FAKE/modules/Octokit/Octokit.fsx" open Octokit Target "Release" (fun _ -> diff --git a/paket.dependencies b/paket.dependencies index 34804001b..70d9f0ba6 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -12,4 +12,6 @@ nuget NUnit.Runners nuget Octokit nuget Suave nuget FSharpLint.Core prerelease -nuget FSharp.Core redirects:on \ No newline at end of file +nuget FSharp.Core redirects:on + +github fsharp/FAKE modules/Octokit/Octokit.fsx \ No newline at end of file diff --git a/paket.lock b/paket.lock index ac00c76a2..f0e9f60bf 100644 --- a/paket.lock +++ b/paket.lock @@ -35,3 +35,7 @@ NUGET System.Collections.Immutable (1.2) System.Reflection.Metadata (1.4.1-beta-24227-04) System.Collections.Immutable (>= 1.2) +GITHUB + remote: fsharp/FAKE + modules/Octokit/Octokit.fsx (934dc8313e2c54793813058fe2540511ad3b8468) + Octokit (>= 0.20) \ No newline at end of file From cf67f6d3ae3ce54dca43cb70accaa1482be31352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Cie=C5=9Blak?= Date: Sat, 20 Aug 2016 00:36:29 +0200 Subject: [PATCH 4/6] FCS breaking changes --- src/FsAutoComplete.Core/CommandResponse.fs | 2 +- src/FsAutoComplete.Core/Commands.fs | 14 +++++++------- .../CompilerServiceInterface.fs | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/FsAutoComplete.Core/CommandResponse.fs b/src/FsAutoComplete.Core/CommandResponse.fs index d86ef3089..d43e699a0 100644 --- a/src/FsAutoComplete.Core/CommandResponse.fs +++ b/src/FsAutoComplete.Core/CommandResponse.fs @@ -258,7 +258,7 @@ module CommandResponse = Description = p.Description } ] - IsStaticArguments = o.IsStaticArguments + IsStaticArguments = not o.HasParameters } ] } } diff --git a/src/FsAutoComplete.Core/Commands.fs b/src/FsAutoComplete.Core/Commands.fs index e605128d5..1dd59624d 100644 --- a/src/FsAutoComplete.Core/Commands.fs +++ b/src/FsAutoComplete.Core/Commands.fs @@ -21,7 +21,7 @@ type Commands (serialize : Serializer) = member private x.SerializeResult (successToString: Serializer -> 'a -> string, ?failureToString: Serializer -> string -> string) = x.SerializeResultAsync ((fun s x -> successToString s x |> async.Return), ?failureToString = failureToString) - member __.TryGetRecentTypeCheckResultsForFile = checker.TryGetRecentTypeCheckResultsForFile + member __.TryGetRecentTypeCheckResultsForFile = checker.TryGetRecentCheckResultsForFile member __.TryGetFileCheckerOptionsWithLinesAndLineStr = state.TryGetFileCheckerOptionsWithLinesAndLineStr member __.TryGetFileCheckerOptionsWithLines = state.TryGetFileCheckerOptionsWithLines member __.Files = state.Files @@ -31,7 +31,7 @@ type Commands (serialize : Serializer) = let parse' fileName text options = async { let! _parseResults, checkResults = checker.ParseAndCheckFileInProject(fileName, 0, text, options) - return + return match checkResults with | FSharpCheckFileAnswer.Aborted -> [Response.info serialize "Parse aborted"] | FSharpCheckFileAnswer.Succeeded results -> @@ -60,8 +60,8 @@ type Commands (serialize : Serializer) = member __.Project projectFileName verbose onChange = async { let projectFileName = Path.GetFullPath projectFileName let project = state.Projects.TryFind projectFileName - - let project = project |> Option.getOrElseFun (fun _ -> + + let project = project |> Option.getOrElseFun (fun _ -> let project = new Project(projectFileName, onChange) state.Projects.[projectFileName] <- project project) @@ -75,9 +75,9 @@ type Commands (serialize : Serializer) = checker.TryGetProjectOptions (projectFileName, verbose) else checker.TryGetCoreProjectOptions projectFileName - + match options with - | Result.Failure error -> + | Result.Failure error -> project.Response <- None [Response.error serialize error] | Result.Success (opts, projectFiles, outFileOpt, references, logMap) -> @@ -164,7 +164,7 @@ type Commands (serialize : Serializer) = match state.TryGetFileCheckerOptionsWithSource file with | Failure s -> [Response.error serialize s] | Success (options, source) -> - let tyResOpt = checker.TryGetRecentTypeCheckResultsForFile(file, options) + let tyResOpt = checker.TryGetRecentCheckResultsForFile(file, options) match tyResOpt with | None -> [ Response.info serialize "Cached typecheck results not yet available"] diff --git a/src/FsAutoComplete.Core/CompilerServiceInterface.fs b/src/FsAutoComplete.Core/CompilerServiceInterface.fs index 33dc8c3de..d9bf6617c 100644 --- a/src/FsAutoComplete.Core/CompilerServiceInterface.fs +++ b/src/FsAutoComplete.Core/CompilerServiceInterface.fs @@ -108,7 +108,7 @@ type ParseAndCheckResults type FSharpCompilerServiceChecker() = let checker = FSharpChecker.Create( - projectCacheSize = 200, + projectCacheSize = 200, keepAllBackgroundResolutions = true, keepAssemblyContents = true) @@ -190,8 +190,8 @@ type FSharpCompilerServiceChecker() = member __.ParseAndCheckFileInProject(fileName, version, source, options) = checker.ParseAndCheckFileInProject(fileName, version, source, options) - member __.TryGetRecentTypeCheckResultsForFile(file, options, ?source) = - checker.TryGetRecentTypeCheckResultsForFile(file, options, ?source=source) + member __.TryGetRecentCheckResultsForFile(file, options, ?source) = + checker.TryGetRecentCheckResultsForFile(file, options, ?source=source) |> Option.map (fun (pr, cr, _) -> ParseAndCheckResults (pr, cr)) member __.GetDeclarations (fileName, source, options) = async { From e637dfddd0aad833378adbf2970417aa473c1939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Cie=C5=9Blak?= Date: Sat, 20 Aug 2016 00:42:15 +0200 Subject: [PATCH 5/6] Update app configs --- src/FsAutoComplete.Suave/App.config | 10 +--------- src/FsAutoComplete/App.config | 8 -------- test/FsAutoComplete.Tests/App.config | 12 ++---------- 3 files changed, 3 insertions(+), 27 deletions(-) diff --git a/src/FsAutoComplete.Suave/App.config b/src/FsAutoComplete.Suave/App.config index 69676a0b0..023472a55 100644 --- a/src/FsAutoComplete.Suave/App.config +++ b/src/FsAutoComplete.Suave/App.config @@ -4,16 +4,8 @@ - + - - - - - - - - True diff --git a/src/FsAutoComplete/App.config b/src/FsAutoComplete/App.config index eb1ebd64f..57c176d96 100644 --- a/src/FsAutoComplete/App.config +++ b/src/FsAutoComplete/App.config @@ -9,14 +9,6 @@ - - - - - - - - diff --git a/test/FsAutoComplete.Tests/App.config b/test/FsAutoComplete.Tests/App.config index 0b937b442..5e3554057 100644 --- a/test/FsAutoComplete.Tests/App.config +++ b/test/FsAutoComplete.Tests/App.config @@ -1,22 +1,14 @@  - + - + - - - - - - - - From d98e64db66b5979b6cabb9d3cd957cf02469a9cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Cie=C5=9Blak?= Date: Sat, 20 Aug 2016 00:49:30 +0200 Subject: [PATCH 6/6] Update test results --- test/FsAutoComplete.IntegrationTests/ErrorTestsJson/output.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/FsAutoComplete.IntegrationTests/ErrorTestsJson/output.json b/test/FsAutoComplete.IntegrationTests/ErrorTestsJson/output.json index 9b5cdc403..7b2b85bda 100644 --- a/test/FsAutoComplete.IntegrationTests/ErrorTestsJson/output.json +++ b/test/FsAutoComplete.IntegrationTests/ErrorTestsJson/output.json @@ -52,7 +52,7 @@ "StartColumn": 19, "EndColumn": 23, "Severity": "Error", - "Message": "This expression was expected to have type\n int \nbut here has type\n string ", + "Message": "This expression was expected to have type\n 'int' \nbut here has type\n 'string' ", "Subcategory": "typecheck" } ]