Skip to content

Commit 2e294d1

Browse files
committed
Make ...Logged have logging be the default
This is more intuitive, and doesn't change the standard behaviour. Also update remaining references to checker.GetProjectOptionsFromProjectFile
1 parent 2fd9b3d commit 2e294d1

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

docs/content/project.fsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ of `InteractiveChecker`:
2323
*)
2424
// Reference F# compiler API
2525
#r "FSharp.Compiler.Service.dll"
26+
#r "FSharp.Compiler.Service.ProjectCracker.dll"
2627

2728
open System
2829
open System.Collections.Generic
@@ -316,7 +317,7 @@ for any project that builds cleanly using the command line tools 'xbuild' or 'ms
316317

317318
let projectFile = __SOURCE_DIRECTORY__ + @"/../../src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj"
318319

319-
checker.GetProjectOptionsFromProjectFile(projectFile)
320+
ProjectCracker.GetProjectOptionsFromProjectFile(projectFile)
320321

321322

322323
(**
@@ -325,7 +326,7 @@ You can also request RELEASE mode and set other build configuration parameters:
325326
326327
*)
327328

328-
checker.GetProjectOptionsFromProjectFile(projectFile, [("Configuration", "Release")])
329+
ProjectCracker.GetProjectOptionsFromProjectFile(projectFile, [("Configuration", "Release")])
329330

330331
(**
331332

src/fsharp/FSharp.Compiler.Service.ProjectCracker/ProjectCracker.fs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ type ProjectCracker =
1313
static member GetProjectOptionsFromProjectFileLogged(projectFileName : string, ?properties : (string * string) list, ?loadedTimeStamp, ?enableLogging) =
1414
let loadedTimeStamp = defaultArg loadedTimeStamp DateTime.MaxValue // Not 'now', we don't want to force reloading
1515
let properties = defaultArg properties []
16-
let enableLogging = defaultArg enableLogging false
16+
let enableLogging = defaultArg enableLogging true
1717
let logMap = ref Map.empty
1818

1919
let rec convert (opts: FSharp.Compiler.Service.ProjectCracker.Exe.ProjectOptions) : FSharpProjectOptions =
@@ -50,4 +50,8 @@ type ProjectCracker =
5050
convert opts, !logMap
5151

5252
static member GetProjectOptionsFromProjectFile(projectFileName : string, ?properties : (string * string) list, ?loadedTimeStamp) =
53-
fst (ProjectCracker.GetProjectOptionsFromProjectFileLogged(projectFileName, ?properties=properties, ?loadedTimeStamp=loadedTimeStamp))
53+
fst (ProjectCracker.GetProjectOptionsFromProjectFileLogged(
54+
projectFileName,
55+
?properties=properties,
56+
?loadedTimeStamp=loadedTimeStamp,
57+
enableLogging=false))

tests/service/ExprTests.fs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
#if INTERACTIVE
33
#r "../../bin/v4.5/FSharp.Compiler.Service.dll"
4+
#r "../../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.dll"
45
#r "../../packages/NUnit/lib/nunit.framework.dll"
56
#load "FsUnit.fs"
67
#load "Common.fs"
@@ -679,7 +680,7 @@ let ``Test expressions of declarations stress big expressions`` () =
679680
let ``Test Declarations selfhost`` () =
680681
let projectFile = __SOURCE_DIRECTORY__ + @"/FSharp.Compiler.Service.Tests.fsproj"
681682
// Check with Configuration = Release
682-
let options = checker.GetProjectOptionsFromProjectFile(projectFile, [("Configuration", "Debug")])
683+
let options = ProjectCracker.GetProjectOptionsFromProjectFile(projectFile, [("Configuration", "Debug")])
683684
let wholeProjectResults = checker.ParseAndCheckProject(options) |> Async.RunSynchronously
684685

685686
wholeProjectResults.Errors.Length |> shouldEqual 0
@@ -736,7 +737,7 @@ let ``Test Declarations selfhost FSharp.Core`` () =
736737
Environment.CurrentDirectory <- __SOURCE_DIRECTORY__ + @"/../../../fsharp/src/fsharp/FSharp.Core"
737738
let projectFile = __SOURCE_DIRECTORY__ + @"/../../../fsharp/src/fsharp/FSharp.Core/FSharp.Core.fsproj"
738739

739-
let options = checker.GetProjectOptionsFromProjectFile(projectFile, [("Configuration", "Debug")])
740+
let options = ProjectCracker.GetProjectOptionsFromProjectFile(projectFile, [("Configuration", "Debug")])
740741

741742
let wholeProjectResults = checker.ParseAndCheckProject(options) |> Async.RunSynchronously
742743

tests/service/ProjectOptionsTests.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ let ``Project file parsing -- compile files 2``() =
126126
[<Test>]
127127
let ``Project file parsing -- bad project file``() =
128128
let f = normalizePath (__SOURCE_DIRECTORY__ + @"/data/Malformed.fsproj")
129-
let log = snd (ProjectCracker.GetProjectOptionsFromProjectFileLogged(f, enableLogging=true))
129+
let log = snd (ProjectCracker.GetProjectOptionsFromProjectFileLogged(f))
130130
log.[f] |> should contain "Microsoft.Build.Exceptions.InvalidProjectFileException"
131131

132132
[<Test>]

0 commit comments

Comments
 (0)