From 46313b5ac8ee7bc9d00f6932e4d0415d3d6944bc Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Sat, 11 Feb 2017 13:22:08 +0100 Subject: [PATCH 1/9] changes to get solution to compile with FCS 10 notes: * I've fixed framework >= net40 in paket, this pulls less things and keep project files tidier * new FCS made IsResultObsolete internal, it was used once but oddly we don't seem to use the callback we are giving there anywhere else * call to ParseAndCheckFileInProject changed, I haven't checked what was the null parameter we were passing, using explicit parameter names for this call now --- paket.dependencies | 6 +- paket.lock | 135 +---- .../FSharp.Editing.VisualStudio.v2015.fsproj | 465 +--------------- .../Coloring/UnusedSymbolClassifier.fs | 2 +- .../FSharp.Editing.VisualStudio.fsproj | 507 +----------------- src/FSharp.Editing/Common/Lexer.fs | 4 +- src/FSharp.Editing/FSharp.Editing.fsproj | 463 +--------------- .../ProjectSystem/LanguageService.fs | 13 +- .../TaskListCommentExtractor.fs | 2 +- .../FSharpVSPowerTools.csproj | 481 +---------------- .../FSharp.Editing.Tests.fsproj | 501 +---------------- .../GoToDefinitionTests.fs | 4 +- tests/FSharp.Editing.Tests/TestHelpers.fs | 4 +- tests/FSharp.Editing.Tests/app.config | 2 +- .../FSharp.Editing.VisualStudio.Tests.fsproj | 479 +---------------- .../app.config | 2 +- 16 files changed, 65 insertions(+), 3005 deletions(-) diff --git a/paket.dependencies b/paket.dependencies index f857393d..57c2777b 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,7 +1,7 @@ source http://nuget.org/api/v2 redirects: on strategy: max - +framework >= net40 nuget Fantomas nuget FSharp.Compiler.Service nuget FSharp.Core @@ -42,7 +42,7 @@ group vssdk group Test source http://nuget.org/api/v2 - + framework >= net40 nuget Foq nuget FsCheck nuget FSharp.Compiler.Service.ProjectCracker @@ -51,7 +51,7 @@ group Test group Build source http://nuget.org/api/v2 - + framework >= net40 nuget canopy nuget FAKE nuget FSharp.Formatting diff --git a/paket.lock b/paket.lock index 47f44ac0..4b619513 100644 --- a/paket.lock +++ b/paket.lock @@ -1,17 +1,17 @@ REDIRECTS: ON STRATEGY: MAX +FRAMEWORK: >= NET40 NUGET remote: http://www.nuget.org/api/v2 Fantomas (2.4) FSharp.Compiler.Service (>= 8.0) FParsec (1.0.2) - FSharp.Compiler.Service (8.0) + FSharp.Compiler.Service (10.0.1) System.Collections.Immutable (>= 1.2) System.Reflection.Metadata (>= 1.4.1-beta-24227-04) FSharp.Compiler.Service.ProjectCracker (8.0) FSharp.Core (4.0.0.1) FSharp.Data (2.3.2) - Zlib.Portable (>= 1.11) - framework: >= netstandard11, portable-net45+sl5+win8, portable-net45+win8, portable-net45+win8+wp8+wpa81 FSharp.Management (0.4.2) FSharp.ViewModule.Core (1.0.5) FSharp.Core @@ -21,137 +21,10 @@ NUGET FSharp.Compiler.Service.ProjectCracker (>= 8.0) FsPickler (3.2) FsXaml.Wpf (3.1.2) - Microsoft.NETCore.Platforms (1.0.1) - framework: >= netstandard10 - Microsoft.NETCore.Targets (1.0.1) - framework: >= netstandard10 - runtime.native.System (4.0) - framework: >= netstandard13 - Microsoft.NETCore.Platforms (>= 1.0.1) - Microsoft.NETCore.Targets (>= 1.0.1) - runtime.native.System.IO.Compression (4.1) - framework: >= netstandard13 - Microsoft.NETCore.Platforms (>= 1.0.1) - Microsoft.NETCore.Targets (>= 1.0.1) SourceLink.SymbolStore (0.5) - System.Collections (4.0.11) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 System.Collections.Immutable (1.2) - System.Collections (>= 4.0.11) - framework: >= netstandard10 - System.Diagnostics.Debug (>= 4.0.11) - framework: >= netstandard10 - System.Globalization (>= 4.0.11) - framework: >= netstandard10 - System.Linq (>= 4.1) - framework: >= netstandard10 - System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard10 - System.Runtime (>= 4.1) - framework: >= netstandard10 - System.Runtime.Extensions (>= 4.1) - framework: >= netstandard10 - System.Threading (>= 4.0.11) - framework: >= netstandard10 - System.Diagnostics.Debug (4.0.11) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Globalization (4.0.11) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.IO (4.1) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Threading.Tasks (>= 4.0.11) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.IO.Compression (4.1) - framework: >= netstandard11 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: >= netstandard13 - runtime.native.System (>= 4.0) - framework: >= netstandard13 - runtime.native.System.IO.Compression (>= 4.1) - framework: >= netstandard13 - System.Collections (>= 4.0.11) - framework: >= netstandard13 - System.Diagnostics.Debug (>= 4.0.11) - framework: >= netstandard13 - System.IO (>= 4.1) - framework: dnxcore50, netstandard11, >= netstandard13 - System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard11, >= netstandard13 - System.Runtime.Extensions (>= 4.1) - framework: >= netstandard13 - System.Runtime.Handles (>= 4.0.1) - framework: >= netstandard13 - System.Runtime.InteropServices (>= 4.1) - framework: >= netstandard13 - System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, netstandard11, >= netstandard13 - System.Threading (>= 4.0.11) - framework: >= netstandard13 - System.Threading.Tasks (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.Linq (4.1) - framework: >= netstandard10 - System.Collections (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard16 - System.Diagnostics.Debug (>= 4.0.11) - framework: dnxcore50, >= netstandard16 - System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard16 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard16 - System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard16 - System.Reflection (4.1) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.IO (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Reflection.Primitives (>= 4.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Reflection.Extensions (4.0.1) - framework: >= netstandard11 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard10 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, >= netstandard10 - System.Reflection (>= 4.1) - framework: dnxcore50, >= netstandard10 - System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard10 System.Reflection.Metadata (1.4.1-beta-24430-01) - System.Collections (>= 4.0.11) - framework: >= netstandard11 - System.Collections.Immutable (>= 1.1.37) - framework: portable-net45+win8 - System.Collections.Immutable (>= 1.2) - framework: >= net45, >= netstandard11, monoandroid, monotouch, xamarinios, xamarinmac, winv4.5, wpav8.1 - System.Diagnostics.Debug (>= 4.0.11) - framework: >= netstandard11 - System.IO (>= 4.1) - framework: >= netstandard11 - System.IO.Compression (>= 4.1) - framework: >= netstandard11 - System.Linq (>= 4.1) - framework: >= netstandard11 - System.Reflection (>= 4.1) - framework: >= netstandard11 - System.Reflection.Extensions (>= 4.0.1) - framework: >= netstandard11 - System.Reflection.Primitives (>= 4.0.1) - framework: >= netstandard11 - System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard11 - System.Runtime (>= 4.1) - framework: >= netstandard11 - System.Runtime.Extensions (>= 4.1) - framework: >= netstandard11 - System.Runtime.InteropServices (>= 4.1) - framework: >= netstandard11 - System.Text.Encoding (>= 4.0.11) - framework: >= netstandard11 - System.Text.Encoding.Extensions (>= 4.0.11) - framework: >= netstandard11 - System.Threading (>= 4.0.11) - framework: >= netstandard11 - System.Reflection.Primitives (4.0.1) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard10 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, >= netstandard10 - System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard10 - System.Resources.ResourceManager (4.0.1) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard10 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, >= netstandard10 - System.Globalization (>= 4.0.11) - framework: dnxcore50, >= netstandard10 - System.Reflection (>= 4.1) - framework: dnxcore50, >= netstandard10 - System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard10 - System.Runtime (4.1) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard12, netstandard13, >= netstandard15 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard12, netstandard13, >= netstandard15 - System.Runtime.Extensions (4.1) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Runtime.Handles (4.0.1) - framework: >= netstandard13 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: >= netstandard13 - System.Runtime (>= 4.1) - framework: >= netstandard13 - System.Runtime.InteropServices (4.1) - framework: >= netstandard11 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 - System.Reflection (>= 4.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 - System.Reflection.Primitives (>= 4.0.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 - System.Runtime (>= 4.1) - framework: >= net462, dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 - System.Runtime.Handles (>= 4.0.1) - framework: dnxcore50, netstandard13, >= netstandard15 - System.Text.Encoding (4.0.11) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Text.Encoding.Extensions (4.0.11) - framework: >= netstandard11 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Threading (4.0.11) - framework: >= netstandard10 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Threading.Tasks (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Threading.Tasks (4.0.11) - framework: netstandard10, >= netstandard13 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Zlib.Portable (1.11) - framework: >= netstandard11, portable-net45+sl5+win8, portable-net45+win8, portable-net45+win8+wp8+wpa81 + System.Collections.Immutable (>= 1.2) - framework: >= net45 GROUP Build NUGET @@ -181,7 +54,7 @@ NUGET GITHUB remote: fsharp/FAKE modules/Octokit/Octokit.fsx (4e4428bfe931a5f720e32f9d69289d25eb16d467) - Octokit (>= 0.20) + Octokit GROUP Test NUGET remote: http://www.nuget.org/api/v2 diff --git a/src/FSharp.Editing.VisualStudio.v2015/FSharp.Editing.VisualStudio.v2015.fsproj b/src/FSharp.Editing.VisualStudio.v2015/FSharp.Editing.VisualStudio.v2015.fsproj index 174a8e1b..72b3477e 100644 --- a/src/FSharp.Editing.VisualStudio.v2015/FSharp.Editing.VisualStudio.v2015.fsproj +++ b/src/FSharp.Editing.VisualStudio.v2015/FSharp.Editing.VisualStudio.v2015.fsproj @@ -107,15 +107,6 @@ - - - - ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - @@ -125,54 +116,9 @@ - - - - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+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\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - - + ..\..\packages\FSharp.ViewModule.Core\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.ViewModule.dll @@ -214,27 +160,7 @@ - - - - ..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.dll - False - True - - - - - - - ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll - False - True - - - - - - + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll @@ -243,167 +169,9 @@ - - - - ..\..\packages\System.Collections.Immutable\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - True - - - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.dll - False - True - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll - False - True - - - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.dll - False - True - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll - False - True - - - - - - - - - ..\..\packages\System.IO\ref\netstandard1.0\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.3\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll - False - True - - - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.1\System.IO.Compression.dll - False - True - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll - False - True - - - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.dll - False - True - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll - False - True - - - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll - False - True - - - - - - + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll @@ -412,233 +180,6 @@ - - - - ..\..\packages\System.Reflection.Metadata\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - True - - - - - - - - - ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll - False - True - - - - - - - - - ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.1\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.2\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.3\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.0\System.Text.Encoding.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.dll - False - True - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll - False - True - - - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.dll - False - True - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll - False - True - - - diff --git a/src/FSharp.Editing.VisualStudio/Coloring/UnusedSymbolClassifier.fs b/src/FSharp.Editing.VisualStudio/Coloring/UnusedSymbolClassifier.fs index 76ceee33..68412ed1 100644 --- a/src/FSharp.Editing.VisualStudio/Coloring/UnusedSymbolClassifier.fs +++ b/src/FSharp.Editing.VisualStudio/Coloring/UnusedSymbolClassifier.fs @@ -256,7 +256,7 @@ type UnusedSymbolClassifier let projectCheckedSubscription = // project check results needed for Unused Declarations only. if includeUnusedReferences() then - Some (vsLanguageService.RawChecker.ProjectChecked.Subscribe (fun projectFileName -> + Some (vsLanguageService.RawChecker.ProjectChecked.Subscribe (fun (projectFileName, _extraProjectInfo) -> let projects = singleSymbolsProjects.Value let projects = match projects |> List.partition (fun p -> p.Options.ProjectFileName = projectFileName) with diff --git a/src/FSharp.Editing.VisualStudio/FSharp.Editing.VisualStudio.fsproj b/src/FSharp.Editing.VisualStudio/FSharp.Editing.VisualStudio.fsproj index b4f673b6..bdb8c1ef 100644 --- a/src/FSharp.Editing.VisualStudio/FSharp.Editing.VisualStudio.fsproj +++ b/src/FSharp.Editing.VisualStudio/FSharp.Editing.VisualStudio.fsproj @@ -183,37 +183,27 @@ --> - - - ..\..\packages\Fantomas\lib\FantomasLib.dll - True - True - - - - ..\..\packages\FParsec\lib\net40-client\FParsec.dll - True - True - - - ..\..\packages\FParsec\lib\net40-client\FParsecCS.dll + + ..\..\packages\Fantomas\lib\FantomasLib.dll True True - + + + - ..\..\packages\FParsec\lib\portable-net45+netcore45+wpa81+wp8\FParsec.dll + ..\..\packages\FParsec\lib\net40-client\FParsec.dll True True - ..\..\packages\FParsec\lib\portable-net45+netcore45+wpa81+wp8\FParsecCS.dll + ..\..\packages\FParsec\lib\net40-client\FParsecCS.dll True True @@ -248,15 +238,6 @@ - - - - ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - @@ -266,54 +247,9 @@ - - - - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+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\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - - + ..\..\packages\FSharp.ViewModule.Core\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.ViewModule.dll @@ -335,21 +271,6 @@ - - - - ..\..\packages\FsPickler\lib\net35\FsPickler.dll - True - True - - - True - - - True - - - @@ -403,6 +324,9 @@ True + + True + True @@ -426,27 +350,7 @@ - - - - ..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.dll - False - True - - - - - - - ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll - False - True - - - - - - + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll @@ -455,167 +359,9 @@ - - - - ..\..\packages\System.Collections.Immutable\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - True - - - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.dll - False - True - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll - False - True - - - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.dll - False - True - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll - False - True - - - - - - - - - ..\..\packages\System.IO\ref\netstandard1.0\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.3\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll - False - True - - - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.1\System.IO.Compression.dll - False - True - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll - False - True - - - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.dll - False - True - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll - False - True - - - - - - - - - ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll - False - True - - - - - - + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll @@ -624,233 +370,6 @@ - - - - ..\..\packages\System.Reflection.Metadata\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - True - - - - - - - - - ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll - False - True - - - - - - - - - ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.1\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.2\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.3\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.0\System.Text.Encoding.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.dll - False - True - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll - False - True - - - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.dll - False - True - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll - False - True - - - diff --git a/src/FSharp.Editing/Common/Lexer.fs b/src/FSharp.Editing/Common/Lexer.fs index 7b1a9efa..a1b96afd 100644 --- a/src/FSharp.Editing/Common/Lexer.fs +++ b/src/FSharp.Editing/Common/Lexer.fs @@ -48,7 +48,7 @@ module Lexer = | Some _, newLexState -> loop lineTokenizer newLexState - let sourceTokenizer = SourceTokenizer(defines, Some "/tmp.fsx") + let sourceTokenizer = FSharpSourceTokenizer(defines, Some "/tmp.fsx") let lines = String.getLines source let lexState = ref 0L for line in lines do @@ -81,7 +81,7 @@ module Lexer = let defines = args |> Seq.choose (fun s -> if s.StartsWith "--define:" then Some s.[9..] else None) |> Seq.toList - let sourceTokenizer = SourceTokenizer(defines, Some "/tmp.fsx") + let sourceTokenizer = FSharpSourceTokenizer(defines, Some "/tmp.fsx") let lineTokenizer = sourceTokenizer.CreateLineTokenizer lineStr let rec loop lexState acc = match lineTokenizer.ScanToken lexState with diff --git a/src/FSharp.Editing/FSharp.Editing.fsproj b/src/FSharp.Editing/FSharp.Editing.fsproj index 19ca5465..02b7a2d0 100644 --- a/src/FSharp.Editing/FSharp.Editing.fsproj +++ b/src/FSharp.Editing/FSharp.Editing.fsproj @@ -121,15 +121,6 @@ - - - - ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - @@ -139,74 +130,9 @@ - - - - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+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\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - - - - - - - ..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.dll - False - True - - - - - - - ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll - False - True - - - - + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll @@ -215,167 +141,9 @@ - - - - ..\..\packages\System.Collections.Immutable\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - True - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.dll - False - True - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll - False - True - - - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.dll - False - True - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll - False - True - - - - - - - - - ..\..\packages\System.IO\ref\netstandard1.0\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.3\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll - False - True - - - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.1\System.IO.Compression.dll - False - True - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll - False - True - - - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.dll - False - True - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll - False - True - - - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll - False - True - - - - - - - - - ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll - False - True - - - - - - + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll @@ -384,232 +152,5 @@ - - - - ..\..\packages\System.Reflection.Metadata\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - True - - - - - - - - - ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll - False - True - - - - - - - - - ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.1\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.2\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.3\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.0\System.Text.Encoding.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.dll - False - True - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll - False - True - - - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.dll - False - True - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll - False - True - - - \ No newline at end of file diff --git a/src/FSharp.Editing/ProjectSystem/LanguageService.fs b/src/FSharp.Editing/ProjectSystem/LanguageService.fs index 93796863..afbb6b6d 100644 --- a/src/FSharp.Editing/ProjectSystem/LanguageService.fs +++ b/src/FSharp.Editing/ProjectSystem/LanguageService.fs @@ -168,8 +168,13 @@ type LanguageService (?backgroundCompilation: bool, ?projectCacheSize: int, ?fil debug "[LanguageService] Change state for %s to `BeingChecked`" filePath debug "[LanguageService] Parse and typecheck source..." - return! x.ParseAndCheckFileInProject (fixedFilePath, 0, source, options, - IsResultObsolete (fun _ -> isResultObsolete filePath), null) + return! x.ParseAndCheckFileInProject ( + filename = fixedFilePath + , fileversion = 0 + , source = source + , options = options + , textSnapshotInfo = (*IsResultObsolete*) (fun _ -> isResultObsolete filePath) + ) finally if files.TryUpdate (filePath, Checked, BeingChecked) then debug "[LanguageService] %s: BeingChecked => Checked" filePath @@ -276,7 +281,9 @@ type LanguageService (?backgroundCompilation: bool, ?projectCacheSize: int, ?fil UseScriptResolutionRules = false LoadTime = fakeDateTimeRepresentingTimeLoaded projFilename UnresolvedReferences = None - ReferencedProjects = referencedProjects } + ReferencedProjects = referencedProjects + OriginalLoadReferences = List.empty + ExtraProjectInfo = None } debug "GetProjectCheckerOptions: ProjectFileName: %s, ProjectFileNames: %A, FSharpProjectOptions: %A, IsIncompleteTypeCheckEnvironment: %A, UseScriptResolutionRules: %A, ReferencedProjects: %A" opts.ProjectFileName opts.ProjectFileNames opts.OtherOptions opts.IsIncompleteTypeCheckEnvironment opts.UseScriptResolutionRules opts.ReferencedProjects opts diff --git a/src/FSharp.Editing/TaskListCommentExtractor.fs b/src/FSharp.Editing/TaskListCommentExtractor.fs index c1fae426..bac63d46 100644 --- a/src/FSharp.Editing/TaskListCommentExtractor.fs +++ b/src/FSharp.Editing/TaskListCommentExtractor.fs @@ -29,7 +29,7 @@ module private Utils = member x.Text(lines: string[], lineNumber: int) = lines.[lineNumber].Substring(x.LeftColumn, x.FullMatchedLength) - let sourceTok = SourceTokenizer([], Some "/tmp.fsx") + let sourceTok = FSharpSourceTokenizer([], Some "/tmp.fsx") let createNewLineTokenizer (lines: string[]) (lineNumber: int) = let nextLine = diff --git a/src/FSharpVSPowerTools/FSharpVSPowerTools.csproj b/src/FSharpVSPowerTools/FSharpVSPowerTools.csproj index 18f20cf5..b69ffb73 100644 --- a/src/FSharpVSPowerTools/FSharpVSPowerTools.csproj +++ b/src/FSharpVSPowerTools/FSharpVSPowerTools.csproj @@ -261,13 +261,17 @@ --> - - - ..\..\packages\Fantomas\lib\FantomasLib.dll - True - True - - + + + + + ..\..\packages\Fantomas\lib\FantomasLib.dll + True + True + + + + @@ -285,15 +289,6 @@ - - - - ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - @@ -303,74 +298,9 @@ - - - - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+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\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - - - - - - - ..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.dll - False - True - - - - - - - ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll - False - True - - - - + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll @@ -379,167 +309,9 @@ - - - - ..\..\packages\System.Collections.Immutable\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - True - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.dll - False - True - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll - False - True - - - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.dll - False - True - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll - False - True - - - - - - - - - ..\..\packages\System.IO\ref\netstandard1.0\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.3\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll - False - True - - - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.1\System.IO.Compression.dll - False - True - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll - False - True - - - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.dll - False - True - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll - False - True - - - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll - False - True - - - - - - - - - ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll - False - True - - - - - - + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll @@ -548,233 +320,6 @@ - - - - ..\..\packages\System.Reflection.Metadata\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - True - - - - - - - - - ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll - False - True - - - - - - - - - ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.1\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.2\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.3\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.0\System.Text.Encoding.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.dll - False - True - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll - False - True - - - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.dll - False - True - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll - False - True - - - diff --git a/tests/FSharp.Editing.Tests/FSharp.Editing.Tests.fsproj b/tests/FSharp.Editing.Tests/FSharp.Editing.Tests.fsproj index 572c1c1f..07099398 100644 --- a/tests/FSharp.Editing.Tests/FSharp.Editing.Tests.fsproj +++ b/tests/FSharp.Editing.Tests/FSharp.Editing.Tests.fsproj @@ -128,15 +128,6 @@ - - - - ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - @@ -146,51 +137,6 @@ - - - - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+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\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - @@ -202,33 +148,6 @@ - - - - ..\..\packages\FSharp.Data\lib\portable-net45+netcore45\FSharp.Data.dll - True - True - - - - - - - ..\..\packages\FSharp.Data\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Data.dll - True - True - - - - - - - ..\..\packages\FSharp.Data\lib\portable-net45+sl50+netcore45\FSharp.Data.dll - True - True - - - @@ -267,27 +186,7 @@ - - - - ..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.dll - False - True - - - - - - - ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll - False - True - - - - - - + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll @@ -296,167 +195,9 @@ - - - - ..\..\packages\System.Collections.Immutable\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - True - - - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.dll - False - True - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll - False - True - - - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.dll - False - True - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll - False - True - - - - - - - - - ..\..\packages\System.IO\ref\netstandard1.0\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.3\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll - False - True - - - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.1\System.IO.Compression.dll - False - True - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll - False - True - - - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.dll - False - True - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll - False - True - - - - - - - - - ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll - False - True - - - - - - + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll @@ -465,244 +206,6 @@ - - - - ..\..\packages\System.Reflection.Metadata\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - True - - - - - - - - - ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll - False - True - - - - - - - - - ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.1\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.2\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.3\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.0\System.Text.Encoding.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.dll - False - True - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll - False - True - - - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.dll - False - True - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll - False - True - - - - - - - - - ..\..\packages\Zlib.Portable\lib\portable-net4+sl5+wp8+win8+wpa81+MonoTouch+MonoAndroid\Zlib.Portable.dll - True - True - - - diff --git a/tests/FSharp.Editing.Tests/GoToDefinitionTests.fs b/tests/FSharp.Editing.Tests/GoToDefinitionTests.fs index a2e2a2ae..ff3f2c72 100644 --- a/tests/FSharp.Editing.Tests/GoToDefinitionTests.fs +++ b/tests/FSharp.Editing.Tests/GoToDefinitionTests.fs @@ -107,7 +107,9 @@ let validateSignature source signature = IsIncompleteTypeCheckEnvironment = false UseScriptResolutionRules = true LoadTime = DateTime.UtcNow - UnresolvedReferences = None } + UnresolvedReferences = None + OriginalLoadReferences = List.empty + ExtraProjectInfo = None } let results = languageService.ParseAndCheckFileInProject(opts, signatureFile, signature, AllowStaleResults.No) |> Async.RunSynchronously diff --git a/tests/FSharp.Editing.Tests/TestHelpers.fs b/tests/FSharp.Editing.Tests/TestHelpers.fs index 4acf1df7..9c0f23d0 100644 --- a/tests/FSharp.Editing.Tests/TestHelpers.fs +++ b/tests/FSharp.Editing.Tests/TestHelpers.fs @@ -131,4 +131,6 @@ module LanguageServiceTestHelper = IsIncompleteTypeCheckEnvironment = false UseScriptResolutionRules = true LoadTime = DateTime.UtcNow - UnresolvedReferences = None } + UnresolvedReferences = None + OriginalLoadReferences = List.empty + ExtraProjectInfo = None } diff --git a/tests/FSharp.Editing.Tests/app.config b/tests/FSharp.Editing.Tests/app.config index 8a1c7f19..572f3ac3 100644 --- a/tests/FSharp.Editing.Tests/app.config +++ b/tests/FSharp.Editing.Tests/app.config @@ -11,7 +11,7 @@ True - + diff --git a/tests/FSharp.Editing.VisualStudio.Tests/FSharp.Editing.VisualStudio.Tests.fsproj b/tests/FSharp.Editing.VisualStudio.Tests/FSharp.Editing.VisualStudio.Tests.fsproj index cbd1d4a5..b4fe7128 100644 --- a/tests/FSharp.Editing.VisualStudio.Tests/FSharp.Editing.VisualStudio.Tests.fsproj +++ b/tests/FSharp.Editing.VisualStudio.Tests/FSharp.Editing.VisualStudio.Tests.fsproj @@ -225,20 +225,6 @@ - - - - ..\..\packages\FParsec\lib\portable-net45+netcore45+wpa81+wp8\FParsec.dll - True - True - - - ..\..\packages\FParsec\lib\portable-net45+netcore45+wpa81+wp8\FParsecCS.dll - True - True - - - @@ -268,15 +254,6 @@ - - - - ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - @@ -286,54 +263,9 @@ - - - - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+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\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - - + ..\..\packages\FSharp.ViewModule.Core\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.ViewModule.dll @@ -355,27 +287,7 @@ - - - - ..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.dll - False - True - - - - - - - ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll - False - True - - - - - - + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll @@ -384,167 +296,9 @@ - - - - ..\..\packages\System.Collections.Immutable\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - True - - - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.dll - False - True - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll - False - True - - - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.dll - False - True - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll - False - True - - - - - - - - - ..\..\packages\System.IO\ref\netstandard1.0\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.3\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll - False - True - - - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.1\System.IO.Compression.dll - False - True - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll - False - True - - - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.dll - False - True - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll - False - True - - - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll - False - True - - - - - - + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll @@ -553,233 +307,6 @@ - - - - ..\..\packages\System.Reflection.Metadata\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - True - - - - - - - - - ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll - False - True - - - - - - - - - ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.1\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.2\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.3\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.0\System.Text.Encoding.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.dll - False - True - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll - False - True - - - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.dll - False - True - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll - False - True - - - diff --git a/tests/FSharp.Editing.VisualStudio.Tests/app.config b/tests/FSharp.Editing.VisualStudio.Tests/app.config index fd413fe3..db82a7bf 100644 --- a/tests/FSharp.Editing.VisualStudio.Tests/app.config +++ b/tests/FSharp.Editing.VisualStudio.Tests/app.config @@ -48,7 +48,7 @@ True - + From 1919a70598ae9b02c472eb71bc287e703e5f4544 Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Sat, 11 Feb 2017 14:52:04 +0100 Subject: [PATCH 2/9] fix SymbolClassifierTests regarding printf formatters range --- .../SymbolClassifierTests.fs | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/tests/FSharp.Editing.Tests/SymbolClassifierTests.fs b/tests/FSharp.Editing.Tests/SymbolClassifierTests.fs index bd1fe427..606839d3 100644 --- a/tests/FSharp.Editing.Tests/SymbolClassifierTests.fs +++ b/tests/FSharp.Editing.Tests/SymbolClassifierTests.fs @@ -890,8 +890,8 @@ let _ = printfn "%s %s" do printfn "%6d %% % 06d" 1 2 """ => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15 ] - 3, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 17, 19; Cat.Printf, 20, 22 ] - 4, [ Cat.Function, 3, 10; Cat.Printf, 12, 15; Cat.Printf, 16, 18; Cat.Printf, 20, 25 ]] + 3, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 17, 20; Cat.Printf, 20, 23 ] + 4, [ Cat.Function, 3, 10; Cat.Printf, 12, 16; Cat.Printf, 16, 19; Cat.Printf, 20, 26 ]] [] let ``printf formatters in try / with / finally``() = @@ -905,10 +905,10 @@ try with _ -> failwithf "foo %d bar" 0 """ - => [ 3, [ Cat.Operator, 10, 11; Cat.Function, 12, 19; Cat.Printf, 25, 27 ] - 5, [ Cat.Function, 8, 15; Cat.Printf, 21, 23 ] - 7, [ Cat.Function, 8, 14; Cat.Printf, 20, 22 ] - 9, [ Cat.Function, 4, 13; Cat.Printf, 19, 21 ]] + => [ 3, [ Cat.Operator, 10, 11; Cat.Function, 12, 19; Cat.Printf, 25, 28 ] + 5, [ Cat.Function, 8, 15; Cat.Printf, 21, 24 ] + 7, [ Cat.Function, 8, 14; Cat.Printf, 20, 23 ] + 9, [ Cat.Function, 4, 13; Cat.Printf, 19, 22 ]] [] let ``printf formatters in record / DU members``() = @@ -926,10 +926,10 @@ type DU = DU override __.ToString() = sprintf "%d" 1 """ - => [ 5, [ Cat.Function, 12, 19; Cat.Printf, 21, 23 ] - 7, [ Cat.Function, 12, 19; Cat.Printf, 21, 23 ] - 11, [ Cat.Function, 12, 19; Cat.Printf, 21, 23 ] - 13, [ Cat.Function, 12, 19; Cat.Printf, 21, 23 ]] + => [ 5, [ Cat.Function, 12, 19; Cat.Printf, 21, 24 ] + 7, [ Cat.Function, 12, 19; Cat.Printf, 21, 24 ] + 11, [ Cat.Function, 12, 19; Cat.Printf, 21, 24 ] + 13, [ Cat.Function, 12, 19; Cat.Printf, 21, 24 ]] [] let ``printf formatters in extension members``() = @@ -938,19 +938,19 @@ type System.Object with member __.M1 = sprintf "%A" """ - => [ 4, [ Cat.Function, 8, 15; Cat.Printf, 17, 19 ]] + => [ 4, [ Cat.Function, 8, 15; Cat.Printf, 17, 20 ]] [] let ``printf formatters in escaped string``() = """ let _ = sprintf @"%A" """ - => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 18, 20 ]] + => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 18, 21 ]] [] let ``printf formatters in triple-quoted string``() = "let _ = sprintf \"\"\"%A\"\"\"" - => [ 1, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 19, 21 ]] + => [ 1, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 19, 22 ]] [] let ``multi-line printf formatters``() = @@ -959,9 +959,9 @@ let _ = printfn "foo %s %d %A bar %i" """ - => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 21, 23; Cat.Printf, 24, 26 ] - 3, [ Cat.Printf, 17, 19 ] - 4, [ Cat.Printf, 0, 2 ] ] + => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 21, 24; Cat.Printf, 24, 27 ] + 3, [ Cat.Printf, 17, 20 ] + 4, [ Cat.Printf, 0, 3 ] ] [] let ``printf formatters in for expressions``() = @@ -974,10 +974,10 @@ for _ in (sprintf "%d" 1).ToCharArray() do |> ignore """ - => [ 2, [ Cat.Function, 10, 17; Cat.Printf, 19, 21; Cat.Function, 26, 37 ] - 3, [ Cat.Function, 4, 11; Cat.Printf, 13, 15] - 5, [ Cat.Function, 12, 19; Cat.Printf, 21, 23; Cat.Function, 28, 39 ] - 6, [ Cat.Function, 10, 17; Cat.Printf, 19, 21] + => [ 2, [ Cat.Function, 10, 17; Cat.Printf, 19, 22; Cat.Function, 26, 37 ] + 3, [ Cat.Function, 4, 11; Cat.Printf, 13, 16] + 5, [ Cat.Function, 12, 19; Cat.Printf, 21, 24; Cat.Function, 28, 39 ] + 6, [ Cat.Function, 10, 17; Cat.Printf, 19, 22] ] [] @@ -985,7 +985,7 @@ let ``printf formatters in quoted expressions``() = """ let _ = <@ sprintf "%A" @> """ - => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 11, 18; Cat.Printf, 20, 22; Cat.Quotation, 8, 26 ]] + => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 11, 18; Cat.Printf, 20, 23; Cat.Quotation, 8, 26 ]] [] let ``printf formatters if printf function is namespace qualified``() = @@ -994,8 +994,8 @@ let _ = Microsoft.FSharp.Core.Printf.printf "%A" 0 open Microsoft.FSharp.Core let _ = Printf.printf "%A" 0 """ - => [ 2, [ Cat.Operator, 6, 7; Cat.Module, 30, 36; Cat.Function, 37, 43; Cat.Printf, 45, 47 ] - 4, [ Cat.Operator, 6, 7; Cat.Module, 8, 14; Cat.Function, 15, 21; Cat.Printf, 23, 25 ]] + => [ 2, [ Cat.Operator, 6, 7; Cat.Module, 30, 36; Cat.Function, 37, 43; Cat.Printf, 45, 48 ] + 4, [ Cat.Operator, 6, 7; Cat.Module, 8, 14; Cat.Function, 15, 21; Cat.Printf, 23, 26 ]] [] let ``printf formatters are not colorized in plane strings``() = @@ -1011,9 +1011,9 @@ let _ = fprintf null "%A" 0 let _ = Microsoft.FSharp.Core.Printf.fprintf null "%A" 0 let _ = fprintfn null "%A" 0 """ - => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 22, 24 ] - 3, [ Cat.Operator, 6, 7; Cat.Module, 30, 36; Cat.Function, 37, 44; Cat.Printf, 51, 53 ] - 4, [ Cat.Operator, 6, 7; Cat.Function, 8, 16; Cat.Printf, 23, 25 ]] + => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 22, 25 ] + 3, [ Cat.Operator, 6, 7; Cat.Module, 30, 36; Cat.Function, 37, 44; Cat.Printf, 51, 54 ] + 4, [ Cat.Operator, 6, 7; Cat.Function, 8, 16; Cat.Printf, 23, 26 ]] [] let ``kprintf and bprintf formatters``() = @@ -1021,15 +1021,15 @@ let ``kprintf and bprintf formatters``() = let _ = Printf.kprintf (fun _ -> ()) "%A" 1 let _ = Printf.bprintf null "%A" 1 """ - => [ 2, [ Cat.Operator, 6, 7; Cat.Module, 8, 14; Cat.Function, 15, 22; Cat.Printf, 38, 40] - 3, [ Cat.Operator, 6, 7; Cat.Module, 8, 14; Cat.Function, 15, 22; Cat.Printf, 29, 31]] + => [ 2, [ Cat.Operator, 6, 7; Cat.Module, 8, 14; Cat.Function, 15, 22; Cat.Printf, 38, 41] + 3, [ Cat.Operator, 6, 7; Cat.Module, 8, 14; Cat.Function, 15, 22; Cat.Printf, 29, 32]] [] let ``wildcards in printf formatters``() = """ let _ = sprintf "%*d" 1 """ - => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 17, 20 ]] + => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 17, 21 ]] [] let ``float printf formatters``() = @@ -1037,8 +1037,8 @@ let ``float printf formatters``() = let _ = sprintf "%7.1f" 1.0 let _ = sprintf "%-8.1e+567" 1.0 """ - => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 17, 22] - 3, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 17, 23]] + => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 17, 23] + 3, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 17, 24]] [] let ``malformed printf formatters``() = From 716879048165abca1a6c89f866a9e17d8d1ebe77 Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Tue, 14 Feb 2017 05:22:29 +0100 Subject: [PATCH 3/9] update latest FSharpLint (pulls a bunch of stuff / changes proj files due to appearance of framework 463) --- paket.dependencies | 2 +- paket.lock | 76 +++++- .../FSharp.Editing.VisualStudio.v2015.fsproj | 28 +-- .../FSharp.Editing.VisualStudio.fsproj | 238 ++++++++++++++++-- .../Linting/LintUtils.fs | 10 +- .../Linting/OptionsViewModel.fs | 14 +- src/FSharp.Editing/FSharp.Editing.fsproj | 8 +- .../FSharpVSPowerTools.csproj | 8 +- .../FSharp.Editing.Tests.fsproj | 20 +- .../FSharp.Editing.VisualStudio.Tests.fsproj | 8 +- .../NavigateToSource/NavigateToSource.fsproj | 22 +- 11 files changed, 345 insertions(+), 89 deletions(-) diff --git a/paket.dependencies b/paket.dependencies index 57c2777b..ebbf84be 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -8,7 +8,7 @@ nuget FSharp.Core nuget FSharp.Data nuget FSharp.Management nuget FSharp.ViewModule.Core -nuget FSharpLint.Core +nuget FSharpLint.Core prerelease nuget FsPickler nuget FsXaml.Wpf nuget SourceLink.SymbolStore 0.5.0 diff --git a/paket.lock b/paket.lock index 4b619513..9eb10461 100644 --- a/paket.lock +++ b/paket.lock @@ -9,22 +9,90 @@ NUGET FSharp.Compiler.Service (10.0.1) System.Collections.Immutable (>= 1.2) System.Reflection.Metadata (>= 1.4.1-beta-24227-04) - FSharp.Compiler.Service.ProjectCracker (8.0) + FSharp.Compiler.Service.ProjectCracker (10.0.1) + FSharp.Compiler.Service (>= 10.0.1) - framework: >= net463 + Microsoft.Build (>= 14.3) - framework: >= net463 + Microsoft.Build.Framework (>= 14.3) - framework: >= net463 + Microsoft.Build.Tasks.Core (>= 14.3) - framework: >= net463 + Microsoft.Build.Utilities.Core (>= 14.3) - framework: >= net463 + Microsoft.FSharp.Core.netcore (>= 1.0.0-alpha-161205) - framework: >= net463 + System.Runtime.Serialization.Json (>= 4.0.2) - framework: >= net463 FSharp.Core (4.0.0.1) FSharp.Data (2.3.2) FSharp.Management (0.4.2) FSharp.ViewModule.Core (1.0.5) FSharp.Core - FSharpLint.Core (0.4.10) + FSharpLint.Core (0.7.0-beta) FParsec (>= 1.0.2) - FSharp.Compiler.Service (>= 8.0) - FSharp.Compiler.Service.ProjectCracker (>= 8.0) + FSharp.Compiler.Service (>= 10.0.1) + FSharp.Compiler.Service.ProjectCracker (>= 10.0.1) FsPickler (3.2) FsXaml.Wpf (3.1.2) + Microsoft.Build (14.3) - framework: >= net463 + Microsoft.Build.Framework (14.3) - framework: >= net45 + Microsoft.Build.Framework (14.3) + System.Collections (>= 4.0.11) - framework: >= net46 + System.Runtime (>= 4.1) - framework: >= net46 + System.Runtime.InteropServices (>= 4.1) - framework: >= net46 + Microsoft.Build.Tasks.Core (14.3) - framework: >= net463 + Microsoft.Build.Framework (14.3) - framework: >= net45 + Microsoft.Build.Utilities.Core (14.3) - framework: >= net45 + Microsoft.Build.Utilities.Core (14.3) + Microsoft.Build.Framework (14.3) - framework: >= net45 + Microsoft.FSharp.Core.netcore (1.0.0-rc-170122) - framework: >= net463 + System.Collections (>= 4.0.11) + System.Console (>= 4.0) + System.Diagnostics.Debug (>= 4.0.11) + System.Diagnostics.Tools (>= 4.0.1) + System.Globalization (>= 4.0.11) + System.IO (>= 4.1) + System.Linq (>= 4.1) + System.Linq.Expressions (>= 4.1) + System.Linq.Queryable (>= 4.0.1) + System.Net.Requests (>= 4.0.11) + System.Reflection (>= 4.1) + System.Reflection.Extensions (>= 4.0.1) + System.Resources.ResourceManager (>= 4.0.1) + System.Runtime (>= 4.1) + System.Runtime.Extensions (>= 4.1) + System.Runtime.Numerics (>= 4.0.1) + System.Text.RegularExpressions (>= 4.1) + System.Threading (>= 4.0.11) + System.Threading.Tasks (>= 4.0.11) + System.Threading.Tasks.Parallel (>= 4.0.1) + System.Threading.Thread (>= 4.0) + System.Threading.ThreadPool (>= 4.0.10) + System.Threading.Timer (>= 4.0.1) SourceLink.SymbolStore (0.5) + System.Collections (4.3) System.Collections.Immutable (1.2) + System.Console (4.3) - framework: >= net463 + System.Diagnostics.Debug (4.3) - framework: >= net463 + System.Diagnostics.Tools (4.3) - framework: >= net463 + System.Globalization (4.3) - framework: >= net463 + System.IO (4.3) - framework: >= net463 + System.Linq (4.3) - framework: >= net463 + System.Linq.Expressions (4.3) - framework: >= net463 + System.Linq.Queryable (4.3) - framework: >= net463 + System.Net.Requests (4.3) - framework: >= net463 + System.Reflection (4.3) - framework: >= net463 + System.Reflection.Extensions (4.3) - framework: >= net463 System.Reflection.Metadata (1.4.1-beta-24430-01) System.Collections.Immutable (>= 1.2) - framework: >= net45 + System.Resources.ResourceManager (4.3) - framework: >= net463 + System.Runtime (4.3) + System.Runtime.Extensions (4.3) - framework: >= net463 + System.Runtime.InteropServices (4.3) + System.Runtime (>= 4.3) - framework: >= net462 + System.Runtime.Numerics (4.3) - framework: >= net463 + System.Runtime.Serialization.Json (4.3) - framework: >= net463 + System.Text.RegularExpressions (4.3) - framework: >= net463 + System.Threading (4.3) - framework: >= net463 + System.Threading.Tasks (4.3) - framework: >= net463 + System.Threading.Tasks.Parallel (4.3) - framework: >= net463 + System.Threading.Thread (4.3) - framework: >= net463 + System.Threading.ThreadPool (4.3) - framework: >= net463 + System.Threading.Timer (4.3) - framework: >= net463 GROUP Build NUGET diff --git a/src/FSharp.Editing.VisualStudio.v2015/FSharp.Editing.VisualStudio.v2015.fsproj b/src/FSharp.Editing.VisualStudio.v2015/FSharp.Editing.VisualStudio.v2015.fsproj index 72b3477e..da1dde89 100644 --- a/src/FSharp.Editing.VisualStudio.v2015/FSharp.Editing.VisualStudio.v2015.fsproj +++ b/src/FSharp.Editing.VisualStudio.v2015/FSharp.Editing.VisualStudio.v2015.fsproj @@ -93,13 +93,13 @@ - - ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll True True - - ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll True True @@ -131,16 +131,6 @@ - - ..\..\packages\FsXaml.Wpf\lib\net45\FsXaml.Wpf.TypeProvider.dll - True - True - - - ..\..\packages\FsXaml.Wpf\lib\net45\FsXaml.Wpf.dll - True - True - True @@ -156,6 +146,16 @@ True + + ..\..\packages\FsXaml.Wpf\lib\net45\FsXaml.Wpf.dll + True + True + + + ..\..\packages\FsXaml.Wpf\lib\net45\FsXaml.Wpf.TypeProvider.dll + True + True + diff --git a/src/FSharp.Editing.VisualStudio/FSharp.Editing.VisualStudio.fsproj b/src/FSharp.Editing.VisualStudio/FSharp.Editing.VisualStudio.fsproj index bdb8c1ef..90eef018 100644 --- a/src/FSharp.Editing.VisualStudio/FSharp.Editing.VisualStudio.fsproj +++ b/src/FSharp.Editing.VisualStudio/FSharp.Editing.VisualStudio.fsproj @@ -68,6 +68,12 @@ + + True + + + True + @@ -213,13 +219,13 @@ - - ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll True True - - ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll True True @@ -273,41 +279,48 @@ - - ..\..\packages\FsPickler\lib\net40\FsPickler.dll - True - True - True True - - - - - ..\..\packages\FsPickler\lib\net45\FsPickler.dll + ..\..\packages\FsPickler\lib\net40\FsPickler.dll True True + + + + True True + + ..\..\packages\FsPickler\lib\net45\FsPickler.dll + True + True + - - ..\..\packages\FsXaml.Wpf\lib\net45\FsXaml.Wpf.TypeProvider.dll - True + + True + + + True + + + True + + True @@ -315,37 +328,82 @@ True True - + + ..\..\packages\FsXaml.Wpf\lib\net45\FsXaml.Wpf.TypeProvider.dll + True True - + + + + + + + + ..\..\packages\Microsoft.Build\lib\net45\Microsoft.Build.dll + True True - + + + + + + + + ..\..\packages\Microsoft.Build.Framework\lib\net45\Microsoft.Build.Framework.dll + True True - + + + + + + + + ..\..\packages\Microsoft.Build.Tasks.Core\lib\net45\Microsoft.Build.Tasks.Core.dll + True True - + + + + + + + + ..\..\packages\Microsoft.Build.Utilities.Core\lib\net45\Microsoft.Build.Utilities.Core.dll + True True - + - - ..\..\packages\SourceLink.SymbolStore\lib\net45\SourceLink.SymbolStore.CorSym.dll + + ..\..\packages\Microsoft.FSharp.Core.netcore\lib\netstandard1.6\FSharp.Core.dll True True + + + + + + ..\..\packages\SourceLink.SymbolStore\lib\net45\SourceLink.SymbolStore.dll True True + + ..\..\packages\SourceLink.SymbolStore\lib\net45\SourceLink.SymbolStore.CorSym.dll + True + True + @@ -360,6 +418,61 @@ + + + + + ..\..\packages\System.Console\lib\net46\System.Console.dll + True + True + + + + + + + + + ..\..\packages\System.IO\lib\net462\System.IO.dll + True + True + + + + + + + + + ..\..\packages\System.Linq\lib\net463\System.Linq.dll + True + True + + + + + + + + + ..\..\packages\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll + True + True + + + + + + + + + ..\..\packages\System.Reflection\lib\net462\System.Reflection.dll + True + True + + + + @@ -371,6 +484,81 @@ + + + + + ..\..\packages\System.Runtime\lib\net462\System.Runtime.dll + True + True + + + + + + + + + ..\..\packages\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll + True + True + + + + + + + + + ..\..\packages\System.Runtime.InteropServices\lib\net462\System.Runtime.InteropServices.dll + True + True + + + + + + + ..\..\packages\System.Runtime.InteropServices\lib\net463\System.Runtime.InteropServices.dll + True + True + + + + + + + + + ..\..\packages\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll + True + True + + + + + + + + + ..\..\packages\System.Threading.Thread\lib\net46\System.Threading.Thread.dll + True + True + + + + + + + + + ..\..\packages\System.Threading.ThreadPool\lib\net46\System.Threading.ThreadPool.dll + True + True + + + + diff --git a/src/FSharp.Editing.VisualStudio/Linting/LintUtils.fs b/src/FSharp.Editing.VisualStudio/Linting/LintUtils.fs index 4e9d1955..79269f75 100644 --- a/src/FSharp.Editing.VisualStudio/Linting/LintUtils.fs +++ b/src/FSharp.Editing.VisualStudio/Linting/LintUtils.fs @@ -97,9 +97,8 @@ module LintUtils = let private settingFromObject (settingObj:obj) = match settingObj with - | :? BoolViewModel as x -> + | :? BoolViewModel as x -> match x.Name with - | "IncludeMatchStatements" -> Some(x.Name, IncludeMatchStatements(x.IsChecked)) | "OneSpaceAllowedAfterOperator" -> Some(x.Name, OneSpaceAllowedAfterOperator(x.IsChecked)) | "IgnoreBlankLines" -> Some(x.Name, IgnoreBlankLines(x.IsChecked)) | _ -> None @@ -109,7 +108,6 @@ module LintUtils = | "Depth" -> Some(x.Name, Depth(x.Value)) | "MaxItems" -> Some(x.Name, MaxItems(x.Value)) | "Length" -> Some(x.Name, Length(x.Value)) - | "MaxCyclomaticComplexity" -> Some(x.Name, MaxCyclomaticComplexity(x.Value)) | "NumberOfSpacesAllowed" -> Some(x.Name, NumberOfSpacesAllowed(x.Value)) | _ -> None | :? AccessViewModel as x -> Some(x.Name, Access(x.Value)) @@ -145,8 +143,7 @@ module LintUtils = ("Hints", analyser) let viewModelToConfig (viewModel:OptionsViewModel) = - { UseTypeChecker = None - IgnoreFiles = + { IgnoreFiles = { Update = IgnoreFilesUpdate.Overwrite Files = [] Content = viewModel.IgnoreFiles.IgnoreFiles @@ -168,8 +165,7 @@ module LintUtils = let existingPartial = getPartialConfig loadedConfigs normalisedDir |> Option.getOrTry (fun _ -> - { UseTypeChecker = None - IgnoreFiles = None + { IgnoreFiles = None Analysers = Map.ofList [] }) let updatedPartial = updateConfigMap config existing existingPartial diff --git a/src/FSharp.Editing.VisualStudio/Linting/OptionsViewModel.fs b/src/FSharp.Editing.VisualStudio/Linting/OptionsViewModel.fs index 43fe7314..bf0d897c 100644 --- a/src/FSharp.Editing.VisualStudio/Linting/OptionsViewModel.fs +++ b/src/FSharp.Editing.VisualStudio/Linting/OptionsViewModel.fs @@ -110,6 +110,7 @@ type AccessViewModel(name, initialValue) as this = member __.AccessValues = Enum.GetValues(typeof) |> Seq.cast module SetupViewModels = + let getSettingsViewModelsFromRule (settings:Map<_, _>) = [ for setting in settings do match setting.Value with @@ -121,10 +122,6 @@ module SetupViewModels = yield IntViewModel("MaxItems", value) :> obj | Length(value) -> yield IntViewModel("Length", value) :> obj - | MaxCyclomaticComplexity(value) -> - yield IntViewModel("MaxCyclomaticComplexity", value) :> obj - | IncludeMatchStatements(value) -> - yield BoolViewModel("IncludeMatchStatements", value) :> obj | OneSpaceAllowedAfterOperator(value) -> yield BoolViewModel("OneSpaceAllowedAfterOperator", value) :> obj | NumberOfSpacesAllowed(value) -> @@ -133,8 +130,15 @@ module SetupViewModels = yield BoolViewModel("IgnoreBlankLines", value) :> obj | Access(value) -> yield AccessViewModel("Access", value) :> obj + | Prefix(_) + | Suffix(_) + | Underscores(_) + | Naming(_) | Hints(_) - | Enabled(_) -> () ] + | Enabled(_) -> + // those are unhandled settings + // up-for-grabs + () ] let isRuleEnabled settings = Map.tryFind "Enabled" settings = Some(Enabled(true)) diff --git a/src/FSharp.Editing/FSharp.Editing.fsproj b/src/FSharp.Editing/FSharp.Editing.fsproj index 02b7a2d0..c33470b6 100644 --- a/src/FSharp.Editing/FSharp.Editing.fsproj +++ b/src/FSharp.Editing/FSharp.Editing.fsproj @@ -107,13 +107,13 @@ - - ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll True True - - ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll True True diff --git a/src/FSharpVSPowerTools/FSharpVSPowerTools.csproj b/src/FSharpVSPowerTools/FSharpVSPowerTools.csproj index b69ffb73..b4fcb694 100644 --- a/src/FSharpVSPowerTools/FSharpVSPowerTools.csproj +++ b/src/FSharpVSPowerTools/FSharpVSPowerTools.csproj @@ -275,13 +275,13 @@ - - ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll True True - - ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll True True diff --git a/tests/FSharp.Editing.Tests/FSharp.Editing.Tests.fsproj b/tests/FSharp.Editing.Tests/FSharp.Editing.Tests.fsproj index 07099398..6f0f09d1 100644 --- a/tests/FSharp.Editing.Tests/FSharp.Editing.Tests.fsproj +++ b/tests/FSharp.Editing.Tests/FSharp.Editing.Tests.fsproj @@ -114,13 +114,13 @@ - - ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll True True - - ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll True True @@ -152,8 +152,8 @@ - - ..\..\packages\FSharp.Management\lib\net40\FSharp.Management.PowerShell.ExternalRuntime.exe + + ..\..\packages\FSharp.Management\lib\net40\FSharp.Management.dll True True @@ -162,8 +162,8 @@ True True - - ..\..\packages\FSharp.Management\lib\net40\FSharp.Management.WMI.DesignTime.dll + + ..\..\packages\FSharp.Management\lib\net40\FSharp.Management.PowerShell.ExternalRuntime.exe True True @@ -172,8 +172,8 @@ True True - - ..\..\packages\FSharp.Management\lib\net40\FSharp.Management.dll + + ..\..\packages\FSharp.Management\lib\net40\FSharp.Management.WMI.DesignTime.dll True True diff --git a/tests/FSharp.Editing.VisualStudio.Tests/FSharp.Editing.VisualStudio.Tests.fsproj b/tests/FSharp.Editing.VisualStudio.Tests/FSharp.Editing.VisualStudio.Tests.fsproj index b4fe7128..693ea097 100644 --- a/tests/FSharp.Editing.VisualStudio.Tests/FSharp.Editing.VisualStudio.Tests.fsproj +++ b/tests/FSharp.Editing.VisualStudio.Tests/FSharp.Editing.VisualStudio.Tests.fsproj @@ -229,13 +229,13 @@ - - ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll True True - - ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll True True diff --git a/tests/data/NavigateToSource/NavigateToSource.fsproj b/tests/data/NavigateToSource/NavigateToSource.fsproj index 81b5dce7..1d04b7e3 100644 --- a/tests/data/NavigateToSource/NavigateToSource.fsproj +++ b/tests/data/NavigateToSource/NavigateToSource.fsproj @@ -97,6 +97,11 @@ + + ..\..\..\packages\build\Microsoft.Net.Http\lib\net40\System.Net.Http.dll + True + True + ..\..\..\packages\build\Microsoft.Net.Http\lib\net40\System.Net.Http.Extensions.dll True @@ -112,25 +117,20 @@ True True - - ..\..\..\packages\build\Microsoft.Net.Http\lib\net40\System.Net.Http.dll - True - True - + + True + ..\..\..\packages\build\Octokit\lib\net45\Octokit.dll True True - - True - @@ -144,14 +144,14 @@ + + True + ..\..\..\packages\build\Octokit\lib\portable-net45+wp80+win+wpa81\Octokit.dll True True - - True - From 9b9b7dadb0275246180f315d7fd772429482c194 Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Tue, 14 Feb 2017 12:07:50 +0100 Subject: [PATCH 4/9] fix printf specifier highlight column offset bug --- src/FSharp.Editing/Coloring/PrintfSpecifiersUsageGetter.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FSharp.Editing/Coloring/PrintfSpecifiersUsageGetter.fs b/src/FSharp.Editing/Coloring/PrintfSpecifiersUsageGetter.fs index 86b6a7f0..6031abd2 100644 --- a/src/FSharp.Editing/Coloring/PrintfSpecifiersUsageGetter.fs +++ b/src/FSharp.Editing/Coloring/PrintfSpecifiersUsageGetter.fs @@ -22,7 +22,7 @@ let getAll (input: ParseAndCheckResults) (onError: string -> unit): PrintfSpecif let specRangesAndArities = specRangesAndArities |> Array.map (fun (x, ar) -> - (Range.mkRange x.FileName x.Start (Range.mkPos x.EndLine (x.EndColumn + 1))), ar) + (Range.mkRange x.FileName x.Start (Range.mkPos x.EndLine (x.EndColumn))), ar) let printfFunctions = Printf.getAll input.ParseTree From d739a5e094ccda1f0a677f528032baca67e969ee Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Mon, 20 Feb 2017 13:44:32 +0100 Subject: [PATCH 5/9] * fix call to ParseAndCheckFileInProject in LanguageService.fs * remove files dictionary --- .../ProjectSystem/VSLanguageService.fs | 5 ++- .../ProjectSystem/LanguageService.fs | 36 +------------------ 2 files changed, 3 insertions(+), 38 deletions(-) diff --git a/src/FSharp.Editing.VisualStudio/ProjectSystem/VSLanguageService.fs b/src/FSharp.Editing.VisualStudio/ProjectSystem/VSLanguageService.fs index c3ccf980..d0c6ebcc 100644 --- a/src/FSharp.Editing.VisualStudio/ProjectSystem/VSLanguageService.fs +++ b/src/FSharp.Editing.VisualStudio/ProjectSystem/VSLanguageService.fs @@ -63,9 +63,8 @@ type VSLanguageService let statusBar = serviceProvider.GetService() statusBar.SetText Resource.languageServiceErrorMessage |> ignore - do instance.SetCriticalErrorHandler suggestRecoveryAfterFailure - openDocumentsTracker.DocumentChanged.Add instance.OnFileChanged - openDocumentsTracker.DocumentClosed.Add instance.OnFileClosed + do + instance.SetCriticalErrorHandler suggestRecoveryAfterFailure let mutable skipLexCache = false diff --git a/src/FSharp.Editing/ProjectSystem/LanguageService.fs b/src/FSharp.Editing/ProjectSystem/LanguageService.fs index afbb6b6d..15d4d091 100644 --- a/src/FSharp.Editing/ProjectSystem/LanguageService.fs +++ b/src/FSharp.Editing/ProjectSystem/LanguageService.fs @@ -147,25 +147,11 @@ type LanguageService (?backgroundCompilation: bool, ?projectCacheSize: int, ?fil | _ -> Environment.ExpandEnvironmentVariables "%HOMEDRIVE%%HOMEPATH%" Path.GetFileName path - let files = ConcurrentDictionary() - - let isResultObsolete fileName = - match files.TryGetValue fileName with - | true, Cancelled -> true - | _ -> false - let parseAndCheckFileInProject(filePath, source, options) = async { debug "[LanguageService] ParseAndCheckFileInProject - enter" let fixedFilePath = fixFileName filePath let! res = Async.Catch (checkerAsync <| fun x -> async { - try - // wait until the previous checking completed - while files.ContainsKey filePath && - (not (files.TryUpdate (filePath, BeingChecked, Checked) - || files.TryUpdate (filePath, BeingChecked, NeedChecking))) do - do! Async.Sleep 20 - debug "[LanguageService] Change state for %s to `BeingChecked`" filePath debug "[LanguageService] Parse and typecheck source..." return! x.ParseAndCheckFileInProject ( @@ -173,13 +159,7 @@ type LanguageService (?backgroundCompilation: bool, ?projectCacheSize: int, ?fil , fileversion = 0 , source = source , options = options - , textSnapshotInfo = (*IsResultObsolete*) (fun _ -> isResultObsolete filePath) - ) - finally - if files.TryUpdate (filePath, Checked, BeingChecked) then - debug "[LanguageService] %s: BeingChecked => Checked" filePath - elif files.TryUpdate (filePath, Checked, Cancelled) then - debug "[LanguageService] %s: Cancelled => Checked" filePath }) + ) }) debug "[LanguageService]: Parse completed" // Construct new typed parse result if the task succeeded @@ -202,20 +182,6 @@ type LanguageService (?backgroundCompilation: bool, ?projectCacheSize: int, ?fil return results } - member __.OnFileChanged filePath = - files.AddOrUpdate (filePath, NeedChecking, (fun _ oldState -> - match oldState with - | BeingChecked -> Cancelled - | Cancelled -> Cancelled - | NeedChecking -> NeedChecking - | Checked -> NeedChecking)) - |> debug "[LanguageService] %s changed: set status to %A" filePath - - member __.OnFileClosed filePath = - match files.TryRemove filePath with - | true, _ -> debug "[LanguageService] %s was removed from `files` dictionary" filePath - | _ -> () - /// Constructs options for the interactive checker for the given file in the project under the given configuration. member x.GetCheckerOptions(fileName, projFilename, source, files, args, referencedProjects, fscVersion) = let ext = Path.GetExtension(fileName) From 746d264424ac0171e4e50ef1af056142ea2612ff Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Mon, 20 Feb 2017 13:50:55 +0100 Subject: [PATCH 6/9] update Fantomas and release notes --- RELEASE_NOTES.md | 4 + paket.lock | 83 ++++++++++++++++++- .../AssemblyInfo.fs | 8 +- .../AssemblyInfo.fs | 8 +- src/FSharp.Editing/AssemblyInfo.fs | 8 +- .../Properties/AssemblyInfo.cs | 8 +- .../source.extension.vsixmanifest | 2 +- .../FSharp.Editing.Tests.fsproj | 59 ------------- tests/FSharp.Editing.Tests/app.config | 2 +- .../app.config | 2 +- 10 files changed, 102 insertions(+), 82 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index b4e9921c..8bf88e09 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,7 @@ +#### 2.5.7 - February 20 2017 + +* Updated FSharp.Compiler.Services, Fantomas and FSharpLint [#1496](https://github.com/fsprojects/VisualFSharpPowerTools/pull/1496) + #### 2.5.6 - February 3 2017 * Updated FsXaml and FSharp.ViewModule to prevent type provider conflicts diff --git a/paket.lock b/paket.lock index 9eb10461..19638bdb 100644 --- a/paket.lock +++ b/paket.lock @@ -3,10 +3,10 @@ STRATEGY: MAX FRAMEWORK: >= NET40 NUGET remote: http://www.nuget.org/api/v2 - Fantomas (2.4) - FSharp.Compiler.Service (>= 8.0) + Fantomas (2.5) + FSharp.Compiler.Service (>= 10.0.1) FParsec (1.0.2) - FSharp.Compiler.Service (10.0.1) + FSharp.Compiler.Service (10.0.3) System.Collections.Immutable (>= 1.2) System.Reflection.Metadata (>= 1.4.1-beta-24227-04) FSharp.Compiler.Service.ProjectCracker (10.0.1) @@ -124,13 +124,59 @@ GITHUB modules/Octokit/Octokit.fsx (4e4428bfe931a5f720e32f9d69289d25eb16d467) Octokit GROUP Test +FRAMEWORK: >= NET40 NUGET remote: http://www.nuget.org/api/v2 Foq (1.7.1) FsCheck (2.6.2) FSharp.Core (>= 3.1.2.5) - FSharp.Compiler.Service.ProjectCracker (8.0) + FSharp.Compiler.Service (10.0.3) - framework: >= net463 + System.Collections.Immutable (>= 1.2) + System.Reflection.Metadata (>= 1.4.1-beta-24227-04) + FSharp.Compiler.Service.ProjectCracker (10.0.3) + FSharp.Compiler.Service (>= 10.0.3) - framework: >= net463 + Microsoft.Build (>= 14.3) - framework: >= net463 + Microsoft.Build.Framework (>= 14.3) - framework: >= net463 + Microsoft.Build.Tasks.Core (>= 14.3) - framework: >= net463 + Microsoft.Build.Utilities.Core (>= 14.3) - framework: >= net463 + Microsoft.FSharp.Core.netcore (>= 1.0.0-alpha-161205) - framework: >= net463 + System.Runtime.Serialization.Json (>= 4.0.2) - framework: >= net463 FSharp.Core (4.0.0.1) + Microsoft.Build (14.3) - framework: >= net463 + Microsoft.Build.Framework (14.3) - framework: >= net45 + Microsoft.Build.Framework (14.3) + System.Collections (>= 4.0.11) - framework: >= net46 + System.Runtime (>= 4.1) - framework: >= net46 + System.Runtime.InteropServices (>= 4.1) - framework: >= net46 + Microsoft.Build.Tasks.Core (14.3) - framework: >= net463 + Microsoft.Build.Framework (14.3) - framework: >= net45 + Microsoft.Build.Utilities.Core (14.3) - framework: >= net45 + Microsoft.Build.Utilities.Core (14.3) + Microsoft.Build.Framework (14.3) - framework: >= net45 + Microsoft.FSharp.Core.netcore (1.0.0-rc-170122) - framework: >= net463 + System.Collections (>= 4.0.11) + System.Console (>= 4.0) + System.Diagnostics.Debug (>= 4.0.11) + System.Diagnostics.Tools (>= 4.0.1) + System.Globalization (>= 4.0.11) + System.IO (>= 4.1) + System.Linq (>= 4.1) + System.Linq.Expressions (>= 4.1) + System.Linq.Queryable (>= 4.0.1) + System.Net.Requests (>= 4.0.11) + System.Reflection (>= 4.1) + System.Reflection.Extensions (>= 4.0.1) + System.Resources.ResourceManager (>= 4.0.1) + System.Runtime (>= 4.1) + System.Runtime.Extensions (>= 4.1) + System.Runtime.Numerics (>= 4.0.1) + System.Text.RegularExpressions (>= 4.1) + System.Threading (>= 4.0.11) + System.Threading.Tasks (>= 4.0.11) + System.Threading.Tasks.Parallel (>= 4.0.1) + System.Threading.Thread (>= 4.0) + System.Threading.ThreadPool (>= 4.0.10) + System.Threading.Timer (>= 4.0.1) NUnit (3.5) NUnit.ConsoleRunner (3.5) NUnit.Extension.NUnitProjectLoader (3.5) @@ -145,6 +191,35 @@ NUGET NUnit.Extension.NUnitV2ResultWriter (>= 3.5) NUnit.Extension.TeamCityEventListener (>= 1.0.2) NUnit.Extension.VSProjectLoader (>= 3.5) + System.Collections (4.3) + System.Collections.Immutable (1.3.1) + System.Console (4.3) - framework: >= net463 + System.Diagnostics.Debug (4.3) - framework: >= net463 + System.Diagnostics.Tools (4.3) - framework: >= net463 + System.Globalization (4.3) - framework: >= net463 + System.IO (4.3) - framework: >= net463 + System.Linq (4.3) - framework: >= net463 + System.Linq.Expressions (4.3) - framework: >= net463 + System.Linq.Queryable (4.3) - framework: >= net463 + System.Net.Requests (4.3) - framework: >= net463 + System.Reflection (4.3) - framework: >= net463 + System.Reflection.Extensions (4.3) - framework: >= net463 + System.Reflection.Metadata (1.4.2) - framework: >= net463 + System.Collections.Immutable (>= 1.3.1) - framework: >= net45 + System.Resources.ResourceManager (4.3) - framework: >= net463 + System.Runtime (4.3) + System.Runtime.Extensions (4.3) - framework: >= net463 + System.Runtime.InteropServices (4.3) + System.Runtime (>= 4.3) - framework: >= net462 + System.Runtime.Numerics (4.3) - framework: >= net463 + System.Runtime.Serialization.Json (4.3) - framework: >= net463 + System.Text.RegularExpressions (4.3) - framework: >= net463 + System.Threading (4.3) - framework: >= net463 + System.Threading.Tasks (4.3) - framework: >= net463 + System.Threading.Tasks.Parallel (4.3) - framework: >= net463 + System.Threading.Thread (4.3) - framework: >= net463 + System.Threading.ThreadPool (4.3) - framework: >= net463 + System.Threading.Timer (4.3) - framework: >= net463 GROUP vssdk FRAMEWORK: >= NET45 diff --git a/src/FSharp.Editing.VisualStudio.Tests.v2015/AssemblyInfo.fs b/src/FSharp.Editing.VisualStudio.Tests.v2015/AssemblyInfo.fs index acece3f8..43788198 100644 --- a/src/FSharp.Editing.VisualStudio.Tests.v2015/AssemblyInfo.fs +++ b/src/FSharp.Editing.VisualStudio.Tests.v2015/AssemblyInfo.fs @@ -7,8 +7,8 @@ open System.Runtime.CompilerServices [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = @@ -16,5 +16,5 @@ module internal AssemblyVersionInformation = let [] AssemblyTitle = "FSharp.Editing.VisualStudio.v2015" let [] AssemblyProduct = "FSharpVSPowerTools" let [] AssemblyDescription = "A collection of additional commands for F# in Visual Studio" - let [] AssemblyVersion = "2.5.6" - let [] AssemblyFileVersion = "2.5.6" + let [] AssemblyVersion = "2.5.7" + let [] AssemblyFileVersion = "2.5.7" diff --git a/src/FSharp.Editing.VisualStudio/AssemblyInfo.fs b/src/FSharp.Editing.VisualStudio/AssemblyInfo.fs index 5fb9e2ab..b5d28268 100644 --- a/src/FSharp.Editing.VisualStudio/AssemblyInfo.fs +++ b/src/FSharp.Editing.VisualStudio/AssemblyInfo.fs @@ -7,8 +7,8 @@ open System.Runtime.CompilerServices [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = @@ -16,5 +16,5 @@ module internal AssemblyVersionInformation = let [] AssemblyTitle = "FSharp.Editing.VisualStudio" let [] AssemblyProduct = "FSharpVSPowerTools" let [] AssemblyDescription = "A collection of additional commands for F# in Visual Studio" - let [] AssemblyVersion = "2.5.6" - let [] AssemblyFileVersion = "2.5.6" + let [] AssemblyVersion = "2.5.7" + let [] AssemblyFileVersion = "2.5.7" diff --git a/src/FSharp.Editing/AssemblyInfo.fs b/src/FSharp.Editing/AssemblyInfo.fs index f09b39c2..d2fca6dd 100644 --- a/src/FSharp.Editing/AssemblyInfo.fs +++ b/src/FSharp.Editing/AssemblyInfo.fs @@ -7,8 +7,8 @@ open System.Runtime.CompilerServices [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = @@ -16,5 +16,5 @@ module internal AssemblyVersionInformation = let [] AssemblyTitle = "FSharp.Editing" let [] AssemblyProduct = "FSharpVSPowerTools" let [] AssemblyDescription = "A collection of additional commands for F# in Visual Studio" - let [] AssemblyVersion = "2.5.6" - let [] AssemblyFileVersion = "2.5.6" + let [] AssemblyVersion = "2.5.7" + let [] AssemblyFileVersion = "2.5.7" diff --git a/src/FSharpVSPowerTools/Properties/AssemblyInfo.cs b/src/FSharpVSPowerTools/Properties/AssemblyInfo.cs index f6c98bb6..150ba7d7 100644 --- a/src/FSharpVSPowerTools/Properties/AssemblyInfo.cs +++ b/src/FSharpVSPowerTools/Properties/AssemblyInfo.cs @@ -6,15 +6,15 @@ [assembly: AssemblyTitleAttribute("FSharpVSPowerTools")] [assembly: AssemblyProductAttribute("FSharpVSPowerTools")] [assembly: AssemblyDescriptionAttribute("A collection of additional commands for F# in Visual Studio")] -[assembly: AssemblyVersionAttribute("2.5.6")] -[assembly: AssemblyFileVersionAttribute("2.5.6")] +[assembly: AssemblyVersionAttribute("2.5.7")] +[assembly: AssemblyFileVersionAttribute("2.5.7")] namespace System { internal static class AssemblyVersionInformation { internal const System.String InternalsVisibleTo = "FSharp.Editing.VisualStudio.Tests"; internal const System.String AssemblyTitle = "FSharpVSPowerTools"; internal const System.String AssemblyProduct = "FSharpVSPowerTools"; internal const System.String AssemblyDescription = "A collection of additional commands for F# in Visual Studio"; - internal const System.String AssemblyVersion = "2.5.6"; - internal const System.String AssemblyFileVersion = "2.5.6"; + internal const System.String AssemblyVersion = "2.5.7"; + internal const System.String AssemblyFileVersion = "2.5.7"; } } diff --git a/src/FSharpVSPowerTools/source.extension.vsixmanifest b/src/FSharpVSPowerTools/source.extension.vsixmanifest index ad309db0..5884f427 100644 --- a/src/FSharpVSPowerTools/source.extension.vsixmanifest +++ b/src/FSharpVSPowerTools/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + Visual F# Power Tools A collection of additional commands for F# in Visual Studio https://github.com/fsprojects/VisualFSharpPowerTools diff --git a/tests/FSharp.Editing.Tests/FSharp.Editing.Tests.fsproj b/tests/FSharp.Editing.Tests/FSharp.Editing.Tests.fsproj index 6f0f09d1..855ed1c2 100644 --- a/tests/FSharp.Editing.Tests/FSharp.Editing.Tests.fsproj +++ b/tests/FSharp.Editing.Tests/FSharp.Editing.Tests.fsproj @@ -217,58 +217,8 @@ - - - - ..\..\packages\test\FsCheck\lib\portable-net45+netcore45\FsCheck.dll - True - True - - - - - - - ..\..\packages\test\FsCheck\lib\portable-net45+netcore45+wp8\FsCheck.dll - True - True - - - - - - - ..\..\packages\test\FsCheck\lib\portable-net45+netcore45+wpa81+wp8\FsCheck.dll - True - True - - - - - - - ..\..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll - True - True - - - ..\..\packages\test\NUnit\lib\net20\nunit.framework.dll - True - True - - - - - - - ..\..\packages\test\NUnit\lib\net35\nunit.framework.dll - True - True - - - @@ -287,14 +237,5 @@ - - - - ..\..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll - True - True - - - \ No newline at end of file diff --git a/tests/FSharp.Editing.Tests/app.config b/tests/FSharp.Editing.Tests/app.config index 572f3ac3..8a1c7f19 100644 --- a/tests/FSharp.Editing.Tests/app.config +++ b/tests/FSharp.Editing.Tests/app.config @@ -11,7 +11,7 @@ True - + diff --git a/tests/FSharp.Editing.VisualStudio.Tests/app.config b/tests/FSharp.Editing.VisualStudio.Tests/app.config index db82a7bf..fd413fe3 100644 --- a/tests/FSharp.Editing.VisualStudio.Tests/app.config +++ b/tests/FSharp.Editing.VisualStudio.Tests/app.config @@ -48,7 +48,7 @@ True - + From 7cf2c2cacb64f0feacbfd431e99dad7023f7e072 Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Thu, 23 Feb 2017 04:35:32 +0100 Subject: [PATCH 7/9] update to fcs 11 (more tests failing to figure out) --- paket.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/paket.lock b/paket.lock index 19638bdb..3fbbe4a0 100644 --- a/paket.lock +++ b/paket.lock @@ -6,7 +6,7 @@ NUGET Fantomas (2.5) FSharp.Compiler.Service (>= 10.0.1) FParsec (1.0.2) - FSharp.Compiler.Service (10.0.3) + FSharp.Compiler.Service (11.0.2) System.Collections.Immutable (>= 1.2) System.Reflection.Metadata (>= 1.4.1-beta-24227-04) FSharp.Compiler.Service.ProjectCracker (10.0.1) @@ -130,11 +130,11 @@ NUGET Foq (1.7.1) FsCheck (2.6.2) FSharp.Core (>= 3.1.2.5) - FSharp.Compiler.Service (10.0.3) - framework: >= net463 + FSharp.Compiler.Service (11.0.2) - framework: >= net463 System.Collections.Immutable (>= 1.2) System.Reflection.Metadata (>= 1.4.1-beta-24227-04) - FSharp.Compiler.Service.ProjectCracker (10.0.3) - FSharp.Compiler.Service (>= 10.0.3) - framework: >= net463 + FSharp.Compiler.Service.ProjectCracker (11.0.2) + FSharp.Compiler.Service (>= 11.0.2) - framework: >= net463 Microsoft.Build (>= 14.3) - framework: >= net463 Microsoft.Build.Framework (>= 14.3) - framework: >= net463 Microsoft.Build.Tasks.Core (>= 14.3) - framework: >= net463 From 5716cf87cdc7b266d3a9b17efa446aa8d2299c4c Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Sat, 25 Feb 2017 00:25:35 +0100 Subject: [PATCH 8/9] found that other +1 which were making the printf format specifier colorization buggy --- .../Symbols/SourceCodeClassifier.fs | 2 +- .../SymbolClassifierTests.fs | 62 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/FSharp.Editing/Symbols/SourceCodeClassifier.fs b/src/FSharp.Editing/Symbols/SourceCodeClassifier.fs index 0a84f0dd..19b5f8e3 100644 --- a/src/FSharp.Editing/Symbols/SourceCodeClassifier.fs +++ b/src/FSharp.Editing/Symbols/SourceCodeClassifier.fs @@ -345,7 +345,7 @@ module SourceCodeClassifier = { SymbolKind = SymbolKind.Other Line = r.StartLine StartCol = r.StartColumn - EndCol = r.EndColumn + 1 }})) + EndCol = r.EndColumn }})) |> Option.getOrElse [||] spansBasedOnSymbolsUses diff --git a/tests/FSharp.Editing.Tests/SymbolClassifierTests.fs b/tests/FSharp.Editing.Tests/SymbolClassifierTests.fs index 606839d3..bd1fe427 100644 --- a/tests/FSharp.Editing.Tests/SymbolClassifierTests.fs +++ b/tests/FSharp.Editing.Tests/SymbolClassifierTests.fs @@ -890,8 +890,8 @@ let _ = printfn "%s %s" do printfn "%6d %% % 06d" 1 2 """ => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15 ] - 3, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 17, 20; Cat.Printf, 20, 23 ] - 4, [ Cat.Function, 3, 10; Cat.Printf, 12, 16; Cat.Printf, 16, 19; Cat.Printf, 20, 26 ]] + 3, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 17, 19; Cat.Printf, 20, 22 ] + 4, [ Cat.Function, 3, 10; Cat.Printf, 12, 15; Cat.Printf, 16, 18; Cat.Printf, 20, 25 ]] [] let ``printf formatters in try / with / finally``() = @@ -905,10 +905,10 @@ try with _ -> failwithf "foo %d bar" 0 """ - => [ 3, [ Cat.Operator, 10, 11; Cat.Function, 12, 19; Cat.Printf, 25, 28 ] - 5, [ Cat.Function, 8, 15; Cat.Printf, 21, 24 ] - 7, [ Cat.Function, 8, 14; Cat.Printf, 20, 23 ] - 9, [ Cat.Function, 4, 13; Cat.Printf, 19, 22 ]] + => [ 3, [ Cat.Operator, 10, 11; Cat.Function, 12, 19; Cat.Printf, 25, 27 ] + 5, [ Cat.Function, 8, 15; Cat.Printf, 21, 23 ] + 7, [ Cat.Function, 8, 14; Cat.Printf, 20, 22 ] + 9, [ Cat.Function, 4, 13; Cat.Printf, 19, 21 ]] [] let ``printf formatters in record / DU members``() = @@ -926,10 +926,10 @@ type DU = DU override __.ToString() = sprintf "%d" 1 """ - => [ 5, [ Cat.Function, 12, 19; Cat.Printf, 21, 24 ] - 7, [ Cat.Function, 12, 19; Cat.Printf, 21, 24 ] - 11, [ Cat.Function, 12, 19; Cat.Printf, 21, 24 ] - 13, [ Cat.Function, 12, 19; Cat.Printf, 21, 24 ]] + => [ 5, [ Cat.Function, 12, 19; Cat.Printf, 21, 23 ] + 7, [ Cat.Function, 12, 19; Cat.Printf, 21, 23 ] + 11, [ Cat.Function, 12, 19; Cat.Printf, 21, 23 ] + 13, [ Cat.Function, 12, 19; Cat.Printf, 21, 23 ]] [] let ``printf formatters in extension members``() = @@ -938,19 +938,19 @@ type System.Object with member __.M1 = sprintf "%A" """ - => [ 4, [ Cat.Function, 8, 15; Cat.Printf, 17, 20 ]] + => [ 4, [ Cat.Function, 8, 15; Cat.Printf, 17, 19 ]] [] let ``printf formatters in escaped string``() = """ let _ = sprintf @"%A" """ - => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 18, 21 ]] + => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 18, 20 ]] [] let ``printf formatters in triple-quoted string``() = "let _ = sprintf \"\"\"%A\"\"\"" - => [ 1, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 19, 22 ]] + => [ 1, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 19, 21 ]] [] let ``multi-line printf formatters``() = @@ -959,9 +959,9 @@ let _ = printfn "foo %s %d %A bar %i" """ - => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 21, 24; Cat.Printf, 24, 27 ] - 3, [ Cat.Printf, 17, 20 ] - 4, [ Cat.Printf, 0, 3 ] ] + => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 21, 23; Cat.Printf, 24, 26 ] + 3, [ Cat.Printf, 17, 19 ] + 4, [ Cat.Printf, 0, 2 ] ] [] let ``printf formatters in for expressions``() = @@ -974,10 +974,10 @@ for _ in (sprintf "%d" 1).ToCharArray() do |> ignore """ - => [ 2, [ Cat.Function, 10, 17; Cat.Printf, 19, 22; Cat.Function, 26, 37 ] - 3, [ Cat.Function, 4, 11; Cat.Printf, 13, 16] - 5, [ Cat.Function, 12, 19; Cat.Printf, 21, 24; Cat.Function, 28, 39 ] - 6, [ Cat.Function, 10, 17; Cat.Printf, 19, 22] + => [ 2, [ Cat.Function, 10, 17; Cat.Printf, 19, 21; Cat.Function, 26, 37 ] + 3, [ Cat.Function, 4, 11; Cat.Printf, 13, 15] + 5, [ Cat.Function, 12, 19; Cat.Printf, 21, 23; Cat.Function, 28, 39 ] + 6, [ Cat.Function, 10, 17; Cat.Printf, 19, 21] ] [] @@ -985,7 +985,7 @@ let ``printf formatters in quoted expressions``() = """ let _ = <@ sprintf "%A" @> """ - => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 11, 18; Cat.Printf, 20, 23; Cat.Quotation, 8, 26 ]] + => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 11, 18; Cat.Printf, 20, 22; Cat.Quotation, 8, 26 ]] [] let ``printf formatters if printf function is namespace qualified``() = @@ -994,8 +994,8 @@ let _ = Microsoft.FSharp.Core.Printf.printf "%A" 0 open Microsoft.FSharp.Core let _ = Printf.printf "%A" 0 """ - => [ 2, [ Cat.Operator, 6, 7; Cat.Module, 30, 36; Cat.Function, 37, 43; Cat.Printf, 45, 48 ] - 4, [ Cat.Operator, 6, 7; Cat.Module, 8, 14; Cat.Function, 15, 21; Cat.Printf, 23, 26 ]] + => [ 2, [ Cat.Operator, 6, 7; Cat.Module, 30, 36; Cat.Function, 37, 43; Cat.Printf, 45, 47 ] + 4, [ Cat.Operator, 6, 7; Cat.Module, 8, 14; Cat.Function, 15, 21; Cat.Printf, 23, 25 ]] [] let ``printf formatters are not colorized in plane strings``() = @@ -1011,9 +1011,9 @@ let _ = fprintf null "%A" 0 let _ = Microsoft.FSharp.Core.Printf.fprintf null "%A" 0 let _ = fprintfn null "%A" 0 """ - => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 22, 25 ] - 3, [ Cat.Operator, 6, 7; Cat.Module, 30, 36; Cat.Function, 37, 44; Cat.Printf, 51, 54 ] - 4, [ Cat.Operator, 6, 7; Cat.Function, 8, 16; Cat.Printf, 23, 26 ]] + => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 22, 24 ] + 3, [ Cat.Operator, 6, 7; Cat.Module, 30, 36; Cat.Function, 37, 44; Cat.Printf, 51, 53 ] + 4, [ Cat.Operator, 6, 7; Cat.Function, 8, 16; Cat.Printf, 23, 25 ]] [] let ``kprintf and bprintf formatters``() = @@ -1021,15 +1021,15 @@ let ``kprintf and bprintf formatters``() = let _ = Printf.kprintf (fun _ -> ()) "%A" 1 let _ = Printf.bprintf null "%A" 1 """ - => [ 2, [ Cat.Operator, 6, 7; Cat.Module, 8, 14; Cat.Function, 15, 22; Cat.Printf, 38, 41] - 3, [ Cat.Operator, 6, 7; Cat.Module, 8, 14; Cat.Function, 15, 22; Cat.Printf, 29, 32]] + => [ 2, [ Cat.Operator, 6, 7; Cat.Module, 8, 14; Cat.Function, 15, 22; Cat.Printf, 38, 40] + 3, [ Cat.Operator, 6, 7; Cat.Module, 8, 14; Cat.Function, 15, 22; Cat.Printf, 29, 31]] [] let ``wildcards in printf formatters``() = """ let _ = sprintf "%*d" 1 """ - => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 17, 21 ]] + => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 17, 20 ]] [] let ``float printf formatters``() = @@ -1037,8 +1037,8 @@ let ``float printf formatters``() = let _ = sprintf "%7.1f" 1.0 let _ = sprintf "%-8.1e+567" 1.0 """ - => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 17, 23] - 3, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 17, 24]] + => [ 2, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 17, 22] + 3, [ Cat.Operator, 6, 7; Cat.Function, 8, 15; Cat.Printf, 17, 23]] [] let ``malformed printf formatters``() = From ad42eaaca61cd9f432060e54adcd2b2d28a44c44 Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Sat, 25 Feb 2017 00:29:21 +0100 Subject: [PATCH 9/9] update FCS & co nuget packages (and fix FSharp.Core) --- paket.dependencies | 6 +- paket.lock | 106 ++-------- .../FSharp.Editing.VisualStudio.Tests.fsproj | 197 ++++++++++++++++-- .../app.config | 5 + .../paket.references | 2 +- 5 files changed, 202 insertions(+), 114 deletions(-) diff --git a/paket.dependencies b/paket.dependencies index ebbf84be..185b7c7b 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -4,7 +4,8 @@ strategy: max framework >= net40 nuget Fantomas nuget FSharp.Compiler.Service -nuget FSharp.Core +nuget FSharp.Compiler.Service.ProjectCracker # fslint also depends on it, and conflicted with standalone dependency in Test group which is now removed +nuget FSharp.Core = 4.0.0.1 nuget FSharp.Data nuget FSharp.Management nuget FSharp.ViewModule.Core @@ -45,7 +46,7 @@ group Test framework >= net40 nuget Foq nuget FsCheck - nuget FSharp.Compiler.Service.ProjectCracker + nuget FSharp.Core = 4.0.0.1 nuget NUnit nuget NUnit.Runners @@ -54,6 +55,7 @@ group Build framework >= net40 nuget canopy nuget FAKE + nuget FSharp.Core = 4.0.0.1 nuget FSharp.Formatting nuget Nuget.CommandLine nuget Selenium.WebDriver.ChromeDriver diff --git a/paket.lock b/paket.lock index 3fbbe4a0..799392fa 100644 --- a/paket.lock +++ b/paket.lock @@ -6,11 +6,11 @@ NUGET Fantomas (2.5) FSharp.Compiler.Service (>= 10.0.1) FParsec (1.0.2) - FSharp.Compiler.Service (11.0.2) + FSharp.Compiler.Service (11.0.4) System.Collections.Immutable (>= 1.2) System.Reflection.Metadata (>= 1.4.1-beta-24227-04) - FSharp.Compiler.Service.ProjectCracker (10.0.1) - FSharp.Compiler.Service (>= 10.0.1) - framework: >= net463 + FSharp.Compiler.Service.ProjectCracker (11.0.4) + FSharp.Compiler.Service (>= 11.0.4) - framework: >= net463 Microsoft.Build (>= 14.3) - framework: >= net463 Microsoft.Build.Framework (>= 14.3) - framework: >= net463 Microsoft.Build.Tasks.Core (>= 14.3) - framework: >= net463 @@ -95,12 +95,13 @@ NUGET System.Threading.Timer (4.3) - framework: >= net463 GROUP Build +FRAMEWORK: >= NET40 NUGET remote: http://www.nuget.org/api/v2 - canopy (0.9.62) + canopy (1.1.4) FSharp.Core (>= 3.0.2) - Selenium.WebDriver (2.53.1) - FAKE (4.41.8) + Selenium.WebDriver (3.0) + FAKE (4.50.1) FSharp.Compiler.Service (2.0.0.6) FSharp.Core (4.0.0.1) FSharp.Formatting (2.14.4) @@ -108,21 +109,21 @@ NUGET FSharpVSPowerTools.Core (>= 2.3 < 2.4) FSharpVSPowerTools.Core (2.3) FSharp.Compiler.Service (>= 2.0.0.3) - Microsoft.Bcl (1.1.10) - framework: net10, net11, net20, net30, net35, net40, net40-full + Microsoft.Bcl (1.1.10) - framework: 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.Build (1.0.21) - import_targets: false + Microsoft.Net.Http (2.2.29) - framework: net40, net40-full Microsoft.Bcl (>= 1.1.10) Microsoft.Bcl.Build (>= 1.0.14) - NuGet.CommandLine (3.4.3) + NuGet.CommandLine (3.5) Octokit (0.23) - Microsoft.Net.Http - framework: net10, net11, net20, net30, net35, net40, net40-full - Selenium.WebDriver (2.53.1) - Selenium.WebDriver.ChromeDriver (2.24) + Microsoft.Net.Http - framework: net40, net40-full + Selenium.WebDriver (3.0) + Selenium.WebDriver.ChromeDriver (2.27) GITHUB remote: fsharp/FAKE - modules/Octokit/Octokit.fsx (4e4428bfe931a5f720e32f9d69289d25eb16d467) - Octokit + modules/Octokit/Octokit.fsx (33e702f6c220f3facaf41f20dae03a912eeebf9a) + Octokit (>= 0.20) GROUP Test FRAMEWORK: >= NET40 NUGET @@ -130,53 +131,7 @@ NUGET Foq (1.7.1) FsCheck (2.6.2) FSharp.Core (>= 3.1.2.5) - FSharp.Compiler.Service (11.0.2) - framework: >= net463 - System.Collections.Immutable (>= 1.2) - System.Reflection.Metadata (>= 1.4.1-beta-24227-04) - FSharp.Compiler.Service.ProjectCracker (11.0.2) - FSharp.Compiler.Service (>= 11.0.2) - framework: >= net463 - Microsoft.Build (>= 14.3) - framework: >= net463 - Microsoft.Build.Framework (>= 14.3) - framework: >= net463 - Microsoft.Build.Tasks.Core (>= 14.3) - framework: >= net463 - Microsoft.Build.Utilities.Core (>= 14.3) - framework: >= net463 - Microsoft.FSharp.Core.netcore (>= 1.0.0-alpha-161205) - framework: >= net463 - System.Runtime.Serialization.Json (>= 4.0.2) - framework: >= net463 FSharp.Core (4.0.0.1) - Microsoft.Build (14.3) - framework: >= net463 - Microsoft.Build.Framework (14.3) - framework: >= net45 - Microsoft.Build.Framework (14.3) - System.Collections (>= 4.0.11) - framework: >= net46 - System.Runtime (>= 4.1) - framework: >= net46 - System.Runtime.InteropServices (>= 4.1) - framework: >= net46 - Microsoft.Build.Tasks.Core (14.3) - framework: >= net463 - Microsoft.Build.Framework (14.3) - framework: >= net45 - Microsoft.Build.Utilities.Core (14.3) - framework: >= net45 - Microsoft.Build.Utilities.Core (14.3) - Microsoft.Build.Framework (14.3) - framework: >= net45 - Microsoft.FSharp.Core.netcore (1.0.0-rc-170122) - framework: >= net463 - System.Collections (>= 4.0.11) - System.Console (>= 4.0) - System.Diagnostics.Debug (>= 4.0.11) - System.Diagnostics.Tools (>= 4.0.1) - System.Globalization (>= 4.0.11) - System.IO (>= 4.1) - System.Linq (>= 4.1) - System.Linq.Expressions (>= 4.1) - System.Linq.Queryable (>= 4.0.1) - System.Net.Requests (>= 4.0.11) - System.Reflection (>= 4.1) - System.Reflection.Extensions (>= 4.0.1) - System.Resources.ResourceManager (>= 4.0.1) - System.Runtime (>= 4.1) - System.Runtime.Extensions (>= 4.1) - System.Runtime.Numerics (>= 4.0.1) - System.Text.RegularExpressions (>= 4.1) - System.Threading (>= 4.0.11) - System.Threading.Tasks (>= 4.0.11) - System.Threading.Tasks.Parallel (>= 4.0.1) - System.Threading.Thread (>= 4.0) - System.Threading.ThreadPool (>= 4.0.10) - System.Threading.Timer (>= 4.0.1) NUnit (3.5) NUnit.ConsoleRunner (3.5) NUnit.Extension.NUnitProjectLoader (3.5) @@ -191,35 +146,6 @@ NUGET NUnit.Extension.NUnitV2ResultWriter (>= 3.5) NUnit.Extension.TeamCityEventListener (>= 1.0.2) NUnit.Extension.VSProjectLoader (>= 3.5) - System.Collections (4.3) - System.Collections.Immutable (1.3.1) - System.Console (4.3) - framework: >= net463 - System.Diagnostics.Debug (4.3) - framework: >= net463 - System.Diagnostics.Tools (4.3) - framework: >= net463 - System.Globalization (4.3) - framework: >= net463 - System.IO (4.3) - framework: >= net463 - System.Linq (4.3) - framework: >= net463 - System.Linq.Expressions (4.3) - framework: >= net463 - System.Linq.Queryable (4.3) - framework: >= net463 - System.Net.Requests (4.3) - framework: >= net463 - System.Reflection (4.3) - framework: >= net463 - System.Reflection.Extensions (4.3) - framework: >= net463 - System.Reflection.Metadata (1.4.2) - framework: >= net463 - System.Collections.Immutable (>= 1.3.1) - framework: >= net45 - System.Resources.ResourceManager (4.3) - framework: >= net463 - System.Runtime (4.3) - System.Runtime.Extensions (4.3) - framework: >= net463 - System.Runtime.InteropServices (4.3) - System.Runtime (>= 4.3) - framework: >= net462 - System.Runtime.Numerics (4.3) - framework: >= net463 - System.Runtime.Serialization.Json (4.3) - framework: >= net463 - System.Text.RegularExpressions (4.3) - framework: >= net463 - System.Threading (4.3) - framework: >= net463 - System.Threading.Tasks (4.3) - framework: >= net463 - System.Threading.Tasks.Parallel (4.3) - framework: >= net463 - System.Threading.Thread (4.3) - framework: >= net463 - System.Threading.ThreadPool (4.3) - framework: >= net463 - System.Threading.Timer (4.3) - framework: >= net463 GROUP vssdk FRAMEWORK: >= NET45 diff --git a/tests/FSharp.Editing.VisualStudio.Tests/FSharp.Editing.VisualStudio.Tests.fsproj b/tests/FSharp.Editing.VisualStudio.Tests/FSharp.Editing.VisualStudio.Tests.fsproj index 693ea097..505ecb73 100644 --- a/tests/FSharp.Editing.VisualStudio.Tests/FSharp.Editing.VisualStudio.Tests.fsproj +++ b/tests/FSharp.Editing.VisualStudio.Tests/FSharp.Editing.VisualStudio.Tests.fsproj @@ -77,11 +77,17 @@ --> - - + + + + True + + + True + True @@ -286,6 +292,39 @@ + + + + + ..\..\packages\Microsoft.Build.Tasks.Core\lib\net45\Microsoft.Build.Tasks.Core.dll + True + True + + + + + + + + + ..\..\packages\Microsoft.Build.Utilities.Core\lib\net45\Microsoft.Build.Utilities.Core.dll + True + True + + + + + + + + + ..\..\packages\Microsoft.FSharp.Core.netcore\lib\netstandard1.6\FSharp.Core.dll + True + True + + + + @@ -297,6 +336,61 @@ + + + + + ..\..\packages\System.Console\lib\net46\System.Console.dll + True + True + + + + + + + + + ..\..\packages\System.IO\lib\net462\System.IO.dll + True + True + + + + + + + + + ..\..\packages\System.Linq\lib\net463\System.Linq.dll + True + True + + + + + + + + + ..\..\packages\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll + True + True + + + + + + + + + ..\..\packages\System.Reflection\lib\net462\System.Reflection.dll + True + True + + + + @@ -309,19 +403,21 @@ - + - - ..\..\packages\test\Foq\Lib\net40\Foq.dll + + ..\..\packages\System.Runtime\lib\net462\System.Runtime.dll True True - + + + - - ..\..\packages\test\Foq\Lib\net45\Foq.dll + + ..\..\packages\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll True True @@ -329,51 +425,110 @@ - + - - ..\..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll + + ..\..\packages\System.Runtime.InteropServices\lib\net462\System.Runtime.InteropServices.dll True True - - ..\..\packages\test\NUnit\lib\net20\nunit.framework.dll + + + + + + ..\..\packages\System.Runtime.InteropServices\lib\net463\System.Runtime.InteropServices.dll True True - + + + - - ..\..\packages\test\NUnit\lib\net35\nunit.framework.dll + + True + + + + + + + + + True + + + + + + + + + ..\..\packages\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll + True + True + + + + + + + + + ..\..\packages\System.Threading.Thread\lib\net46\System.Threading.Thread.dll True True + + + + + + ..\..\packages\System.Threading.ThreadPool\lib\net46\System.Threading.ThreadPool.dll + True + True + + + + + - - ..\..\packages\test\NUnit\lib\net40\nunit.framework.dll + + ..\..\packages\test\Foq\Lib\net40\Foq.dll True True + + + ..\..\packages\test\Foq\Lib\net45\Foq.dll + True + True + + + + + + - ..\..\packages\test\NUnit\lib\net45\nunit.framework.dll + ..\..\packages\test\NUnit\lib\net40\nunit.framework.dll True True - + - ..\..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll + ..\..\packages\test\NUnit\lib\net45\nunit.framework.dll True True diff --git a/tests/FSharp.Editing.VisualStudio.Tests/app.config b/tests/FSharp.Editing.VisualStudio.Tests/app.config index fd413fe3..b3f5c3e8 100644 --- a/tests/FSharp.Editing.VisualStudio.Tests/app.config +++ b/tests/FSharp.Editing.VisualStudio.Tests/app.config @@ -50,5 +50,10 @@ + + True + + + diff --git a/tests/FSharp.Editing.VisualStudio.Tests/paket.references b/tests/FSharp.Editing.VisualStudio.Tests/paket.references index b16a1286..e3ab02f2 100644 --- a/tests/FSharp.Editing.VisualStudio.Tests/paket.references +++ b/tests/FSharp.Editing.VisualStudio.Tests/paket.references @@ -1,4 +1,5 @@ FSharp.Compiler.Service +FSharp.Compiler.Service.ProjectCracker FSharp.ViewModule.Core FSharpLint.Core FSharp.Core @@ -7,4 +8,3 @@ group Test Foq NUnit - FSharp.Compiler.Service.ProjectCracker \ No newline at end of file