Fixed file names on Windows

Author: ncave

fcs/fcs-fable/adapters.fs

@@ -45,9 +45,15 @@ module System =
                         new IEqualityComparer<'TKey> with
                             member __.GetHashCode(x) = x.GetHashCode()
                             member __.Equals(x, y) = x.Equals(y) }
-                member x.TryAdd (key:'TKey, value:'TValue) = x.[key] <- value; true
+                member x.TryAdd (key:'TKey, value:'TValue) =
+                    x.[key] <- value
+                    true
+                member x.TryRemove (key:'TKey) =
+                    let res = x.TryGetValue(key)
+                    x.Remove(key) |> ignore
+                    res
                 member x.GetOrAdd (key:'TKey, valueFactory: 'TKey -> 'TValue): 'TValue =
-                    match x.TryGetValue key with
+                    match x.TryGetValue(key) with
                     | true, v -> v
                     | false, _ -> let v = valueFactory(key) in x.[key] <- v; v
 

fcs/fcs-fable/service_shim.fs

@@ -313,7 +313,7 @@ type InteractiveChecker internal (tcConfig, tcGlobals, tcImports, tcInitialState
             | false, _ -> None)
         // remove all parse cache entries with the same file name
         let staleParseKeys = parseCache.Keys |> Seq.filter (fun (n,_) -> n = fileName) |> Seq.toArray
-        staleParseKeys |> Array.iter (fun key -> parseCache.Remove(key) |> ignore)
+        staleParseKeys |> Array.iter (fun key -> parseCache.TryRemove(key) |> ignore)
         checkCache.Clear(); // clear all typecheck cache
         // restore all cached typecheck entries above file
         cachedAbove |> Array.iter (fun (key, value) -> checkCache.TryAdd(key, value) |> ignore)
@@ -399,7 +399,7 @@ type InteractiveChecker internal (tcConfig, tcGlobals, tcImports, tcInitialState
         let fileNames = [| fileName |]
         let parsingOptions = FSharpParsingOptions.FromTcConfig(tcConfig, fileNames, false)
         let parseResults = x.ParseFile (fileName, source, parsingOptions)
-        let moduleNamesDict = Map.Empty
+        let moduleNamesDict = Map.empty
         let loadClosure = None
         let backgroundErrors = [||]
         let checkAlive () = true

fcs/fcs-fable/test/bench.fs

@@ -4,7 +4,7 @@ open System.Text.RegularExpressions
 open Microsoft.FSharp.Compiler.SourceCodeServices
 open Platform
 
-let references = Metadata.references_core
+let references = Metadata.references false
 let metadataPath = "/temp/repl/metadata2/" // .NET BCL binaries
 
 let parseProjectFile projectPath =
@@ -49,8 +49,8 @@ let rec parseProject projectPath =
     let (projectFileName, projectRefs, sourceFiles, defines) = parseProjectFile projectPath
 
     let projectFileDir = Path.GetDirectoryName projectPath
-    let isAbsolutePath (path: string) = path.StartsWith("/")
-    let trimPath (path: string) = path.TrimStart([|'.';'/'|])
+    let isAbsolutePath (path: string) = path.StartsWith("/") || path.Contains(":")
+    let trimPath (path: string) = path.TrimStart([|'.';'/'|]).Replace(":", "")
     let makePath path = if isAbsolutePath path then path else Path.Combine(projectFileDir, path)
     let makeName path = Path.Combine(trimPath projectFileDir, trimPath path)