Skip to content

Commit

Permalink
We can accept more of what fantomas produces
Browse files Browse the repository at this point in the history
  • Loading branch information
SteveGilham committed Jan 19, 2023
1 parent 2070d9f commit 14b6470
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 51 deletions.
12 changes: 6 additions & 6 deletions AltCover.Engine/NativeJson.fs
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ module
Justification = "Harmless in context")>]
type
#if GUI || RUNNER
internal
internal
#endif
SeqPnt =
SeqPnt =
{ VC: int
SL: int
SC: int
Expand All @@ -73,9 +73,9 @@ module
Justification = "Harmless in context")>]
type
#if GUI || RUNNER
internal
internal
#endif
BranchInfo =
BranchInfo =
{ Line: int
Offset: int
EndOffset: int
Expand Down Expand Up @@ -103,9 +103,9 @@ module
Justification = "Harmless in context")>]
type
#if GUI || RUNNER
internal
internal
#endif
Method =
Method =
{ Lines: Lines
[<SuppressMessage("Gendarme.Rules.Design.Generic",
"DoNotExposeGenericListsRule",
Expand Down
7 changes: 5 additions & 2 deletions AltCover.Recorder/Base.fs
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,12 @@ module internal Counter =
Justification = "Not an IDisposeable at net2.0")>]
let
#if !DEBUG
inline
inline
#endif
internal selectNodes (node:XmlNode) name =
internal selectNodes
(node: XmlNode)
name
=
node.SelectNodes(name) |> Seq.cast<XmlNode>

// // <summary>
Expand Down
24 changes: 19 additions & 5 deletions AltCover.Recorder/Recorder.fs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ module Instance =
#if DEBUG
mutable
#endif
internal CoverageFormat = ReportFormat.NCover // fsharplint:disable-line NonPublicValuesNames
internal CoverageFormat = // fsharplint:disable-line NonPublicValuesNames
ReportFormat.NCover

/// <summary>
/// Gets the frequency of time sampling
Expand Down Expand Up @@ -322,9 +323,16 @@ module Instance =

let
#if !DEBUG
inline
inline
#endif
internal issue71Wrapper visits moduleId hitPointId context handler add =
internal issue71Wrapper
visits
moduleId
hitPointId
context
handler
add
=
try
add visits moduleId hitPointId context
with x ->
Expand All @@ -336,9 +344,15 @@ module Instance =

let
#if !DEBUG
inline
inline
#endif
internal curriedIssue71Wrapper visits moduleId hitPointId context add =
internal curriedIssue71Wrapper
visits
moduleId
hitPointId
context
add
=
issue71Wrapper visits moduleId hitPointId context logException add

let internal addVisit moduleId hitPointId context =
Expand Down
14 changes: 10 additions & 4 deletions AltCover.Visualizer/Browser.fs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ module internal Extensions =
#endif
let
#if !DEBUG
inline
inline
#endif
replace (y: string, z: string) (x: string) =
replace
(y: string, z: string)
(x: string)
=
#if !NETCOREAPP2_1
x.Replace(y, z)
#else
Expand All @@ -33,9 +36,12 @@ module internal Extensions =
#endif
let
#if !DEBUG
inline
inline
#endif
indexOf (y: char) (x: string) =
indexOf
(y: char)
(x: string)
=
#if !NETCOREAPP2_1
x.IndexOf y
#else
Expand Down
68 changes: 34 additions & 34 deletions Build/targets.fs
Original file line number Diff line number Diff line change
Expand Up @@ -7075,10 +7075,10 @@ module Targets =
(({ p.WithCommon(withWorkingDirectoryVM "_Issue23") with
Configuration = DotNet.BuildConfiguration.Debug
NoBuild = false })
.WithAltCoverOptions
pp0
cc0
ForceTrue)
.WithAltCoverOptions
pp0
cc0
ForceTrue)
.WithAltCoverImportModule()
.WithAltCoverGetVersion()
|> testWithCLIArguments)
Expand Down Expand Up @@ -7155,10 +7155,10 @@ module Targets =
(({ p.WithCommon(withWorkingDirectoryVM "_Issue67") with
Configuration = DotNet.BuildConfiguration.Debug
NoBuild = false })
.WithAltCoverOptions
pp0
cc0
ForceTrue)
.WithAltCoverOptions
pp0
cc0
ForceTrue)
.WithAltCoverImportModule()
.WithAltCoverGetVersion()
|> testWithCLIArguments)
Expand Down Expand Up @@ -7252,10 +7252,10 @@ module Targets =
(({ p.WithCommon(withWorkingDirectoryVM "./Samples/Sample16/Test/_Issue72") with
Configuration = DotNet.BuildConfiguration.Debug
NoBuild = false })
.WithAltCoverOptions
pp0
cc0
ForceTrue)
.WithAltCoverOptions
pp0
cc0
ForceTrue)
.WithAltCoverImportModule()
.WithAltCoverGetVersion()
|> testWithCLIArguments)
Expand Down Expand Up @@ -7320,12 +7320,12 @@ module Targets =
DotNet.test
(fun p ->
(({ p.WithCommon(withWorkingDirectoryVM "./Samples/Sample16/Test/_Issue72") with
Configuration = DotNet.BuildConfiguration.Debug
NoBuild = false })
.WithAltCoverOptions
pp1
cc0
ForceTrue)
Configuration = DotNet.BuildConfiguration.Debug
NoBuild = false })
.WithAltCoverOptions
pp1
cc0
ForceTrue)
.WithAltCoverImportModule()
.WithAltCoverGetVersion()
|> testWithCLIArguments)
Expand Down Expand Up @@ -7384,10 +7384,10 @@ module Targets =
(({ p.WithCommon(withWorkingDirectoryVM "./Samples/Sample16/Test") with
Configuration = DotNet.BuildConfiguration.Debug
NoBuild = false })
.WithAltCoverOptions
psln
cc0
ForceTrue)
.WithAltCoverOptions
psln
cc0
ForceTrue)
.WithAltCoverImportModule()
.WithAltCoverGetVersion()
|> testWithCLIArguments)
Expand Down Expand Up @@ -7613,12 +7613,12 @@ module Targets =
DotNet.test
(fun p ->
(({ p.WithCommon(withWorkingDirectoryVM "_Issue114") with
Configuration = DotNet.BuildConfiguration.Debug
NoBuild = false })
.WithAltCoverOptions
pp0
cc0
ForceTrue)
Configuration = DotNet.BuildConfiguration.Debug
NoBuild = false })
.WithAltCoverOptions
pp0
cc0
ForceTrue)
.WithAltCoverImportModule()
.WithAltCoverGetVersion()
|> testWithCLIArguments)
Expand Down Expand Up @@ -7704,12 +7704,12 @@ module Targets =
DotNet.test
(fun p ->
(({ p.WithCommon(withWorkingDirectoryVM "_Issue156/Tests") with
Configuration = DotNet.BuildConfiguration.Debug
NoBuild = false })
.WithAltCoverOptions
pp0
cc0
ForceTrueOnly)
Configuration = DotNet.BuildConfiguration.Debug
NoBuild = false })
.WithAltCoverOptions
pp0
cc0
ForceTrueOnly)
|> testWithCLIArguments)
""
finally
Expand Down

0 comments on commit 14b6470

Please sign in to comment.