Skip to content

Commit 6d665db

Browse files
authored
Purge it with fire (#1255)
1 parent a21c4f2 commit 6d665db

File tree

1 file changed

+2
-53
lines changed

1 file changed

+2
-53
lines changed

src/FsAutoComplete.Logging/FsLibLog.fs

Lines changed: 2 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -48,45 +48,9 @@ module Types =
4848
abstract member Log: Logger
4949
abstract member MappedContext: MappedContext
5050

51-
#if FABLE_COMPILER
52-
// Fable doesn't support System.Collections.Generic.Stack, so this implementation (from FCS)
53-
// is used instead.
54-
type Stack<'a>() =
55-
let mutable contents = Array.zeroCreate<'a> (2)
56-
let mutable count = 0
57-
58-
member buf.Ensure newSize =
59-
let oldSize = contents.Length
60-
61-
if newSize > oldSize then
62-
let old = contents
63-
contents <- Array.zeroCreate (max newSize (oldSize * 2))
64-
Array.blit old 0 contents 0 count
65-
66-
member buf.Count = count
67-
68-
member buf.Pop() =
69-
let item = contents.[count - 1]
70-
count <- count - 1
71-
item
72-
73-
member buf.Peep() = contents.[count - 1]
74-
75-
member buf.Top(n) = [ for x in contents.[max 0 (count - n) .. count - 1] -> x ] |> List.rev
76-
77-
member buf.Push(x) =
78-
buf.Ensure(count + 1)
79-
contents.[count] <- x
80-
count <- count + 1
81-
82-
member buf.IsEmpty = (count = 0)
83-
#endif
84-
8551
[<AutoOpen>]
8652
module Inner =
87-
#if !FABLE_COMPILER
8853
open System.Collections.Generic
89-
#endif
9054

9155
/// <summary>
9256
/// DisposableStack on Dispose will call dispose on items appended to its stack in Last In First Out.
@@ -310,8 +274,6 @@ module Types =
310274
/// <returns>The amended log.</returns>
311275
let setLogLevel (logLevel: LogLevel) (log: Log) = { log with LogLevel = logLevel }
312276

313-
#if !FABLE_COMPILER
314-
315277
let private formatterRegex =
316278
Regex(@"(?<!{){(?<number>\d+)(?<columnFormat>:(?<format>[^}]+))?}(?!})", RegexOptions.Compiled)
317279

@@ -377,7 +339,6 @@ module Types =
377339
/// <param name="log">The log to amend.</param>
378340
/// <returns>The amended log.</returns>
379341
let setMessageI (message: FormattableString) (log: Log) = setMessageInterpolated message log
380-
#endif
381342

382343
/// Provides operators to make writing logs more streamlined.
383344
module Operators =
@@ -431,8 +392,6 @@ module Operators =
431392
/// <returns>The amended log with the parameter added.</returns>
432393
let (>>!!) log e = log >> Log.addException e
433394

434-
435-
#if !FABLE_COMPILER
436395
module Providers =
437396
module SerilogProvider =
438397
open System
@@ -904,27 +863,20 @@ module Providers =
904863

905864
let create () = MicrosoftProvider() :> ILogProvider
906865

907-
#endif
908866

909867

910868
module LogProvider =
911869
open System
912870
open Types
913-
#if !FABLE_COMPILER
914871
open Providers
915-
#endif
916872
open System.Diagnostics
917873
open Microsoft.FSharp.Quotations.Patterns
918874

919875
let mutable private currentLogProvider = None
920876

921877
let private knownProviders =
922-
[
923-
#if !FABLE_COMPILER
924-
(SerilogProvider.isAvailable, SerilogProvider.create)
925-
(MicrosoftExtensionsLoggingProvider.isAvailable, MicrosoftExtensionsLoggingProvider.create)
926-
#endif
927-
]
878+
[ (SerilogProvider.isAvailable, SerilogProvider.create)
879+
(MicrosoftExtensionsLoggingProvider.isAvailable, MicrosoftExtensionsLoggingProvider.create) ]
928880

929881
/// Greedy search for first available LogProvider. Order of known providers matters.
930882
let private resolvedLogger =
@@ -1024,7 +976,6 @@ module LogProvider =
1024976
/// <returns></returns>
1025977
let inline getLoggerFor<'a> () = getLoggerByType (typeof<'a>)
1026978

1027-
#if !FABLE_COMPILER
1028979
let rec private getModuleType =
1029980
function
1030981
| PropertyGet(_, propertyInfo, _) -> propertyInfo.DeclaringType
@@ -1065,5 +1016,3 @@ type LogProvider =
10651016
mi.DeclaringType.FullName.Split('+') |> Seq.tryHead |> Option.defaultValue ""
10661017

10671018
sprintf "%s.%s" location memberName.Value |> LogProvider.getLoggerByName
1068-
1069-
#endif

0 commit comments

Comments
 (0)