Merge branch 'main' of https://github.com/dotnet/fsharp into feature/fcsw

Author: Don Syme

docs/compiler-guide.md

@@ -18,8 +18,11 @@ There are several artifacts involved in the development of F#:
 
 The `FSharp.Compiler.Private` is by far the largest of these components and contains nearly all logic that `fsc` and `fsi` use. It is the primary subject of this guide.
 
-The F# compiler repositories are used to produce a range of different artifacts. For the purposes of this
-guide, the important ones are:
+## Resources for learning
+
+* Video: [Learn me some F# Compiler, an online chat with Vlad and Don](https://www.youtube.com/watch?v=-dKf15xSWPY)
+
+* Video: [Understanding the F# Optimizer, and online chat with Vlad and Don](https://www.youtube.com/watch?v=sfAe5lDue7k)
 
 ## Key data formats and representations
 
@@ -110,8 +113,10 @@ These and transformations used to build the following:
 ## Tools to help work with the compiler
 
 * [sharplab.io](https://sharplab.io/) can be used to decompile code.
+
 * [fantomas-tools](https://fsprojects.github.io/fantomas-tools/#/ast) can be used to view the Untyped & Typed Abstract Syntax Tree.
 
+
 ## Coding standards and idioms
 
 The compiler codebase uses various abbreviations. Here are some of the most common ones.

docs/fcs/caches.fsx

@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 Compiler Services: Notes on the FSharpChecker caches
 =================================================

docs/fcs/compiler.fsx

@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 Hosted Compiler
 ===============

docs/fcs/corelib.fsx

@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 Compiler Services: Notes on FSharp.Core.dll
 =================================================

docs/fcs/editor.fsx

@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 Compiler Services: Editor services
 ==================================
@@ -166,8 +166,7 @@ where we need to perform the completion.
 // Get declarations (autocomplete) for a location
 let decls = 
     checkFileResults.GetDeclarationListInfo
-      (Some parseFileResults, 7, inputLines.[6], PartialLongName.Empty 23, (fun () -> []), fun _ -> false)
-    |> Async.RunSynchronously
+      (Some parseFileResults, 7, inputLines.[6], PartialLongName.Empty 23, (fun () -> []))
 
 // Print the names of available items
 for item in decls.Items do
@@ -199,7 +198,6 @@ changes):
 // Get overloads of the String.Concat method
 let methods = 
     checkFileResults.GetMethods(5, 27, inputLines.[4], Some ["String"; "Concat"])
-    |> Async.RunSynchronously
 
 // Print concatenated parameter lists
 for mi in methods.Methods do

docs/fcs/filesystem.fsx

@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 Compiler Services: Virtualized File System
 ==========================================

docs/fcs/interactive.fsx

@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 Interactive Service: Embedding F# Interactive
 =============================================

docs/fcs/ja/compiler.fsx

@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 コンパイラの組み込み
 ====================

docs/fcs/ja/corelib.fsx

@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 コンパイラサービス: FSharp.Core.dll についてのメモ
 ==================================================

docs/fcs/ja/editor.fsx

@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 コンパイラサービス: エディタサービス
 ====================================
@@ -29,6 +29,7 @@
 
 open System
 open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.Text
 
 // インタラクティブチェッカーのインスタンスを作成
 let checker = FSharpChecker.Create()
@@ -56,7 +57,7 @@ printfn "%s" msg.
 let inputLines = input.Split('\n')
 let file = "/home/user/Test.fsx"
 
-let projOptions, _errors1 = checker.GetProjectOptionsFromScript(file, input) |> Async.RunSynchronously
+let projOptions, _errors1 = checker.GetProjectOptionsFromScript(file, SourceText.ofString input) |> Async.RunSynchronously
 
 let parsingOptions, _errors2 = checker.GetParsingOptionsFromProjectOptions(projOptions)
 
@@ -73,7 +74,7 @@ let parsingOptions, _errors2 = checker.GetParsingOptionsFromProjectOptions(projO
 *)
 // パースを実行
 let parseFileResults =
-    checker.ParseFile(file, input, parsingOptions)
+    checker.ParseFile(file, SourceText.ofString input, parsingOptions)
     |> Async.RunSynchronously
 (**
 `TypeCheckResults` に備えられた興味深い機能の紹介に入る前に、
@@ -84,15 +85,15 @@ F#コードにエラーがあった場合も何らかの型チェックの結果
 
 // 型チェックを実行
 let checkFileAnswer = 
-    checker.CheckFileInProject(parseFileResults, file, 0, input, projOptions) 
+    checker.CheckFileInProject(parseFileResults, file, 0, SourceText.ofString input, projOptions) 
     |> Async.RunSynchronously
 
 (**
 あるいは `ParseAndCheckFileInProject` を使用すれば1つの操作で両方のチェックを行うことができます：
 *)
 
 let parseResults2, checkFileAnswer2 =
-    checker.ParseAndCheckFileInProject(file, 0, input, projOptions)
+    checker.ParseAndCheckFileInProject(file, 0, SourceText.ofString input, projOptions)
     |> Async.RunSynchronously
 
 (**
@@ -178,8 +179,7 @@ printfn "%A" tip
 // 特定の位置における宣言(自動補完)を取得する
 let decls = 
     checkFileResults.GetDeclarationListInfo
-      (Some parseFileResults, 7, inputLines.[6], PartialLongName.Empty 23, (fun _ -> []), fun _ -> false)
-      |> Async.RunSynchronously
+      (Some parseFileResults, 7, inputLines.[6], PartialLongName.Empty 23, (fun _ -> []))
 
 // 利用可能な項目を表示
 for item in decls.Items do
@@ -213,7 +213,7 @@ for item in decls.Items do
 *)
 //String.Concatメソッドのオーバーロードを取得する
 let methods = 
-    checkFileResults.GetMethods(5, 27, inputLines.[4], Some ["String"; "Concat"]) |> Async.RunSynchronously
+    checkFileResults.GetMethods(5, 27, inputLines.[4], Some ["String"; "Concat"])
 
 // 連結された引数リストを表示
 for mi in methods.Methods do