FCS namespace revamp

docs/compiler-guide.md

@@ -564,14 +564,14 @@ The "intended" FCS API is the parts under the namespaces
 * FSharp.Compiler.SourceCodeServices.* (analysis, compilation, tooling, lexing)
 * FSharp.Compiler.Interactive.Shell.*  (scripting support)
 * FSharp.Compiler.AbstractIL.*  (for ILAssemblyReader hook for Rider)
-* FSharp.Compiler.SyntaxTree.*  (direct access to full untyped tree)
+* FSharp.Compiler.Syntax.*  (direct access to full untyped tree)
 
 These sections are generally designed with F#/.NET design conventions (e.g. types in namespaces, not modules, no nesting of modules etc.)
 and we will continue to iterate to make this so.
 
 In contrast, the public parts of the compiler directly under `FSharp.Compiler.*` and `FSharp.AbstractIL.*` are
-"incidental" and not really designed for public use apart from the hook for Jet Brains Rider
-(Aside: In theory all these other parts could be renamed to FSharp.Compiler.Internal though there's no need to do that right now).  
+"incidental" and not really designed for public use apart from the hook for JetBrains Rider
+(Aside: In theory all these other parts could be renamed to FSharp.Compiler though there's no need to do that right now).  
 These internal parts tend to be implemented with the "module containing lots of stuff in one big file" approach for layers of the compiler.
 
 

docs/fcs/compiler.fsx

@@ -29,7 +29,7 @@ First, we need to reference the libraries that contain F# interactive service:
 
 #r "FSharp.Compiler.Service.dll"
 open System.IO
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.CodeAnalysis
 open FSharp.Compiler.Text
 
 // Create an interactive checker instance 

docs/fcs/editor.fsx

@@ -26,7 +26,8 @@ of `InteractiveChecker`:
 #r "FSharp.Compiler.Service.dll"
 
 open System
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.CodeAnalysis
+open FSharp.Compiler.EditorServices
 open FSharp.Compiler.Text
 
 // Create an interactive checker instance 
@@ -201,6 +202,7 @@ let methods =
 // Print concatenated parameter lists
 for mi in methods.Methods do
     [ for p in mi.Parameters -> p.Display ]
+    |> List.collect (Array.map (fun tt -> tt.Text) >> Array.toList)
     |> String.concat ", " 
     |> printfn "%s(%s)" methods.MethodName
 (**

docs/fcs/filesystem.fsx

@@ -21,7 +21,8 @@ open System
 open System.IO
 open System.Collections.Generic
 open System.Text
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.CodeAnalysis
+open FSharp.Compiler.IO
 open FSharp.Compiler.Text
 
 let defaultFileSystem = FileSystem
@@ -154,7 +155,7 @@ let projectOptions =
 
 let results = checker.ParseAndCheckProject(projectOptions) |> Async.RunSynchronously
 
-results.Errors
+results.Diagnostics
 results.AssemblySignature.Entities.Count //2
 results.AssemblySignature.Entities.[0].MembersFunctionsAndValues.Count //1
 results.AssemblySignature.Entities.[0].MembersFunctionsAndValues.[0].DisplayName // "B"

docs/fcs/interactive.fsx

@@ -32,8 +32,7 @@ First, we need to reference the libraries that contain F# interactive service:
 
 #r "FSharp.Compiler.Service.dll"
 open FSharp.Compiler.Interactive.Shell
-open FSharp.Compiler.SourceCodeServices
-open FSharp.Compiler.Text
+open FSharp.Compiler.EditorServices
 
 (**
 To communicate with F# interactive, we need to create streams that represent input and
@@ -220,7 +219,7 @@ let parseResults, checkResults, checkProjectResults =
 The `parseResults` and `checkResults` have types `ParseFileResults` and `CheckFileResults`
 explained in [Editor](editor.html). You can, for example, look at the type errors in the code:
 *)
-checkResults.Errors.Length // 1
+checkResults.Diagnostics.Length // 1
 
 (**
 The code is checked with respect to the logical type context available in the F# interactive session

docs/fcs/ja/compiler.fsx

@@ -18,7 +18,7 @@
 *)
 
 #r "FSharp.Compiler.Service.dll"
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.CodeAnalysis
 open System.IO
 
 let scs = FSharpChecker.Create()

docs/fcs/ja/editor.fsx

@@ -28,7 +28,8 @@
 #r "FSharp.Compiler.Service.dll"
 
 open System
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.CodeAnalysis
+open FSharp.Compiler.EditorServices
 open FSharp.Compiler.Text
 
 // インタラクティブチェッカーのインスタンスを作成

docs/fcs/ja/filesystem.fsx

@@ -19,7 +19,8 @@ FileSystemの設定
 #r "FSharp.Compiler.Service.dll"
 open System.IO
 open System.Text
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.CodeAnalysis
+open FSharp.Compiler.IO
 open FSharp.Compiler.Text
 
 let defaultFileSystem = FileSystem
@@ -98,7 +99,7 @@ FileSystemによるコンパイルの実行
 --------------------------------
 
 *)
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.CodeAnalysis
 
 let checker = FSharpChecker.Create()
 let projectOptions = 
@@ -136,7 +137,7 @@ let projectOptions =
 
 let results = checker.ParseAndCheckProject(projectOptions) |> Async.RunSynchronously
 
-results.Errors
+results.Diagnostics
 results.AssemblySignature.Entities.Count //2
 results.AssemblySignature.Entities.[0].MembersFunctionsAndValues.Count //1
 results.AssemblySignature.Entities.[0].MembersFunctionsAndValues.[0].DisplayName // "B"

docs/fcs/ja/interactive.fsx

@@ -42,7 +42,8 @@ F# Interactiveの開始
 *)
 
 #r "FSharp.Compiler.Service.dll"
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.CodeAnalysis
+open FSharp.Compiler.EditorServices
 open FSharp.Compiler.Text
 open FSharp.Compiler.Interactive.Shell
 
@@ -232,10 +233,10 @@ let parseResults, checkResults, checkProjectResults =
 
 (** 
 `parseResults` と `checkResults` はそれぞれ [エディタ](editor.html)
-のページで説明している `ParseFileResults` と `CheckFileResults` 型です。
+のページで説明している `FSharpParseFileResults` と `FSharpCheckFileResults` 型です。
 たとえば以下のようなコードでエラーを確認出来ます:
 *)
-checkResults.Errors.Length // 1
+checkResults.Diagnostics.Length // 1
 
 (** 
 コードはF# Interactiveセッション内において、その時点までに実行された

docs/fcs/ja/project.fsx

@@ -24,7 +24,7 @@
 
 open System
 open System.Collections.Generic
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.CodeAnalysis
 open FSharp.Compiler.Text
 
 // インタラクティブチェッカーのインスタンスを作成
@@ -110,13 +110,13 @@ let wholeProjectResults = checker.ParseAndCheckProject(projectOptions) |> Async.
 (**
 発生したエラーと警告は以下のようにしてチェックできます:
 *)
-wholeProjectResults.Errors.Length // 1
-wholeProjectResults.Errors.[0].Message.Contains("Incomplete pattern matches on this expression") // true
+wholeProjectResults.Diagnostics.Length // 1
+wholeProjectResults.Diagnostics.[0].Message.Contains("Incomplete pattern matches on this expression") // true
 
-wholeProjectResults.Errors.[0].StartLineAlternate // 13
-wholeProjectResults.Errors.[0].EndLineAlternate // 13
-wholeProjectResults.Errors.[0].StartColumn // 15
-wholeProjectResults.Errors.[0].EndColumn // 16
+wholeProjectResults.Diagnostics.[0].StartLineAlternate // 13
+wholeProjectResults.Diagnostics.[0].EndLineAlternate // 13
+wholeProjectResults.Diagnostics.[0].StartColumn // 15
+wholeProjectResults.Diagnostics.[0].EndColumn // 16
 
 (**
 推測されたプロジェクトのシグネチャをチェックします:

docs/fcs/ja/symbols.fsx

@@ -21,7 +21,7 @@
 
 open System
 open System.IO
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.CodeAnalysis
 open FSharp.Compiler.Text
 
 // インタラクティブチェッカーのインスタンスを作成

docs/fcs/ja/tokenizer.fsx

@@ -21,7 +21,8 @@ F#のソースコードに対して、トークナイザは
 `SourceCodeServices` 名前空間をオープンします：
 *)
 #r "FSharp.Compiler.Service.dll"
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.CodeAnalysis
+open FSharp.Compiler.EditorServices
 open FSharp.Compiler.Text
 (**
 すると `FSharpSourceTokenizer` のインスタンスを作成できるようになります。

docs/fcs/ja/untypedtree.fsx

@@ -41,7 +41,7 @@
 *)
 #r "FSharp.Compiler.Service.dll"
 open System
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.CodeAnalysis
 open FSharp.Compiler.Text
 (**
 
@@ -102,7 +102,7 @@ ASTを理解するには
 
 ASTに関連する要素は以下の名前空間に含まれています:
 *)
-open FSharp.Compiler.SyntaxTree
+open FSharp.Compiler.Syntax
 (**
 
 ASTを処理する場合、異なる文法的要素に対するパターンマッチを行うような

docs/fcs/project.fsx

@@ -26,7 +26,7 @@ of `InteractiveChecker`:
 
 open System
 open System.Collections.Generic
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.CodeAnalysis
 open FSharp.Compiler.Text
 
 // Create an interactive checker instance 
@@ -128,13 +128,13 @@ let wholeProjectResults = checker.ParseAndCheckProject(projectOptions) |> Async.
 (**
 Now look at the errors and warnings:
 *)
-wholeProjectResults .Errors.Length // 1
-wholeProjectResults.Errors.[0].Message.Contains("Incomplete pattern matches on this expression") // yes it does
+wholeProjectResults.Diagnostics.Length // 1
+wholeProjectResults.Diagnostics.[0].Message.Contains("Incomplete pattern matches on this expression") // yes it does
 
-wholeProjectResults.Errors.[0].StartLineAlternate // 13
-wholeProjectResults.Errors.[0].EndLineAlternate // 13
-wholeProjectResults.Errors.[0].StartColumn // 15
-wholeProjectResults.Errors.[0].EndColumn // 16
+wholeProjectResults.Diagnostics.[0].StartLineAlternate // 13
+wholeProjectResults.Diagnostics.[0].EndLineAlternate // 13
+wholeProjectResults.Diagnostics.[0].StartColumn // 15
+wholeProjectResults.Diagnostics.[0].EndColumn // 16
 
 (**
 Now look at the inferred signature for the project:

docs/fcs/symbols.fsx

@@ -18,7 +18,7 @@ of `FSharpChecker`:
 
 open System
 open System.IO
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.CodeAnalysis
 open FSharp.Compiler.Text
 
 // Create an interactive checker instance 

docs/fcs/tokenizer.fsx

@@ -20,7 +20,8 @@ To use the tokenizer, reference `FSharp.Compiler.Service.dll` and open the
 `SourceCodeServices` namespace:
 *)
 #r "FSharp.Compiler.Service.dll"
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.CodeAnalysis
+open FSharp.Compiler.EditorServices
 open FSharp.Compiler.Text
 (**
 Now you can create an instance of `FSharpSourceTokenizer`. The class takes two 

docs/fcs/typedtree.fsx

@@ -25,7 +25,8 @@ To use the interactive checker, reference `FSharp.Compiler.Service.dll` and open
 #r "FSharp.Compiler.Service.dll"
 open System
 open System.IO
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.CodeAnalysis
+open FSharp.Compiler.EditorServices
 open FSharp.Compiler.Text
 (**
 
@@ -75,8 +76,7 @@ type MyClass() =
 let checkProjectResults = 
     parseAndCheckSingleFile(input2)
 
-checkProjectResults.Errors // should be empty
-
+checkProjectResults.Diagnostics // should be empty
 
 (**
 

docs/fcs/untypedtree.fsx

@@ -30,7 +30,7 @@ To use the interactive checker, reference `FSharp.Compiler.Service.dll` and open
 *)
 #r "FSharp.Compiler.Service.dll"
 open System
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.CodeAnalysis
 open FSharp.Compiler.Text
 (**
 
@@ -84,7 +84,7 @@ code](https://github.com/fsharp/fsharp/blob/master/src/fsharp/ast.fs#L464).
 
 The relevant parts are in the following namespace:
 *)
-open FSharp.Compiler.SyntaxTree
+open FSharp.Compiler.Syntax
 (**
 
 When processing the AST, you will typically write a number of mutually recursive functions

fcs-samples/FscExe/FscMain.fs

@@ -8,8 +8,8 @@ open System.IO
 open System.Reflection
 open System.Runtime.CompilerServices
 open FSharp.Compiler.SourceCodeServices
-open FSharp.Compiler.AbstractIL.Internal.Utils // runningOnMono
-open FSharp.Compiler.AbstractIL.Internal.Library
+open FSharp.Compiler.AbstractIL.Utils // runningOnMono
+open FSharp.Compiler.AbstractIL.Library
 open FSharp.Compiler.ErrorLogger
 
 #if RESIDENT_COMPILER

fcs-samples/UntypedTree/Program.fs

@@ -1,6 +1,6 @@
 // Open the namespace with InteractiveChecker type
 open FSharp.Compiler.SourceCodeServices
-open FSharp.Compiler.SyntaxTree
+open FSharp.Compiler.Syntax
 
 // Create a checker instance (ignore notifications)
 let checker = FSharpChecker.Create()