From cf1acc1d633ce17daaae7e972014d5c0350ef9e6 Mon Sep 17 00:00:00 2001 From: dungpa Date: Tue, 7 Apr 2015 09:13:51 +0200 Subject: [PATCH] Pin VFPT to v1.8.0 FIx #277. --- build.fsx | 2 +- paket.dependencies | 2 +- paket.lock | 6 +++--- src/FSharp.CodeFormat/CodeFormatAgent.fs | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build.fsx b/build.fsx index 8a355d455..ab1ed55d7 100644 --- a/build.fsx +++ b/build.fsx @@ -201,7 +201,7 @@ Target "NuGet" (fun _ -> AccessKey = getBuildParamOrDefault "nugetkey" "" Publish = hasBuildParam "nugetkey" Dependencies = - [ "FSharpVSPowerTools.Core", GetPackageVersion "packages" "FSharpVSPowerTools.Core" + [ "FSharpVSPowerTools.Core", GetPackageVersion "packages" "FSharpVSPowerTools.Core" |> RequireExactly "FSharp.Compiler.Service", GetPackageVersion "packages" "FSharp.Compiler.Service" ] }) "nuget/FSharp.Formatting.nuspec" NuGet (fun p -> diff --git a/paket.dependencies b/paket.dependencies index a2205cd92..f7151f7a5 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -8,5 +8,5 @@ nuget RazorEngine nuget NUnit nuget NUnit.Runners nuget NuGet.CommandLine -nuget FSharpVSPowerTools.Core +nuget FSharpVSPowerTools.Core == 1.8.0 nuget ILRepack 1.22.2 \ No newline at end of file diff --git a/paket.lock b/paket.lock index 6a00c533d..c74a5d223 100644 --- a/paket.lock +++ b/paket.lock @@ -3,9 +3,9 @@ NUGET specs: CommandLineParser (1.9.71) FAKE (3.26.1) - FSharp.Compiler.Service (0.0.86) - FSharpVSPowerTools.Core (1.7.0) - FSharp.Compiler.Service (>= 0.0.81) + FSharp.Compiler.Service (0.0.87) + FSharpVSPowerTools.Core (1.8.0) + FSharp.Compiler.Service (>= 0.0.87) ILRepack (1.22.2) Microsoft.AspNet.Razor (3.2.3) NuGet.CommandLine (2.8.3) diff --git a/src/FSharp.CodeFormat/CodeFormatAgent.fs b/src/FSharp.CodeFormat/CodeFormatAgent.fs index 5e1ee1c5b..268061d33 100644 --- a/src/FSharp.CodeFormat/CodeFormatAgent.fs +++ b/src/FSharp.CodeFormat/CodeFormatAgent.fs @@ -292,7 +292,8 @@ type CodeFormatAgent() = Lexer.getSymbol source line col lineStr SymbolLookupKind.ByRightColumn opts.OtherOptions Lexer.queryLexState member __.TokenizeLine line = let lineStr = sourceLines.[line] - Lexer.tokenizeLine source opts.OtherOptions line lineStr Lexer.queryLexState } + Lexer.tokenizeLine source opts.OtherOptions line lineStr Lexer.queryLexState + member __.LineCount = sourceLines.Length } let categorizedSpans = SourceCodeClassifier.getCategoriesAndLocations(