From fc5295deabe41a54f3cf10185d197a8e9b75eb58 Mon Sep 17 00:00:00 2001 From: Vasily Kirichenko Date: Mon, 17 Oct 2016 15:01:57 +0300 Subject: [PATCH 1/6] update FCS to v.8 and all the packages as well --- paket.lock | 199 ++++++-- .../AssemblyInfo.fs | 9 +- .../FSharp.Editing.VisualStudio.v2015.fsproj | 432 +++++++++++++++++ .../AssemblyInfo.fs | 9 +- .../FSharp.Editing.VisualStudio.fsproj | 437 +++++++++++++++++- .../Navigation/NavigableItemCache.fs | 2 +- src/FSharp.Editing/AssemblyInfo.fs | 9 +- .../UnionPatternMatchCaseGenerator.fs | 22 +- src/FSharp.Editing/Coloring/DepthParser.fs | 3 +- .../Coloring/UnopenedNamespacesResolver.fs | 2 +- src/FSharp.Editing/Common/Lexer.fs | 4 +- src/FSharp.Editing/Common/UntypedAstUtils.fs | 2 +- src/FSharp.Editing/Common/XmlDocParser.fs | 3 +- src/FSharp.Editing/FSharp.Editing.fsproj | 432 +++++++++++++++++ .../TaskListCommentExtractor.fs | 2 +- .../FSharpVSPowerTools.csproj | 432 +++++++++++++++++ .../PowerToolsCommandsPackage.cs | 2 +- .../Properties/AssemblyInfo.cs | 6 + .../FSharp.Editing.Tests.fsproj | 432 +++++++++++++++++ tests/FSharp.Editing.Tests/app.config | 2 +- .../FSharp.Editing.VisualStudio.Tests.fsproj | 432 +++++++++++++++++ .../app.config | 2 +- 22 files changed, 2813 insertions(+), 62 deletions(-) diff --git a/paket.lock b/paket.lock index 3350db72..28b2780f 100644 --- a/paket.lock +++ b/paket.lock @@ -5,29 +5,160 @@ NUGET Fantomas (2.3) FSharp.Compiler.Service (>= 5.0) FParsec (1.0.2) - FSharp.Compiler.Service (5.0) - FSharp.Compiler.Service.ProjectCracker (3.0) + FSharp.Compiler.Service (8.0) + 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.1) - Zlib.Portable (>= 1.11) - framework: portable-net45+sl5+win8, portable-net45+win8, portable-net45+win8+wp8+wpa81 - FSharp.Management (0.3) + 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 (0.9.9.3) - FSharpLint.Core (0.4.1-beta) - FParsec - FSharp.Compiler.Service - FSharp.Compiler.Service.ProjectCracker - FsPickler (2.3) - FsXaml.Wpf (2.0) + FSharpLint.Core (0.4.9) + FParsec (>= 1.0.2) + FSharp.Compiler.Service (>= 6.0) + FSharp.Compiler.Service.ProjectCracker (>= 6.0) + FsPickler (3.2) + FsXaml.Wpf (2.1) + 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) - Zlib.Portable (1.11) - framework: portable-net45+sl5+win8, portable-net45+win8, portable-net45+win8+wp8+wpa81 + 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 GROUP Build NUGET remote: http://www.nuget.org/api/v2 - canopy (0.9.56) + canopy (0.9.62) FSharp.Core (>= 3.0.2) Selenium.WebDriver (2.53.1) - FAKE (4.31.1) + FAKE (4.41.6) FSharp.Compiler.Service (2.0.0.6) FSharp.Core (4.0.0.1) FSharp.Formatting (2.14.4) @@ -42,36 +173,36 @@ NUGET Microsoft.Bcl (>= 1.1.10) Microsoft.Bcl.Build (>= 1.0.14) NuGet.CommandLine (3.4.3) - Octokit (0.20) + Octokit (0.23) Microsoft.Net.Http - framework: net10, net11, net20, net30, net35, net40, net40-full Selenium.WebDriver (2.53.1) - Selenium.WebDriver.ChromeDriver (2.22) + Selenium.WebDriver.ChromeDriver (2.24) GITHUB remote: fsharp/FAKE - modules/Octokit/Octokit.fsx (40dd0ff66fc379474450f93fd1ba545f6cf6c121) - Octokit + modules/Octokit/Octokit.fsx (889bda9367dfb24f9abb524165a0dbe2cdd86252) + Octokit (>= 0.20) GROUP Test NUGET remote: http://www.nuget.org/api/v2 Foq (1.7.1) - FsCheck (2.5) + FsCheck (2.6.2) FSharp.Core (>= 3.1.2.5) - FSharp.Compiler.Service.ProjectCracker (3.0) + FSharp.Compiler.Service.ProjectCracker (8.0) FSharp.Core (4.0.0.1) - NUnit (3.4.1) - NUnit.ConsoleRunner (3.4.1) - NUnit.Extension.NUnitProjectLoader (3.4.1) - NUnit.Extension.NUnitV2Driver (3.4.1) - NUnit.Extension.NUnitV2ResultWriter (3.4.1) - NUnit.Extension.TeamCityEventListener (1.0.1) - NUnit.Extension.VSProjectLoader (3.4.1) - NUnit.Runners (3.4.1) - NUnit.ConsoleRunner (>= 3.4.1) - NUnit.Extension.NUnitProjectLoader (>= 3.4.1) - NUnit.Extension.NUnitV2Driver (>= 3.4.1) - NUnit.Extension.NUnitV2ResultWriter (>= 3.4.1) - NUnit.Extension.TeamCityEventListener (>= 1.0.1) - NUnit.Extension.VSProjectLoader (>= 3.4.1) + NUnit (3.5) + NUnit.ConsoleRunner (3.5) + NUnit.Extension.NUnitProjectLoader (3.5) + NUnit.Extension.NUnitV2Driver (3.5) + NUnit.Extension.NUnitV2ResultWriter (3.5) + NUnit.Extension.TeamCityEventListener (1.0.2) + NUnit.Extension.VSProjectLoader (3.5) + NUnit.Runners (3.5) + NUnit.ConsoleRunner (>= 3.5) + NUnit.Extension.NUnitProjectLoader (>= 3.5) + NUnit.Extension.NUnitV2Driver (>= 3.5) + NUnit.Extension.NUnitV2ResultWriter (>= 3.5) + NUnit.Extension.TeamCityEventListener (>= 1.0.2) + NUnit.Extension.VSProjectLoader (>= 3.5) 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 eae11d20..03e0b860 100644 --- a/src/FSharp.Editing.VisualStudio.Tests.v2015/AssemblyInfo.fs +++ b/src/FSharp.Editing.VisualStudio.Tests.v2015/AssemblyInfo.fs @@ -1,4 +1,5 @@ -namespace System +// Auto-Generated by FAKE; do not edit +namespace System open System.Reflection open System.Runtime.CompilerServices @@ -11,5 +12,11 @@ open System.Runtime.CompilerServices do () module internal AssemblyVersionInformation = + let [] InternalsVisibleTo = "FSharp.Editing.VisualStudio.Tests" + let [] AssemblyTitle = "FSharp.Editing.VisualStudio.v2015" let [] Version = "2.5.2" let [] InformationalVersion = "2.5.2" + let [] AssemblyProduct = "FSharpVSPowerTools" + let [] AssemblyDescription = "A collection of additional commands for F# in Visual Studio" + let [] AssemblyVersion = "2.6.0" + let [] AssemblyFileVersion = "2.6.0" 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 8078b1e5..174a8e1b 100644 --- a/src/FSharp.Editing.VisualStudio.v2015/FSharp.Editing.VisualStudio.v2015.fsproj +++ b/src/FSharp.Editing.VisualStudio.v2015/FSharp.Editing.VisualStudio.v2015.fsproj @@ -93,6 +93,11 @@ + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll + True + True + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll True @@ -208,6 +213,433 @@ + + + + + ..\..\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 + True + True + + + + + + + ..\..\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 + True + True + + + + + + + ..\..\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/AssemblyInfo.fs b/src/FSharp.Editing.VisualStudio/AssemblyInfo.fs index ec95204c..3542c5f2 100644 --- a/src/FSharp.Editing.VisualStudio/AssemblyInfo.fs +++ b/src/FSharp.Editing.VisualStudio/AssemblyInfo.fs @@ -1,4 +1,5 @@ -namespace System +// Auto-Generated by FAKE; do not edit +namespace System open System.Reflection open System.Runtime.CompilerServices @@ -13,3 +14,9 @@ do () module internal AssemblyVersionInformation = let [] Version = "2.5.2" let [] InformationalVersion = "2.5.2" + let [] InternalsVisibleTo = "FSharp.Editing.VisualStudio.Tests" + let [] AssemblyTitle = "FSharp.Editing.VisualStudio" + let [] AssemblyProduct = "FSharpVSPowerTools" + let [] AssemblyDescription = "A collection of additional commands for F# in Visual Studio" + let [] AssemblyVersion = "2.6.0" + let [] AssemblyFileVersion = "2.6.0" diff --git a/src/FSharp.Editing.VisualStudio/FSharp.Editing.VisualStudio.fsproj b/src/FSharp.Editing.VisualStudio/FSharp.Editing.VisualStudio.fsproj index 2743d874..b4f673b6 100644 --- a/src/FSharp.Editing.VisualStudio/FSharp.Editing.VisualStudio.fsproj +++ b/src/FSharp.Editing.VisualStudio/FSharp.Editing.VisualStudio.fsproj @@ -7,7 +7,7 @@ 2.0 70456b75-f623-41b4-8044-ed02c265f0ff Library - >FSharp.Editing.VisualStudio + >FSharp.Editing.VisualStudio FSharp.Editing.VisualStudio v4.5 4.4.0.0 @@ -223,6 +223,11 @@ + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll + True + True + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll True @@ -398,9 +403,6 @@ True - - True - True @@ -423,6 +425,433 @@ + + + + + ..\..\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 + True + True + + + + + + + ..\..\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 + True + True + + + + + + + ..\..\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/Navigation/NavigableItemCache.fs b/src/FSharp.Editing.VisualStudio/Navigation/NavigableItemCache.fs index ef1e0ccb..69221e60 100644 --- a/src/FSharp.Editing.VisualStudio/Navigation/NavigableItemCache.fs +++ b/src/FSharp.Editing.VisualStudio/Navigation/NavigableItemCache.fs @@ -9,7 +9,7 @@ open FSharp.Editing open FSharp.Editing.VisualStudio open System.Security.Cryptography open System.Text -open Nessos.FsPickler +open MBrace.FsPickler open System.IO open System.Threading open FSharp.Editing diff --git a/src/FSharp.Editing/AssemblyInfo.fs b/src/FSharp.Editing/AssemblyInfo.fs index 8ffa8cd0..c15a0842 100644 --- a/src/FSharp.Editing/AssemblyInfo.fs +++ b/src/FSharp.Editing/AssemblyInfo.fs @@ -1,4 +1,5 @@ -namespace System +// Auto-Generated by FAKE; do not edit +namespace System open System.Reflection open System.Runtime.CompilerServices @@ -13,3 +14,9 @@ do () module internal AssemblyVersionInformation = let [] Version = "2.5.2" let [] InformationalVersion = "2.5.2" + let [] InternalsVisibleTo = "FSharp.Editing.Tests" + let [] AssemblyTitle = "FSharp.Editing" + let [] AssemblyProduct = "FSharpVSPowerTools" + let [] AssemblyDescription = "A collection of additional commands for F# in Visual Studio" + let [] AssemblyVersion = "2.6.0" + let [] AssemblyFileVersion = "2.6.0" diff --git a/src/FSharp.Editing/CodeGeneration/UnionPatternMatchCaseGenerator.fs b/src/FSharp.Editing/CodeGeneration/UnionPatternMatchCaseGenerator.fs index d47cacae..e988b71b 100644 --- a/src/FSharp.Editing/CodeGeneration/UnionPatternMatchCaseGenerator.fs +++ b/src/FSharp.Editing/CodeGeneration/UnionPatternMatchCaseGenerator.fs @@ -54,15 +54,16 @@ let private clauseIsCandidateForCodeGen (cursorPos: pos) (clause: SynMatchClause | SynPat.LongIdent(_, _, _, ConstructorPats nestedPats, _, r) -> // The cursor should not be in the nested patterns rangeContainsPos r cursorPos && List.forall (not << patIsCandidate) nestedPats - | SynPat.Tuple(_, _) -> false - | SynPat.ArrayOrList(_, _, _) -> false - | SynPat.Record(_, _) -> false - | SynPat.Null(_) -> false - | SynPat.IsInst(_, _) -> false - | SynPat.QuoteExpr(_, _) -> false - | SynPat.DeprecatedCharRange(_, _, _) -> false - | SynPat.InstanceMember(_, _, _, _, _) -> false - | SynPat.FromParseError(_, _) -> false + | SynPat.Tuple _ + | SynPat.StructTuple _ -> false + | SynPat.ArrayOrList _ + | SynPat.Record _ + | SynPat.Null _ + | SynPat.IsInst _ + | SynPat.QuoteExpr _ + | SynPat.DeprecatedCharRange _ + | SynPat.InstanceMember _ + | SynPat.FromParseError _ -> false match clause with | Clause(pat, _, _, _, _) -> patIsCandidate pat @@ -357,7 +358,8 @@ let getWrittenCases (patMatchExpr: PatternMatchExpr) = | SynPat.DeprecatedCharRange(_, _, _) | SynPat.FromParseError(_, _) -> false - | SynPat.Tuple(innerPatList, _) -> List.forall checkPattern innerPatList + | SynPat.Tuple(innerPatList, _) + | SynPat.StructTuple(innerPatList, _) -> List.forall checkPattern innerPatList | SynPat.Record(recordInnerPatList, _) -> recordInnerPatList diff --git a/src/FSharp.Editing/Coloring/DepthParser.fs b/src/FSharp.Editing/Coloring/DepthParser.fs index 5d276a5c..195b93d5 100644 --- a/src/FSharp.Editing/Coloring/DepthParser.fs +++ b/src/FSharp.Editing/Coloring/DepthParser.fs @@ -98,7 +98,8 @@ module internal DepthParsing = k (r1 @ r2))) | SynExpr.Const(_synConst, _range) -> k[] | SynExpr.Typed(synExpr, _synType, _range) -> getRangesSynExprK synExpr k - | SynExpr.Tuple(synExprList, _, _range) -> synExprList |> List.collect getRangesSynExpr + | SynExpr.Tuple(synExprList, _, _range) + | SynExpr.StructTuple(synExprList, _, _range) -> synExprList |> List.collect getRangesSynExpr | SynExpr.ArrayOrList(_, synExprList, _range) -> k(synExprList |> List.collect getRangesSynExpr) | SynExpr.Record(_) -> k[] | SynExpr.New(_, _synType, synExpr, _range) -> getRangesSynExprK synExpr k diff --git a/src/FSharp.Editing/Coloring/UnopenedNamespacesResolver.fs b/src/FSharp.Editing/Coloring/UnopenedNamespacesResolver.fs index 69e4a73f..1d20124d 100644 --- a/src/FSharp.Editing/Coloring/UnopenedNamespacesResolver.fs +++ b/src/FSharp.Editing/Coloring/UnopenedNamespacesResolver.fs @@ -139,7 +139,7 @@ module ParsedInput = | SynTypeConstraint.WhereTyparIsEquatable(t, _) -> walkTypar t | SynTypeConstraint.WhereTyparSubtypeOfType(t, ty, _) -> walkTypar t |> Option.orElse (walkType ty) | SynTypeConstraint.WhereTyparSupportsMember(ts, sign, _) -> - List.tryPick walkTypar ts |> Option.orElse (walkMemberSig sign) + List.tryPick walkType ts |> Option.orElse (walkMemberSig sign) | SynTypeConstraint.WhereTyparIsEnum(t, ts, _) -> walkTypar t |> Option.orElse (List.tryPick walkType ts) | SynTypeConstraint.WhereTyparIsDelegate(t, ts, _) -> walkTypar t |> Option.orElse (List.tryPick walkType ts) diff --git a/src/FSharp.Editing/Common/Lexer.fs b/src/FSharp.Editing/Common/Lexer.fs index b7a136d1..7b1a9efa 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, "/tmp.fsx") + let sourceTokenizer = SourceTokenizer(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, "/tmp.fsx") + let sourceTokenizer = SourceTokenizer(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/Common/UntypedAstUtils.fs b/src/FSharp.Editing/Common/UntypedAstUtils.fs index c08b1af8..ae941349 100644 --- a/src/FSharp.Editing/Common/UntypedAstUtils.fs +++ b/src/FSharp.Editing/Common/UntypedAstUtils.fs @@ -73,7 +73,7 @@ let internal getLongIdents (input: ParsedInput option) : IDictionary walkTypar t; walkType ty | SynTypeConstraint.WhereTyparIsEnum (t, ts, _) | SynTypeConstraint.WhereTyparIsDelegate (t, ts, _) -> walkTypar t; List.iter walkType ts - | SynTypeConstraint.WhereTyparSupportsMember (ts, sign, _) -> List.iter walkTypar ts; walkMemberSig sign + | SynTypeConstraint.WhereTyparSupportsMember (ts, sign, _) -> List.iter walkType ts; walkMemberSig sign and walkPat = function | SynPat.Tuple (pats, _) diff --git a/src/FSharp.Editing/Common/XmlDocParser.fs b/src/FSharp.Editing/Common/XmlDocParser.fs index 54a56df7..18497c2a 100644 --- a/src/FSharp.Editing/Common/XmlDocParser.fs +++ b/src/FSharp.Editing/Common/XmlDocParser.fs @@ -18,7 +18,8 @@ module internal XmlDocParsing = | SynPat.Attrib(pat,_attrs,_range) -> digNamesFrom pat | SynPat.LongIdent(_lid,_idOpt,_typDeclsOpt,ConstructorPats pats,_access,_range) -> pats |> List.collect digNamesFrom - | SynPat.Tuple(pats,_range) -> pats |> List.collect digNamesFrom + | SynPat.Tuple(pats,_range) + | SynPat.StructTuple(pats,_range) -> pats |> List.collect digNamesFrom | SynPat.Paren(pat,_range) -> digNamesFrom pat | SynPat.OptionalVal (id, _) -> [id.idText] | SynPat.Or _ // no one uses ors in fun decls diff --git a/src/FSharp.Editing/FSharp.Editing.fsproj b/src/FSharp.Editing/FSharp.Editing.fsproj index 5eac4d87..19ca5465 100644 --- a/src/FSharp.Editing/FSharp.Editing.fsproj +++ b/src/FSharp.Editing/FSharp.Editing.fsproj @@ -107,6 +107,11 @@ + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll + True + True + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll True @@ -180,4 +185,431 @@ + + + + + ..\..\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 + True + True + + + + + + + ..\..\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 + True + True + + + + + + + ..\..\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/TaskListCommentExtractor.fs b/src/FSharp.Editing/TaskListCommentExtractor.fs index 0be072a9..c1fae426 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([], "/tmp.fsx") + let sourceTok = SourceTokenizer([], Some "/tmp.fsx") let createNewLineTokenizer (lines: string[]) (lineNumber: int) = let nextLine = diff --git a/src/FSharpVSPowerTools/FSharpVSPowerTools.csproj b/src/FSharpVSPowerTools/FSharpVSPowerTools.csproj index ea5c9698..18f20cf5 100644 --- a/src/FSharpVSPowerTools/FSharpVSPowerTools.csproj +++ b/src/FSharpVSPowerTools/FSharpVSPowerTools.csproj @@ -271,6 +271,11 @@ + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll + True + True + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll True @@ -344,6 +349,433 @@ + + + + + ..\..\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 + True + True + + + + + + + ..\..\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 + True + True + + + + + + + ..\..\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/FSharpVSPowerTools/PowerToolsCommandsPackage.cs b/src/FSharpVSPowerTools/PowerToolsCommandsPackage.cs index 640a3d49..43e34467 100644 --- a/src/FSharpVSPowerTools/PowerToolsCommandsPackage.cs +++ b/src/FSharpVSPowerTools/PowerToolsCommandsPackage.cs @@ -20,7 +20,7 @@ namespace FSharpVSPowerTools { [PackageRegistration(UseManagedResourcesOnly = true)] [ProvideMenuResource(resourceID: "Menus.ctmenu", version: 1)] - [InstalledProductRegistration("#110", "#112", AssemblyVersionInformation.Version, IconResourceID = 400)] + [InstalledProductRegistration("#110", "#112", AssemblyVersionInformation.AssemblyVersion, IconResourceID = 400)] [ProvideBindingPath] [ProvideOptionPage(typeof(GeneralOptionsPage), Resource.vsPackageTitle, "General", categoryResourceID: 0, pageNameResourceID: 0, supportsAutomation: true, keywordListResourceId: 0)] [ProvideOptionPage(typeof(FantomasOptionsPage), Resource.vsPackageTitle, "Formatting", categoryResourceID: 0, pageNameResourceID: 0, supportsAutomation: true, keywordListResourceId: 0)] diff --git a/src/FSharpVSPowerTools/Properties/AssemblyInfo.cs b/src/FSharpVSPowerTools/Properties/AssemblyInfo.cs index cc9e809b..6bac5e01 100644 --- a/src/FSharpVSPowerTools/Properties/AssemblyInfo.cs +++ b/src/FSharpVSPowerTools/Properties/AssemblyInfo.cs @@ -12,5 +12,11 @@ namespace System { internal static class AssemblyVersionInformation { internal const string Version = "2.5.2"; internal const string InformationalVersion = "2.5.2"; + 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.6.0"; + internal const System.String AssemblyFileVersion = "2.6.0"; } } diff --git a/tests/FSharp.Editing.Tests/FSharp.Editing.Tests.fsproj b/tests/FSharp.Editing.Tests/FSharp.Editing.Tests.fsproj index 737ef062..572c1c1f 100644 --- a/tests/FSharp.Editing.Tests/FSharp.Editing.Tests.fsproj +++ b/tests/FSharp.Editing.Tests/FSharp.Editing.Tests.fsproj @@ -114,6 +114,11 @@ + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll + True + True + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll True @@ -261,6 +266,433 @@ + + + + + ..\..\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 + True + True + + + + + + + ..\..\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 + True + True + + + + + + + ..\..\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/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/FSharp.Editing.VisualStudio.Tests.fsproj b/tests/FSharp.Editing.VisualStudio.Tests/FSharp.Editing.VisualStudio.Tests.fsproj index 0e681b85..cbd1d4a5 100644 --- a/tests/FSharp.Editing.VisualStudio.Tests/FSharp.Editing.VisualStudio.Tests.fsproj +++ b/tests/FSharp.Editing.VisualStudio.Tests/FSharp.Editing.VisualStudio.Tests.fsproj @@ -243,6 +243,11 @@ + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll + True + True + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll True @@ -349,6 +354,433 @@ + + + + + ..\..\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 + True + True + + + + + + + ..\..\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 + True + True + + + + + + + ..\..\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 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 8d49cbe9fbfd776d8fa0967b5fd95de0bba52359 Mon Sep 17 00:00:00 2001 From: Vasily Kirichenko Date: Mon, 24 Oct 2016 18:07:39 +0300 Subject: [PATCH 2/6] update Fantomas to version 2.4.0 --- paket.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/paket.lock b/paket.lock index 28b2780f..0311c0f6 100644 --- a/paket.lock +++ b/paket.lock @@ -2,8 +2,8 @@ REDIRECTS: ON STRATEGY: MAX NUGET remote: http://www.nuget.org/api/v2 - Fantomas (2.3) - FSharp.Compiler.Service (>= 5.0) + Fantomas (2.4) + FSharp.Compiler.Service (>= 8.0) FParsec (1.0.2) FSharp.Compiler.Service (8.0) System.Collections.Immutable (>= 1.2) @@ -158,7 +158,7 @@ NUGET canopy (0.9.62) FSharp.Core (>= 3.0.2) Selenium.WebDriver (2.53.1) - FAKE (4.41.6) + FAKE (4.41.8) FSharp.Compiler.Service (2.0.0.6) FSharp.Core (4.0.0.1) FSharp.Formatting (2.14.4) @@ -179,7 +179,7 @@ NUGET Selenium.WebDriver.ChromeDriver (2.24) GITHUB remote: fsharp/FAKE - modules/Octokit/Octokit.fsx (889bda9367dfb24f9abb524165a0dbe2cdd86252) + modules/Octokit/Octokit.fsx (4e4428bfe931a5f720e32f9d69289d25eb16d467) Octokit (>= 0.20) GROUP Test NUGET From 83012b601c150e113c814e187dd879f733042798 Mon Sep 17 00:00:00 2001 From: Vasily Kirichenko Date: Mon, 24 Oct 2016 18:49:51 +0300 Subject: [PATCH 3/6] pass check results to Linter --- src/FSharp.Editing.VisualStudio/Linting/LintTagger.fs | 6 +++--- src/FSharp.Editing/ProjectSystem/LanguageService.fs | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/FSharp.Editing.VisualStudio/Linting/LintTagger.fs b/src/FSharp.Editing.VisualStudio/Linting/LintTagger.fs index a7dd046b..d6d34d34 100644 --- a/src/FSharp.Editing.VisualStudio/Linting/LintTagger.fs +++ b/src/FSharp.Editing.VisualStudio/Linting/LintTagger.fs @@ -43,8 +43,8 @@ type LintTagger(doc: ITextDocument, let updateAtCaretPosition (CallInUIContext callInUIContext) = asyncMaybe { let! project = project() - let! parseFileResults = vsLanguageService.ParseFileInProject (doc.FilePath, project) - let! ast = parseFileResults.ParseTree + let! checkFileResults = vsLanguageService.ParseAndCheckFileInProject (doc.FilePath, project) + let! ast = checkFileResults.ParseTree let config, shouldFileBeIgnored = lintData.Value let! source = openDocumentsTracker.TryGetDocumentText doc.FilePath @@ -54,7 +54,7 @@ type LintTagger(doc: ITextDocument, { Lint.OptionalLintParameters.Default with Configuration = Some config } { Ast = ast Source = source - TypeCheckResults = None + TypeCheckResults = checkFileResults.CheckResults FSharpVersion = version } doc.FilePath diff --git a/src/FSharp.Editing/ProjectSystem/LanguageService.fs b/src/FSharp.Editing/ProjectSystem/LanguageService.fs index 1117db61..93796863 100644 --- a/src/FSharp.Editing/ProjectSystem/LanguageService.fs +++ b/src/FSharp.Editing/ProjectSystem/LanguageService.fs @@ -37,6 +37,7 @@ type ParseAndCheckResults private (infoOpt: (FSharpCheckFileResults * FSharpPars } member __.ParseTree = infoOpt |> Option.bind (fun (_, parseResults) -> parseResults.ParseTree) + member __.CheckResults = infoOpt |> Option.map (fun (checkResults, _) -> checkResults) member __.CheckErrors = infoOpt |> Option.map (fun (checkResults, _) -> checkResults.Errors) member __.ParseErrors = infoOpt |> Option.map (fun (_, parseResults) -> parseResults.Errors) From 034849f8f90b4950a7049c7da5d595965a41e305 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 24 Oct 2016 23:08:06 +0100 Subject: [PATCH 4/6] Update FSharpLint --- paket.dependencies | 2 +- paket.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/paket.dependencies b/paket.dependencies index 886d3644..f857393d 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 prerelease +nuget FSharpLint.Core nuget FsPickler nuget FsXaml.Wpf nuget SourceLink.SymbolStore 0.5.0 diff --git a/paket.lock b/paket.lock index 0311c0f6..e2efd325 100644 --- a/paket.lock +++ b/paket.lock @@ -14,10 +14,10 @@ NUGET 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 (0.9.9.3) - FSharpLint.Core (0.4.9) + FSharpLint.Core (0.4.10) FParsec (>= 1.0.2) - FSharp.Compiler.Service (>= 6.0) - FSharp.Compiler.Service.ProjectCracker (>= 6.0) + FSharp.Compiler.Service (>= 8.0) + FSharp.Compiler.Service.ProjectCracker (>= 8.0) FsPickler (3.2) FsXaml.Wpf (2.1) Microsoft.NETCore.Platforms (1.0.1) - framework: >= netstandard10 From 92b17463b81b63cfef7c2bdbeea33cd6c7a2b0d6 Mon Sep 17 00:00:00 2001 From: Vasily Kirichenko Date: Tue, 25 Oct 2016 14:55:10 +0300 Subject: [PATCH 5/6] remove VS 15 support because VS Gallery does not suport it --- src/FSharpVSPowerTools/source.extension.vsixmanifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FSharpVSPowerTools/source.extension.vsixmanifest b/src/FSharpVSPowerTools/source.extension.vsixmanifest index e83556ea..d62f68c4 100644 --- a/src/FSharpVSPowerTools/source.extension.vsixmanifest +++ b/src/FSharpVSPowerTools/source.extension.vsixmanifest @@ -14,7 +14,7 @@ - + From 064269f055a2f644c089e552961a46eecbf4b67c Mon Sep 17 00:00:00 2001 From: Vasily Kirichenko Date: Tue, 25 Oct 2016 15:00:33 +0300 Subject: [PATCH 6/6] Bump version to 2.5.4 --- RELEASE_NOTES.md | 3 +++ .../AssemblyInfo.fs | 10 ++++------ src/FSharp.Editing.VisualStudio/AssemblyInfo.fs | 10 ++++------ src/FSharp.Editing/AssemblyInfo.fs | 10 ++++------ src/FSharpVSPowerTools/Properties/AssemblyInfo.cs | 10 ++++------ src/FSharpVSPowerTools/source.extension.vsixmanifest | 2 +- 6 files changed, 20 insertions(+), 25 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 51d98f5f..6970bfd0 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 2.5.4 - October 25 2016 +* Update F# Compiler Service, Fantomas and FSharpLint + #### 2.5.2 - October 17 2016 * Fix class declaration coloring if it contains any static let bindings diff --git a/src/FSharp.Editing.VisualStudio.Tests.v2015/AssemblyInfo.fs b/src/FSharp.Editing.VisualStudio.Tests.v2015/AssemblyInfo.fs index 03e0b860..1900b04e 100644 --- a/src/FSharp.Editing.VisualStudio.Tests.v2015/AssemblyInfo.fs +++ b/src/FSharp.Editing.VisualStudio.Tests.v2015/AssemblyInfo.fs @@ -7,16 +7,14 @@ open System.Runtime.CompilerServices [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = let [] InternalsVisibleTo = "FSharp.Editing.VisualStudio.Tests" let [] AssemblyTitle = "FSharp.Editing.VisualStudio.v2015" - let [] Version = "2.5.2" - let [] InformationalVersion = "2.5.2" let [] AssemblyProduct = "FSharpVSPowerTools" let [] AssemblyDescription = "A collection of additional commands for F# in Visual Studio" - let [] AssemblyVersion = "2.6.0" - let [] AssemblyFileVersion = "2.6.0" + let [] AssemblyVersion = "2.5.4" + let [] AssemblyFileVersion = "2.5.4" diff --git a/src/FSharp.Editing.VisualStudio/AssemblyInfo.fs b/src/FSharp.Editing.VisualStudio/AssemblyInfo.fs index 3542c5f2..dd94f7e5 100644 --- a/src/FSharp.Editing.VisualStudio/AssemblyInfo.fs +++ b/src/FSharp.Editing.VisualStudio/AssemblyInfo.fs @@ -7,16 +7,14 @@ open System.Runtime.CompilerServices [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "2.5.2" - let [] InformationalVersion = "2.5.2" let [] InternalsVisibleTo = "FSharp.Editing.VisualStudio.Tests" let [] AssemblyTitle = "FSharp.Editing.VisualStudio" let [] AssemblyProduct = "FSharpVSPowerTools" let [] AssemblyDescription = "A collection of additional commands for F# in Visual Studio" - let [] AssemblyVersion = "2.6.0" - let [] AssemblyFileVersion = "2.6.0" + let [] AssemblyVersion = "2.5.4" + let [] AssemblyFileVersion = "2.5.4" diff --git a/src/FSharp.Editing/AssemblyInfo.fs b/src/FSharp.Editing/AssemblyInfo.fs index c15a0842..079cf862 100644 --- a/src/FSharp.Editing/AssemblyInfo.fs +++ b/src/FSharp.Editing/AssemblyInfo.fs @@ -7,16 +7,14 @@ open System.Runtime.CompilerServices [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "2.5.2" - let [] InformationalVersion = "2.5.2" let [] InternalsVisibleTo = "FSharp.Editing.Tests" let [] AssemblyTitle = "FSharp.Editing" let [] AssemblyProduct = "FSharpVSPowerTools" let [] AssemblyDescription = "A collection of additional commands for F# in Visual Studio" - let [] AssemblyVersion = "2.6.0" - let [] AssemblyFileVersion = "2.6.0" + let [] AssemblyVersion = "2.5.4" + let [] AssemblyFileVersion = "2.5.4" diff --git a/src/FSharpVSPowerTools/Properties/AssemblyInfo.cs b/src/FSharpVSPowerTools/Properties/AssemblyInfo.cs index 6bac5e01..8c0f8c97 100644 --- a/src/FSharpVSPowerTools/Properties/AssemblyInfo.cs +++ b/src/FSharpVSPowerTools/Properties/AssemblyInfo.cs @@ -6,17 +6,15 @@ [assembly: AssemblyTitleAttribute("FSharpVSPowerTools")] [assembly: AssemblyProductAttribute("FSharpVSPowerTools")] [assembly: AssemblyDescriptionAttribute("A collection of additional commands for F# in Visual Studio")] -[assembly: AssemblyVersionAttribute("2.5.2")] -[assembly: AssemblyFileVersionAttribute("2.5.2")] +[assembly: AssemblyVersionAttribute("2.5.4")] +[assembly: AssemblyFileVersionAttribute("2.5.4")] namespace System { internal static class AssemblyVersionInformation { - internal const string Version = "2.5.2"; - internal const string InformationalVersion = "2.5.2"; 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.6.0"; - internal const System.String AssemblyFileVersion = "2.6.0"; + internal const System.String AssemblyVersion = "2.5.4"; + internal const System.String AssemblyFileVersion = "2.5.4"; } } diff --git a/src/FSharpVSPowerTools/source.extension.vsixmanifest b/src/FSharpVSPowerTools/source.extension.vsixmanifest index d62f68c4..f79ee7bb 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