WIP

nojaf · nojaf · commit b64308ae9aa2 · 2020-02-06T21:33:45.000+01:00
diff --git a/docs/content/style.css b/docs/content/style.css
@@ -12,14 +12,31 @@ span.pf { color:#E0C57F; }
 span.e { color:#EA8675; }
 
 /* identifiers --- and styles for more specific identifier types */
-span.i { color:#d1d1d1; }
-/* type or module */
-span.t { color:#43AEC6; }
+span.id { color:#d1d1d1; }
+/* module */
+span.m { color:#43AEC6; }
+/* reference type */
+span.rt { color:#43AEC6; }
+/* value type */
+span.vt { color:#43AEC6; }
+/* interface */
+span.if{ color:#43AEC6; }
+/* type argument */
+span.ta { color:#43AEC6; }
+/* disposable */
+span.d { color:#43AEC6; }
+/* property */
+span.prop { color:#43AEC6; }
+/* punctuation */
+span.p { color:#43AEC6; }
 /* function */
 span.f { color:#e1e1e1; }
-/* DU case or active pattern */
-span.p { color:#4ec9b0; }
-
+/* active pattern */
+span.pat { color:#4ec9b0; }
+/* union case */
+span.u { color:#4ec9b0; }
+/* enumeration */
+span.e { color:#4ec9b0; }
 /* keywords */
 span.k { color:#FAB11D; }
 /* comment */
diff --git a/fcs/docsrc/content/caches.fsx b/fcs/docsrc/content/caches.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/fcs/Release/netcoreapp3.0"
 (**
 Compiler Services: Notes on the FSharpChecker caches
 =================================================
diff --git a/fcs/docsrc/content/compiler.fsx b/fcs/docsrc/content/compiler.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/fcs/Release/netcoreapp3.0"
 (**
 Hosted Compiler
 ===============
diff --git a/fcs/docsrc/content/corelib.fsx b/fcs/docsrc/content/corelib.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/fcs/Release/netcoreapp3.0"
 (**
 Compiler Services: Notes on FSharp.Core.dll
 =================================================
diff --git a/fcs/docsrc/content/editor.fsx b/fcs/docsrc/content/editor.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/fcs/Release/netcoreapp3.0"
 (**
 Compiler Services: Editor services
 ==================================
diff --git a/fcs/docsrc/content/filesystem.fsx b/fcs/docsrc/content/filesystem.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/fcs/Release/netcoreapp3.0"
 (**
 Compiler Services: Virtualized File System
 ==========================================
diff --git a/fcs/docsrc/content/interactive.fsx b/fcs/docsrc/content/interactive.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/fcs/Release/netcoreapp3.0"
 (**
 Interactive Service: Embedding F# Interactive
 =============================================
diff --git a/fcs/docsrc/content/ja/compiler.fsx b/fcs/docsrc/content/ja/compiler.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net461"
+#I "../../../../artifacts/bin/fcs/Release/net461"
 (**
 コンパイラの組み込み
 ====================
diff --git a/fcs/docsrc/content/ja/editor.fsx b/fcs/docsrc/content/ja/editor.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net461"
+#I "../../../../artifacts/bin/fcs/Release/net461"
 (**
 コンパイラサービス: エディタサービス
 ====================================
diff --git a/fcs/docsrc/content/ja/filesystem.fsx b/fcs/docsrc/content/ja/filesystem.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net461"
+#I "../../../../artifacts/bin/fcs/Release/net461"
 (**
 コンパイラサービス: ファイルシステム仮想化
 ==========================================
diff --git a/fcs/docsrc/content/ja/interactive.fsx b/fcs/docsrc/content/ja/interactive.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net461"
+#I "../../../../artifacts/bin/fcs/Release/net461"
 (**
 インタラクティブサービス: F# Interactiveの組み込み
 ==================================================
diff --git a/fcs/docsrc/content/ja/project.fsx b/fcs/docsrc/content/ja/project.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net461"
+#I "../../../../artifacts/bin/fcs/Release/net461"
 (**
 コンパイラサービス: プロジェクトの分析
 ======================================
diff --git a/fcs/docsrc/content/ja/symbols.fsx b/fcs/docsrc/content/ja/symbols.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net461"
+#I "../../../../artifacts/bin/fcs/Release/net461"
 (**
 コンパイラサービス: シンボルの処理
 ==================================
diff --git a/fcs/docsrc/content/ja/tokenizer.fsx b/fcs/docsrc/content/ja/tokenizer.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net461"
+#I "../../../../artifacts/bin/fcs/Release/net461"
 (**
 コンパイラサービス：F#トークナイザを使用する
 ============================================
diff --git a/fcs/docsrc/content/ja/untypedtree.fsx b/fcs/docsrc/content/ja/untypedtree.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net461"
+#I "../../../../artifacts/bin/fcs/Release/net461"
 (**
 コンパイラサービス：型無し構文木の処理
 ======================================
diff --git a/fcs/docsrc/content/project.fsx b/fcs/docsrc/content/project.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/fcs/Release/netcoreapp3.0"
 (**
 Compiler Services: Project Analysis
 ==================================
diff --git a/fcs/docsrc/content/queue.fsx b/fcs/docsrc/content/queue.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/fcs/Release/netcoreapp3.0"
 (**
 Compiler Services: Notes on the FSharpChecker operations queue
 =================================================
diff --git a/fcs/docsrc/content/react.fsx b/fcs/docsrc/content/react.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/fcs/Release/netcoreapp3.0"
 (**
 Compiler Services: Reacting to Changes
 ============================================
diff --git a/fcs/docsrc/content/symbols.fsx b/fcs/docsrc/content/symbols.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/fcs/Release/netcoreapp3.0"
 (**
 Compiler Services: Working with symbols
 ============================================
@@ -207,7 +207,7 @@ Now do it for a particular input:
 let tmpFile = Path.ChangeExtension(System.IO.Path.GetTempFileName() , "fs")
 File.WriteAllText(tmpFile, input2)
 
-let projectResults = parseAndCheckScript(tmpFile, input2)
+let projectResults = parseAndCheckScript(tmpFile, SourceText.ofString input2)
 
 
 (**
diff --git a/fcs/docsrc/content/tokenizer.fsx b/fcs/docsrc/content/tokenizer.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/fcs/Release/netcoreapp3.0"
 (**
 Compiler Services: Using the F# tokenizer
 =========================================
diff --git a/fcs/docsrc/content/typedtree.fsx b/fcs/docsrc/content/typedtree.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/fcs/Release/netcoreapp3.0"
 (**
 Compiler Services: Processing typed expression tree
 =================================================
@@ -46,7 +46,7 @@ let parseAndCheckSingleFile (input) =
         checker.GetProjectOptionsFromScript(file, SourceText.ofString input)
         |> Async.RunSynchronously
 
-    let fprojOptions, _ = projOptions
+    let fprojOptions = projOptions
 
     checker.ParseAndCheckProject (fprojOptions)
     |> Async.RunSynchronously
diff --git a/fcs/docsrc/content/untypedtree.fsx b/fcs/docsrc/content/untypedtree.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/fcs/Release/netcoreapp3.0"
 (**
 Compiler Services: Processing untyped syntax tree
 =================================================
diff --git a/fcs/docsrc/tools/generate.fsx b/fcs/docsrc/tools/generate.fsx
@@ -29,16 +29,17 @@ open Fake.IO.FileSystemOperators
 open Fake.IO
 open Fake.Core
 open FSharp.Literate
+open FSharp.Formatting.Razor
 
 let root = "."
 
 // Paths with template/source/output locations
-let bin         = __SOURCE_DIRECTORY__ @@ "../../../release/fcs/net461"
+let bin         = __SOURCE_DIRECTORY__ @@ "../../../release/fcs/netcoreapp3.0"
 let content     = __SOURCE_DIRECTORY__ @@ "../content"
 let output      = __SOURCE_DIRECTORY__ @@ "../../../docs"
 let files       = __SOURCE_DIRECTORY__ @@ "../files"
 let templates   = __SOURCE_DIRECTORY__ @@ "templates"
-let formatting  = __SOURCE_DIRECTORY__ @@ "../../packages/FSharp.Formatting/"
+let formatting  = @"C:\Users\nojaf\.nuget\packages\fsharp.formatting\4.0.0-alpha02" // "__SOURCE_DIRECTORY__ @@ "../../packages/FSharp.Formatting/"
 let docTemplate = formatting @@ "templates/docpage.cshtml"
 
 // Where to look for *.csproj templates (in this order)
@@ -55,8 +56,9 @@ let copyFiles () =
   Shell.copyRecursive (formatting @@ "styles") (output @@ "content") true
   |> Trace.tracefn "Copying styles and scripts: %A"
 
-let clr =  System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory()
-let fsfmt =  __SOURCE_DIRECTORY__ @@ ".." @@ ".." @@ @"packages" @@ "FSharp.Formatting" @@ "lib" @@ "net40"
+let clr = System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory()
+printfn "CLR: %s" clr
+let fsfmt = @"C:\Users\nojaf\.nuget\packages\fsharp.formatting\4.0.0-alpha02\lib\netstandard2.0" // __SOURCE_DIRECTORY__ @@ ".." @@ ".." @@ @"packages" @@ "FSharp.Formatting" @@ "lib" @@ "net40"
 
 // Build API reference from XML comments
 let buildReference () =
diff --git a/fcs/paket.dependencies b/fcs/paket.dependencies
@@ -26,4 +26,5 @@ nuget FSharp.Core
 nuget Fake.Core
 nuget Fake.IO.FileSystem
 nuget Fake.Core.Trace
-nuget FSharp.Literate
+nuget FSharp.Literate 4.0.0-alpha02
+nuget FSharp.Formatting 4.0.0-alpha02
diff --git a/fcs/paket.lock b/fcs/paket.lock
@@ -792,8 +792,9 @@ NUGET
       FSharp.Core (>= 4.7)
       System.Diagnostics.FileVersionInfo (>= 4.3)
       System.IO.FileSystem.Watcher (>= 4.3)
-    FSharp.Compiler.Service (27.0.1)
-      FSharp.Core (>= 4.5.2)
+    FSharp.Compiler.Service (34.0.1)
+      FSharp.Core (>= 4.6.2)
+      System.Buffers (>= 4.5)
       System.Collections.Immutable (>= 1.5)
       System.Diagnostics.Process (>= 4.1)
       System.Diagnostics.TraceSource (>= 4.0)
@@ -803,9 +804,11 @@ NUGET
       System.Runtime.Loader (>= 4.0)
       System.Security.Cryptography.Algorithms (>= 4.3)
     FSharp.Core (4.7)
-    FSharp.Literate (3.1)
-      FSharp.Compiler.Service (>= 27.0.1 < 28.0)
-      System.ValueTuple (>= 4.5 < 5.0)
+    FSharp.Formatting (4.0.0-alpha02)
+      FSharp.Compiler.Service (>= 33.0)
+    FSharp.Literate (4.0.0-alpha02)
+      FSharp.Compiler.Service (>= 33.0)
+      FSharp.Core (>= 4.7)
     Microsoft.NETCore.Platforms (3.0)
     Microsoft.NETCore.Targets (3.0)
     Microsoft.Win32.Primitives (4.3)
@@ -1086,4 +1089,3 @@ NUGET
     System.Threading.ThreadPool (4.3)
       System.Runtime (>= 4.3)
       System.Runtime.Handles (>= 4.3)
-    System.ValueTuple (4.5)
