diff --git a/benchmarks/CompilerServiceBenchmarks/Program.fs b/benchmarks/CompilerServiceBenchmarks/Program.fs index d5e45275775..95485c5c145 100644 --- a/benchmarks/CompilerServiceBenchmarks/Program.fs +++ b/benchmarks/CompilerServiceBenchmarks/Program.fs @@ -2,8 +2,8 @@ open System.IO open BenchmarkDotNet.Attributes open BenchmarkDotNet.Running -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.SourceCodeServices open System.Text [] diff --git a/fcs/FSharp.Compiler.Service.ProjectCracker/ProjectCracker.fs b/fcs/FSharp.Compiler.Service.ProjectCracker/ProjectCracker.fs index 72e34499678..eff81a3d24d 100644 --- a/fcs/FSharp.Compiler.Service.ProjectCracker/ProjectCracker.fs +++ b/fcs/FSharp.Compiler.Service.ProjectCracker/ProjectCracker.fs @@ -1,4 +1,4 @@ -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices #if !NETSTANDARD1_6 open System.Runtime.Serialization.Json @@ -69,7 +69,7 @@ type ProjectCracker = yield v |] - let ret, opts = Microsoft.FSharp.Compiler.SourceCodeServices.ProjectCrackerTool.ProjectCrackerTool.crackOpen arguments + let ret, opts = FSharp.Compiler.SourceCodeServices.ProjectCrackerTool.ProjectCrackerTool.crackOpen arguments ignore ret #else let arguments = new StringBuilder() diff --git a/fcs/FSharp.Compiler.Service.ProjectCrackerTool/Program.fs b/fcs/FSharp.Compiler.Service.ProjectCrackerTool/Program.fs index e3de75d0d1b..8379737c939 100644 --- a/fcs/FSharp.Compiler.Service.ProjectCrackerTool/Program.fs +++ b/fcs/FSharp.Compiler.Service.ProjectCrackerTool/Program.fs @@ -1,4 +1,4 @@ -namespace Microsoft.FSharp.Compiler.SourceCodeServices.ProjectCrackerTool +namespace FSharp.Compiler.SourceCodeServices.ProjectCrackerTool open System open System.Reflection diff --git a/fcs/FSharp.Compiler.Service.ProjectCrackerTool/ProjectCrackerOptions.fs b/fcs/FSharp.Compiler.Service.ProjectCrackerTool/ProjectCrackerOptions.fs index 71cb966fb19..a48bdc25aa7 100644 --- a/fcs/FSharp.Compiler.Service.ProjectCrackerTool/ProjectCrackerOptions.fs +++ b/fcs/FSharp.Compiler.Service.ProjectCrackerTool/ProjectCrackerOptions.fs @@ -1,4 +1,4 @@ -namespace Microsoft.FSharp.Compiler.SourceCodeServices.ProjectCrackerTool +namespace FSharp.Compiler.SourceCodeServices.ProjectCrackerTool [] type ProjectOptions = diff --git a/fcs/FSharp.Compiler.Service.ProjectCrackerTool/ProjectCrackerTool.fs b/fcs/FSharp.Compiler.Service.ProjectCrackerTool/ProjectCrackerTool.fs index daa5c3c9e05..7cf970f7a7f 100644 --- a/fcs/FSharp.Compiler.Service.ProjectCrackerTool/ProjectCrackerTool.fs +++ b/fcs/FSharp.Compiler.Service.ProjectCrackerTool/ProjectCrackerTool.fs @@ -1,4 +1,4 @@ -namespace Microsoft.FSharp.Compiler.SourceCodeServices.ProjectCrackerTool +namespace FSharp.Compiler.SourceCodeServices.ProjectCrackerTool open System open System.IO diff --git a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj index 55a43730801..bdfe6970e8a 100644 --- a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj +++ b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj @@ -57,11 +57,11 @@ FSStrings.resources - --module Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser --open Microsoft.FSharp.Compiler.AbstractIL --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing + --module FSharp.Compiler.AbstractIL.Internal.AsciiParser --open FSharp.Compiler.AbstractIL --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing ilpars.fsy - --module Microsoft.FSharp.Compiler.Parser --open Microsoft.FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing + --module FSharp.Compiler.Parser --open FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing pars.fsy @@ -294,7 +294,7 @@ ParserAndUntypedAST/pplex.fsl - --module Microsoft.FSharp.Compiler.PPParser --open Microsoft.FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing + --module FSharp.Compiler.PPParser --open FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing ParserAndUntypedAST/pppars.fsy diff --git a/fcs/docsrc/content/compiler.fsx b/fcs/docsrc/content/compiler.fsx index 534e65d5ad7..9cc41343c73 100644 --- a/fcs/docsrc/content/compiler.fsx +++ b/fcs/docsrc/content/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 Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices // Create an interactive checker instance let checker = FSharpChecker.Create() diff --git a/fcs/docsrc/content/editor.fsx b/fcs/docsrc/content/editor.fsx index d6b19fd0e6f..6d0ba69df51 100644 --- a/fcs/docsrc/content/editor.fsx +++ b/fcs/docsrc/content/editor.fsx @@ -26,7 +26,7 @@ of `InteractiveChecker`: #r "FSharp.Compiler.Service.dll" open System -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices // Create an interactive checker instance let checker = FSharpChecker.Create() @@ -127,7 +127,7 @@ identifier (the other option lets you get tooltip with full assembly location wh *) // Get tag of the IDENT token to be used as the last argument -open Microsoft.FSharp.Compiler +open FSharp.Compiler let identToken = FSharpTokenTag.Identifier // Get tool tip at the specified location diff --git a/fcs/docsrc/content/filesystem.fsx b/fcs/docsrc/content/filesystem.fsx index 1461d024fb7..9f56275fa5d 100644 --- a/fcs/docsrc/content/filesystem.fsx +++ b/fcs/docsrc/content/filesystem.fsx @@ -21,7 +21,7 @@ open System open System.IO open System.Collections.Generic open System.Text -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Internal.Library let defaultFileSystem = Shim.FileSystem @@ -90,7 +90,7 @@ Doing a compilation with the FileSystem --------------------------------------- *) -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices let checker = FSharpChecker.Create() diff --git a/fcs/docsrc/content/interactive.fsx b/fcs/docsrc/content/interactive.fsx index 6e09cfd13ec..d6bd1cfe553 100644 --- a/fcs/docsrc/content/interactive.fsx +++ b/fcs/docsrc/content/interactive.fsx @@ -31,8 +31,8 @@ First, we need to reference the libraries that contain F# interactive service: *) #r "FSharp.Compiler.Service.dll" -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Interactive.Shell +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Interactive.Shell (** To communicate with F# interactive, we need to create streams that represent input and @@ -225,7 +225,7 @@ based on the declarations executed so far. You can also request declaration list information, tooltip text and symbol resolution: *) -open Microsoft.FSharp.Compiler +open FSharp.Compiler // get a tooltip checkResults.GetToolTipTextAlternate(1, 2, "xxx + xx", ["xxx"], FSharpTokenTag.IDENT) diff --git a/fcs/docsrc/content/ja/compiler.fsx b/fcs/docsrc/content/ja/compiler.fsx index 393f837cb5f..e61a4e842fb 100644 --- a/fcs/docsrc/content/ja/compiler.fsx +++ b/fcs/docsrc/content/ja/compiler.fsx @@ -18,7 +18,7 @@ *) #r "FSharp.Compiler.Service.dll" -open Microsoft.FSharp.Compiler.SimpleSourceCodeServices +open FSharp.Compiler.SimpleSourceCodeServices open System.IO let scs = SimpleSourceCodeServices() diff --git a/fcs/docsrc/content/ja/editor.fsx b/fcs/docsrc/content/ja/editor.fsx index 7bd61da5189..85742ca4611 100644 --- a/fcs/docsrc/content/ja/editor.fsx +++ b/fcs/docsrc/content/ja/editor.fsx @@ -28,7 +28,7 @@ #r "FSharp.Compiler.Service.dll" open System -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices // インタラクティブチェッカーのインスタンスを作成 let checker = FSharpChecker.Create() @@ -137,7 +137,7 @@ match checkFileAnswer with *) // 最後の引数に指定する、IDENTトークンのタグを取得 -open Microsoft.FSharp.Compiler +open FSharp.Compiler let identToken = Parser.tagOfToken(Parser.token.IDENT("")) // 特定の位置におけるツールチップを取得 diff --git a/fcs/docsrc/content/ja/filesystem.fsx b/fcs/docsrc/content/ja/filesystem.fsx index 1646b49ccff..0fc99868024 100644 --- a/fcs/docsrc/content/ja/filesystem.fsx +++ b/fcs/docsrc/content/ja/filesystem.fsx @@ -21,7 +21,7 @@ open System open System.IO open System.Collections.Generic open System.Text -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Internal.Library let defaultFileSystem = Shim.FileSystem @@ -90,7 +90,7 @@ FileSystemによるコンパイルの実行 -------------------------------- *) -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices let checker = FSharpChecker.Create() let projectOptions = diff --git a/fcs/docsrc/content/ja/interactive.fsx b/fcs/docsrc/content/ja/interactive.fsx index 63240cd98fd..a443f4c3550 100644 --- a/fcs/docsrc/content/ja/interactive.fsx +++ b/fcs/docsrc/content/ja/interactive.fsx @@ -42,8 +42,8 @@ F# Interactiveの開始 *) #r "FSharp.Compiler.Service.dll" -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Interactive.Shell +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Interactive.Shell (** F# Interactiveとやりとりするには、入出力を表すストリームを作成する必要があります。 @@ -243,7 +243,7 @@ checkResults.Errors.Length // 1 要求することもできます: *) -open Microsoft.FSharp.Compiler +open FSharp.Compiler // ツールチップを取得する checkResults.GetToolTipTextAlternate(1, 2, "xxx + xx", ["xxx"], FSharpTokenTag.IDENT) diff --git a/fcs/docsrc/content/ja/project.fsx b/fcs/docsrc/content/ja/project.fsx index 3e2895b9f38..9b7e840bd2b 100644 --- a/fcs/docsrc/content/ja/project.fsx +++ b/fcs/docsrc/content/ja/project.fsx @@ -24,7 +24,7 @@ open System open System.Collections.Generic -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices // インタラクティブチェッカーのインスタンスを作成 let checker = FSharpChecker.Create() diff --git a/fcs/docsrc/content/ja/symbols.fsx b/fcs/docsrc/content/ja/symbols.fsx index d6abee12332..bffa10b934b 100644 --- a/fcs/docsrc/content/ja/symbols.fsx +++ b/fcs/docsrc/content/ja/symbols.fsx @@ -21,7 +21,7 @@ open System open System.IO -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices // インタラクティブチェッカーのインスタンスを作成 let checker = FSharpChecker.Create() diff --git a/fcs/docsrc/content/ja/tokenizer.fsx b/fcs/docsrc/content/ja/tokenizer.fsx index cf5117bfbd0..fb64fd7723c 100644 --- a/fcs/docsrc/content/ja/tokenizer.fsx +++ b/fcs/docsrc/content/ja/tokenizer.fsx @@ -21,7 +21,7 @@ F#のソースコードに対して、トークナイザは `SourceCodeServices` 名前空間をオープンします： *) #r "FSharp.Compiler.Service.dll" -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices (** すると `FSharpSourceTokenizer` のインスタンスを作成できるようになります。 このクラスには2つの引数を指定します。 diff --git a/fcs/docsrc/content/ja/untypedtree.fsx b/fcs/docsrc/content/ja/untypedtree.fsx index 38f6e0b0e9c..9cd4526f25a 100644 --- a/fcs/docsrc/content/ja/untypedtree.fsx +++ b/fcs/docsrc/content/ja/untypedtree.fsx @@ -41,7 +41,7 @@ *) #r "FSharp.Compiler.Service.dll" open System -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices (** ### 型無しパースの実行 @@ -101,7 +101,7 @@ ASTを理解するには ASTに関連する要素は以下の名前空間に含まれています: *) -open Microsoft.FSharp.Compiler.Ast +open FSharp.Compiler.Ast (** ASTを処理する場合、異なる文法的要素に対するパターンマッチを行うような diff --git a/fcs/docsrc/content/project.fsx b/fcs/docsrc/content/project.fsx index abf6ff227fd..4df9ca23e93 100644 --- a/fcs/docsrc/content/project.fsx +++ b/fcs/docsrc/content/project.fsx @@ -27,7 +27,7 @@ of `InteractiveChecker`: open System open System.Collections.Generic -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices // Create an interactive checker instance let checker = FSharpChecker.Create() diff --git a/fcs/docsrc/content/symbols.fsx b/fcs/docsrc/content/symbols.fsx index ac38053a1b8..f6223645523 100644 --- a/fcs/docsrc/content/symbols.fsx +++ b/fcs/docsrc/content/symbols.fsx @@ -18,7 +18,7 @@ of `FSharpChecker`: open System open System.IO -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices // Create an interactive checker instance let checker = FSharpChecker.Create() diff --git a/fcs/docsrc/content/tokenizer.fsx b/fcs/docsrc/content/tokenizer.fsx index 9ac3d6f34d4..dc5a641ad43 100644 --- a/fcs/docsrc/content/tokenizer.fsx +++ b/fcs/docsrc/content/tokenizer.fsx @@ -20,7 +20,7 @@ To use the tokenizer, reference `FSharp.Compiler.Service.dll` and open the `SourceCodeServices` namespace: *) #r "FSharp.Compiler.Service.dll" -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices (** Now you can create an instance of `FSharpSourceTokenizer`. The class takes two arguments - the first is the list of defined symbols and the second is the diff --git a/fcs/docsrc/content/typedtree.fsx b/fcs/docsrc/content/typedtree.fsx index b06210c34f4..0192ee731ab 100644 --- a/fcs/docsrc/content/typedtree.fsx +++ b/fcs/docsrc/content/typedtree.fsx @@ -25,7 +25,7 @@ To use the interactive checker, reference `FSharp.Compiler.Service.dll` and open #r "FSharp.Compiler.Service.dll" open System open System.IO -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices (** ### Checking code diff --git a/fcs/docsrc/content/untypedtree.fsx b/fcs/docsrc/content/untypedtree.fsx index d67a1ef71bf..553b5f27571 100644 --- a/fcs/docsrc/content/untypedtree.fsx +++ b/fcs/docsrc/content/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 Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices (** ### Performing untyped parse @@ -83,7 +83,7 @@ code](https://github.com/fsharp/fsharp/blob/master/src/fsharp/ast.fs#L464). The relevant parts are in the following namespace: *) -open Microsoft.FSharp.Compiler.Ast +open FSharp.Compiler.Ast (** When processing the AST, you will typically write a number of mutually recursive functions diff --git a/fcs/samples/EditorService/Program.fs b/fcs/samples/EditorService/Program.fs index 5a2cb624f0c..91c50b36a98 100644 --- a/fcs/samples/EditorService/Program.fs +++ b/fcs/samples/EditorService/Program.fs @@ -1,8 +1,8 @@ // Open the namespace with InteractiveChecker type open System -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.QuickParse +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.QuickParse // Create an interactive checker instance (ignore notifications) let checker = FSharpChecker.Create() diff --git a/fcs/samples/FscExe/FscMain.fs b/fcs/samples/FscExe/FscMain.fs index af8f290df78..94e0a42ceb5 100644 --- a/fcs/samples/FscExe/FscMain.fs +++ b/fcs/samples/FscExe/FscMain.fs @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.CommandLineMain +module internal FSharp.Compiler.CommandLineMain open System open System.Diagnostics open System.IO open System.Reflection open System.Runtime.CompilerServices -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.AbstractIL.IL // runningOnMono -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.AbstractIL.IL // runningOnMono +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Range #if RESIDENT_COMPILER type TypeInThisAssembly() = member x.Dummy = 1 @@ -307,5 +307,5 @@ let main(argv) = try Driver.main(Array.append [| "fsc.exe" |] argv); with e -> - errorRecovery e Microsoft.FSharp.Compiler.Range.range0; + errorRecovery e FSharp.Compiler.Range.range0; 1 diff --git a/fcs/samples/FsiExe/console.fs b/fcs/samples/FsiExe/console.fs index 5f24fe4fd1f..efde3707c25 100644 --- a/fcs/samples/FsiExe/console.fs +++ b/fcs/samples/FsiExe/console.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.Interactive +namespace FSharp.Compiler.Interactive open System open System.Text diff --git a/fcs/samples/FsiExe/fsimain.fs b/fcs/samples/FsiExe/fsimain.fs index ead26ca026a..c59ef2fe50f 100644 --- a/fcs/samples/FsiExe/fsimain.fs +++ b/fcs/samples/FsiExe/fsimain.fs @@ -13,7 +13,7 @@ //---------------------------------------------------------------------------- -module internal Sample.Microsoft.FSharp.Compiler.Interactive.Main +module internal Sample.FSharp.Compiler.Interactive.Main open System open System.Globalization @@ -22,9 +22,9 @@ open System.Reflection open System.Threading open System.Windows.Forms -open Microsoft.FSharp.Compiler.Interactive.Shell -open Microsoft.FSharp.Compiler.Interactive -open Microsoft.FSharp.Compiler +open FSharp.Compiler.Interactive.Shell +open FSharp.Compiler.Interactive +open FSharp.Compiler #nowarn "55" @@ -53,7 +53,7 @@ let WinFormsEventLoop(lcid : int option) = do mainForm.DoCreateHandle(); // Set the default thread exception handler let restart = ref false - { new Microsoft.FSharp.Compiler.Interactive.IEventLoop with + { new FSharp.Compiler.Interactive.IEventLoop with member x.Run() = restart := false Application.Run() @@ -151,7 +151,7 @@ let MainMain argv = #endif try - let console = new Microsoft.FSharp.Compiler.Interactive.ReadLineConsole() + let console = new FSharp.Compiler.Interactive.ReadLineConsole() let getConsoleReadLine (probeToSeeIfConsoleWorks) = let consoleIsOperational = if probeToSeeIfConsoleWorks then diff --git a/fcs/samples/FsiExe/fsiserver.fs b/fcs/samples/FsiExe/fsiserver.fs index 77b90832372..838c2593046 100644 --- a/fcs/samples/FsiExe/fsiserver.fs +++ b/fcs/samples/FsiExe/fsiserver.fs @@ -7,7 +7,7 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. //[] // avoid calling the type "Shared" which is keyword in some languages -namespace Microsoft.FSharp.Compiler.Server.Shared +namespace FSharp.Compiler.Server.Shared // For FSI VS plugin, require FSI to provide services: // e.g. diff --git a/fcs/samples/InteractiveService/Program.fs b/fcs/samples/InteractiveService/Program.fs index 2e2c8b2da4d..4b8d968864c 100644 --- a/fcs/samples/InteractiveService/Program.fs +++ b/fcs/samples/InteractiveService/Program.fs @@ -1,6 +1,6 @@ open System open System.IO -open Microsoft.FSharp.Compiler.Interactive.Shell +open FSharp.Compiler.Interactive.Shell let sbOut = new Text.StringBuilder() let sbErr = new Text.StringBuilder() diff --git a/fcs/samples/Tokenizer/Program.fs b/fcs/samples/Tokenizer/Program.fs index 9cc79e699f4..5a353736738 100644 --- a/fcs/samples/Tokenizer/Program.fs +++ b/fcs/samples/Tokenizer/Program.fs @@ -1,4 +1,4 @@ -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices let sourceTok = FSharpSourceTokenizer([], Some "C:\\test.fsx") diff --git a/fcs/samples/UntypedTree/Program.fs b/fcs/samples/UntypedTree/Program.fs index 3334b093bad..c2a0caee13c 100644 --- a/fcs/samples/UntypedTree/Program.fs +++ b/fcs/samples/UntypedTree/Program.fs @@ -1,6 +1,6 @@ // Open the namespace with InteractiveChecker type open System -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices // Create a checker instance (ignore notifications) @@ -18,7 +18,7 @@ let getUntypedTree (file, input) = // ------------------------------------------------------------------ -open Microsoft.FSharp.Compiler.Ast +open FSharp.Compiler.Ast /// Walk over all module or namespace declarations /// (basically 'module Foo =' or 'namespace Foo.Bar') diff --git a/src/absil/bytes.fs b/src/absil/bytes.fs index c385e987ab5..a272b99a454 100644 --- a/src/absil/bytes.fs +++ b/src/absil/bytes.fs @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Byte arrays -namespace Microsoft.FSharp.Compiler.AbstractIL.Internal +namespace FSharp.Compiler.AbstractIL.Internal open System.IO open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal module internal Bytes = let b0 n = (n &&& 0xFF) diff --git a/src/absil/bytes.fsi b/src/absil/bytes.fsi index 796eb161872..c611e80c776 100644 --- a/src/absil/bytes.fsi +++ b/src/absil/bytes.fsi @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Blobs of bytes, cross-compiling -namespace Microsoft.FSharp.Compiler.AbstractIL.Internal +namespace FSharp.Compiler.AbstractIL.Internal open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal module internal Bytes = diff --git a/src/absil/il.fs b/src/absil/il.fs index 61c5a33a845..5e175d3649c 100644 --- a/src/absil/il.fs +++ b/src/absil/il.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module Microsoft.FSharp.Compiler.AbstractIL.IL +module FSharp.Compiler.AbstractIL.IL #nowarn "49" #nowarn "343" // The type 'ILAssemblyRef' implements 'System.IComparable' explicitly but provides no corresponding override for 'Object.Equals'. @@ -16,10 +16,10 @@ open System.Collections.Concurrent open System.Runtime.CompilerServices open System.Reflection -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library open Internal.Utilities diff --git a/src/absil/il.fsi b/src/absil/il.fsi index 668459088fd..81ea5622514 100644 --- a/src/absil/il.fsi +++ b/src/absil/il.fsi @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// The "unlinked" view of .NET metadata and code. Central to the Abstract IL library -module public Microsoft.FSharp.Compiler.AbstractIL.IL +module public FSharp.Compiler.AbstractIL.IL open System.Collections.Generic open System.Reflection diff --git a/src/absil/ilascii.fs b/src/absil/ilascii.fs index 763235afa19..41196df57a3 100644 --- a/src/absil/ilascii.fs +++ b/src/absil/ilascii.fs @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiConstants +module internal FSharp.Compiler.AbstractIL.Internal.AsciiConstants open Internal.Utilities open Internal.Utilities.Collections -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.Types -open Microsoft.FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Extensions.ILX.Types +open FSharp.Compiler.AbstractIL.IL // set to the proper value at CompileOps.fs (BuildFrameworkTcImports) let parseILGlobals = ref EcmaMscorlibILGlobals diff --git a/src/absil/ilascii.fsi b/src/absil/ilascii.fsi index d142d2f6204..1b94bbed22b 100644 --- a/src/absil/ilascii.fsi +++ b/src/absil/ilascii.fsi @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Various constants and utilities used when parsing the ILASM format for IL -module internal Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiConstants +module internal FSharp.Compiler.AbstractIL.Internal.AsciiConstants open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.Types -open Microsoft.FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Extensions.ILX.Types +open FSharp.Compiler.AbstractIL.IL // -------------------------------------------------------------------- // IL Parser state - must be initialized before parsing a module diff --git a/src/absil/ilbinary.fs b/src/absil/ilbinary.fs index 46dfef12be6..41297d117ef 100644 --- a/src/absil/ilbinary.fs +++ b/src/absil/ilbinary.fs @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.AbstractIL.Internal.BinaryConstants +module internal FSharp.Compiler.AbstractIL.Internal.BinaryConstants open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library [] type TableName(idx: int) = diff --git a/src/absil/ilbinary.fsi b/src/absil/ilbinary.fsi index 1f95028cb7f..200ee8b0274 100644 --- a/src/absil/ilbinary.fsi +++ b/src/absil/ilbinary.fsi @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Compiler use only. Code and constants shared between binary reader/writer. -module internal Microsoft.FSharp.Compiler.AbstractIL.Internal.BinaryConstants +module internal FSharp.Compiler.AbstractIL.Internal.BinaryConstants open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal [] diff --git a/src/absil/ildiag.fs b/src/absil/ildiag.fs index 8b58001bd80..de7411fbf9b 100644 --- a/src/absil/ildiag.fs +++ b/src/absil/ildiag.fs @@ -2,7 +2,7 @@ /// Configurable Diagnostics channel for the Abstract IL library -module internal Microsoft.FSharp.Compiler.AbstractIL.Diagnostics +module internal FSharp.Compiler.AbstractIL.Diagnostics open Internal.Utilities diff --git a/src/absil/ildiag.fsi b/src/absil/ildiag.fsi index d0b8ab95576..4be1d87bc4c 100644 --- a/src/absil/ildiag.fsi +++ b/src/absil/ildiag.fsi @@ -6,7 +6,7 @@ /// points to stderr. All functions call flush() automatically. /// /// REVIEW: review if we should just switch to System.Diagnostics -module internal Microsoft.FSharp.Compiler.AbstractIL.Diagnostics +module internal FSharp.Compiler.AbstractIL.Diagnostics open System.IO open Microsoft.FSharp.Core.Printf diff --git a/src/absil/illex.fsl b/src/absil/illex.fsl index 481f7b28f63..849ebd17b8e 100644 --- a/src/absil/illex.fsl +++ b/src/absil/illex.fsl @@ -2,18 +2,18 @@ { -module internal Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiLexer +module internal FSharp.Compiler.AbstractIL.Internal.AsciiLexer open Internal.Utilities open Internal.Utilities.Collections open Internal.Utilities.Text open Internal.Utilities.Text.Lexing -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser -open Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiConstants +open FSharp.Compiler.AbstractIL.Internal.AsciiParser +open FSharp.Compiler.AbstractIL.Internal.AsciiConstants let lexeme (lexbuf : LexBuffer) = new System.String(lexbuf.Lexeme) diff --git a/src/absil/illib.fs b/src/absil/illib.fs index 44261606387..159975b4407 100644 --- a/src/absil/illib.fs +++ b/src/absil/illib.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module public Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +module public FSharp.Compiler.AbstractIL.Internal.Library #nowarn "1178" // The struct, record or union type 'internal_instr_extension' is not structurally comparable because the type diff --git a/src/absil/ilmorph.fs b/src/absil/ilmorph.fs index d5398099e0d..e0fe4cc749c 100644 --- a/src/absil/ilmorph.fs +++ b/src/absil/ilmorph.fs @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.AbstractIL.Morphs +module internal FSharp.Compiler.AbstractIL.Morphs open System.Collections.Generic open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.AbstractIL.IL let mutable morphCustomAttributeData = false diff --git a/src/absil/ilmorph.fsi b/src/absil/ilmorph.fsi index 3a12eeb5210..1b5fc1499d9 100644 --- a/src/absil/ilmorph.fsi +++ b/src/absil/ilmorph.fsi @@ -6,10 +6,10 @@ /// morphed occurs, e.g. the module being morphed itself, the /// ILTypeDef (possibly nested) where the item occurs, /// the ILMethodDef (if any) where the item occurs. etc. -module internal Microsoft.FSharp.Compiler.AbstractIL.Morphs +module internal FSharp.Compiler.AbstractIL.Morphs -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL /// Morph each scope reference inside a type signature. val morphILScopeRefsInILTypeRef: (ILScopeRef -> ILScopeRef) -> ILTypeRef -> ILTypeRef diff --git a/src/absil/ilpars.fsy b/src/absil/ilpars.fsy index 40ad9fd1272..b6852015466 100644 --- a/src/absil/ilpars.fsy +++ b/src/absil/ilpars.fsy @@ -7,13 +7,13 @@ open Internal.Utilities open Internal.Utilities.Text -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiConstants -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.Types -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.AsciiConstants +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.AbstractIL.Extensions.ILX.Types +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal.Library let pfailwith s = diff --git a/src/absil/ilprint.fs b/src/absil/ilprint.fs index 58c13ba1482..c2d4e1d45d1 100644 --- a/src/absil/ilprint.fs +++ b/src/absil/ilprint.fs @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.AbstractIL.ILAsciiWriter +module internal FSharp.Compiler.AbstractIL.ILAsciiWriter open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.Types -open Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiConstants -open Microsoft.FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.AbstractIL.Extensions.ILX.Types +open FSharp.Compiler.AbstractIL.Internal.AsciiConstants +open FSharp.Compiler.AbstractIL.IL open System.Text open System.IO diff --git a/src/absil/ilprint.fsi b/src/absil/ilprint.fsi index 5f7ebe4f11d..9ba4ccb1bf7 100644 --- a/src/absil/ilprint.fsi +++ b/src/absil/ilprint.fsi @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Printer for the abstract syntax. -module internal Microsoft.FSharp.Compiler.AbstractIL.ILAsciiWriter +module internal FSharp.Compiler.AbstractIL.ILAsciiWriter -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal open System.IO #if DEBUG diff --git a/src/absil/ilread.fs b/src/absil/ilread.fs index c2c10e9479b..7b500c4381e 100644 --- a/src/absil/ilread.fs +++ b/src/absil/ilread.fs @@ -5,7 +5,7 @@ // //--------------------------------------------------------------------- -module Microsoft.FSharp.Compiler.AbstractIL.ILBinaryReader +module FSharp.Compiler.AbstractIL.ILBinaryReader #nowarn "42" // This construct is deprecated: it is only for use in the F# library @@ -17,17 +17,17 @@ open System.Runtime.InteropServices open System.Text open Internal.Utilities open Internal.Utilities.Collections -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal #if !FX_NO_PDB_READER -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Support +open FSharp.Compiler.AbstractIL.Internal.Support #endif -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.AbstractIL.Internal.BinaryConstants -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.AbstractIL.Internal.BinaryConstants +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Range open Microsoft.FSharp.NativeInterop open System.Reflection @@ -4099,7 +4099,7 @@ let OpenILModuleReader fileName opts = [] module Shim = - open Microsoft.FSharp.Compiler.Lib + open FSharp.Compiler.Lib type IAssemblyReader = abstract GetILModuleReader: filename: string * readerOptions: ILReaderOptions -> ILModuleReader diff --git a/src/absil/ilread.fsi b/src/absil/ilread.fsi index c548447444a..8fa43982fea 100644 --- a/src/absil/ilread.fsi +++ b/src/absil/ilread.fsi @@ -24,13 +24,13 @@ /// class. That is not particularly satisfactory, and it may be /// a good idea to build a small library which extracts the information /// you need. -module Microsoft.FSharp.Compiler.AbstractIL.ILBinaryReader +module FSharp.Compiler.AbstractIL.ILBinaryReader open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.ErrorLogger +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.ErrorLogger open System.IO /// Used to implement a Binary file over native memory, used by Roslyn integration diff --git a/src/absil/ilreflect.fs b/src/absil/ilreflect.fs index 5e15cbbd37b..2b6dd3d06d5 100644 --- a/src/absil/ilreflect.fs +++ b/src/absil/ilreflect.fs @@ -5,7 +5,7 @@ //---------------------------------------------------------------------------- -module internal Microsoft.FSharp.Compiler.AbstractIL.ILRuntimeWriter +module internal FSharp.Compiler.AbstractIL.ILRuntimeWriter open System open System.Reflection @@ -13,13 +13,13 @@ open System.Reflection.Emit open System.Runtime.InteropServices open System.Collections.Generic -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Range open Microsoft.FSharp.Core.Printf @@ -30,7 +30,7 @@ open Microsoft.FSharp.Core.ReflectionAdapters let codeLabelOrder = ComparisonIdentity.Structural // Convert the output of convCustomAttr -open Microsoft.FSharp.Compiler.AbstractIL.ILAsciiWriter +open FSharp.Compiler.AbstractIL.ILAsciiWriter let wrapCustomAttr setCustomAttr (cinfo, bytes) = setCustomAttr(cinfo, bytes) diff --git a/src/absil/ilsign.fs b/src/absil/ilsign.fs index becf5aee92b..4608a9f9d5d 100644 --- a/src/absil/ilsign.fs +++ b/src/absil/ilsign.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.AbstractIL.Internal.StrongNameSign +module internal FSharp.Compiler.AbstractIL.Internal.StrongNameSign #nowarn "9" diff --git a/src/absil/ilsupp.fs b/src/absil/ilsupp.fs index fb4e3a58fdd..6fbdc5bb72d 100644 --- a/src/absil/ilsupp.fs +++ b/src/absil/ilsupp.fs @@ -1,19 +1,19 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.AbstractIL.Internal.Support +module internal FSharp.Compiler.AbstractIL.Internal.Support let DateTime1970Jan01 = new System.DateTime(1970,1,1,0,0,0,System.DateTimeKind.Utc) (* ECMA Spec (Oct2002), Part II, 24.2.2 PE File Header. *) let absilWriteGetTimeStamp () = (System.DateTime.UtcNow - DateTime1970Jan01).TotalSeconds |> int open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Bytes -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Bytes +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.AbstractIL.Internal.Library #if FX_NO_CORHOST_SIGNER -open Microsoft.FSharp.Compiler.AbstractIL.Internal.StrongNameSign +open FSharp.Compiler.AbstractIL.Internal.StrongNameSign #endif open System open System.IO @@ -1036,7 +1036,7 @@ let pdbInitialize (binaryName:string) (pdbName:string) = { symWriter = writer } -[] +[] do() let pdbCloseDocument(documentWriter : PdbDocumentWriter) = diff --git a/src/absil/ilsupp.fsi b/src/absil/ilsupp.fsi index 3a3748c6d2c..48e7de602b3 100644 --- a/src/absil/ilsupp.fsi +++ b/src/absil/ilsupp.fsi @@ -5,7 +5,7 @@ /// Runtime, e.g. between the SSCLI, Mono and the Microsoft CLR. /// /// The implementation of the functions can be found in ilsupp-*.fs -module internal Microsoft.FSharp.Compiler.AbstractIL.Internal.Support +module internal FSharp.Compiler.AbstractIL.Internal.Support #if !FX_NO_PDB_WRITER type PdbWriter @@ -25,9 +25,9 @@ open System.Runtime.InteropServices open System.Diagnostics.SymbolStore #endif open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.IL #if !FX_NO_LINKEDRESOURCES type IStream = System.Runtime.InteropServices.ComTypes.IStream diff --git a/src/absil/ilwrite.fs b/src/absil/ilwrite.fs index 12541d5089e..cc30951dac8 100644 --- a/src/absil/ilwrite.fs +++ b/src/absil/ilwrite.fs @@ -1,26 +1,26 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.AbstractIL.ILBinaryWriter +module internal FSharp.Compiler.AbstractIL.ILBinaryWriter open System.Collections.Generic open System.IO open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.ILAsciiWriter -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.Types -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.BinaryConstants -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Support -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.ILPdbWriter -open Microsoft.FSharp.Compiler.DiagnosticMessage -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.ILAsciiWriter +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.AbstractIL.Extensions.ILX.Types +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.BinaryConstants +open FSharp.Compiler.AbstractIL.Internal.Support +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.ILPdbWriter +open FSharp.Compiler.DiagnosticMessage +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Range #if FX_NO_CORHOST_SIGNER -open Microsoft.FSharp.Compiler.AbstractIL.Internal.StrongNameSign +open FSharp.Compiler.AbstractIL.Internal.StrongNameSign #endif diff --git a/src/absil/ilwrite.fsi b/src/absil/ilwrite.fsi index fc23d028bd5..e7b2aaf3f4f 100644 --- a/src/absil/ilwrite.fsi +++ b/src/absil/ilwrite.fsi @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// The IL Binary writer. -module internal Microsoft.FSharp.Compiler.AbstractIL.ILBinaryWriter +module internal FSharp.Compiler.AbstractIL.ILBinaryWriter -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.IL [] type ILStrongNameSigner = diff --git a/src/absil/ilwritepdb.fs b/src/absil/ilwritepdb.fs index 61771a9b2de..58dd9c241b6 100644 --- a/src/absil/ilwritepdb.fs +++ b/src/absil/ilwritepdb.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.AbstractIL.ILPdbWriter +module internal FSharp.Compiler.AbstractIL.ILPdbWriter open System open System.Collections.Generic @@ -12,12 +12,12 @@ open System.Reflection.Metadata open System.Reflection.Metadata.Ecma335 open System.Reflection.PortableExecutable open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Support -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.AbstractIL.Internal.Support +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Range type BlobBuildingStream () = diff --git a/src/absil/ilwritepdb.fsi b/src/absil/ilwritepdb.fsi index af9f16be9e8..a291ce4667d 100644 --- a/src/absil/ilwritepdb.fsi +++ b/src/absil/ilwritepdb.fsi @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// The ILPdbWriter -module internal Microsoft.FSharp.Compiler.AbstractIL.ILPdbWriter +module internal FSharp.Compiler.AbstractIL.ILPdbWriter -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Range open System.Collections.Generic open System.IO open System.Reflection.Metadata diff --git a/src/absil/ilx.fs b/src/absil/ilx.fs index 1914ace9b07..56d264a6dcd 100644 --- a/src/absil/ilx.fs +++ b/src/absil/ilx.fs @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Defines an extension of the IL algebra -module internal Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.Types +module internal FSharp.Compiler.AbstractIL.Extensions.ILX.Types open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal.Library // -------------------------------------------------------------------- // Define an extension of the IL instruction algebra diff --git a/src/absil/ilx.fsi b/src/absil/ilx.fsi index 39792635fe7..657e8353f62 100644 --- a/src/absil/ilx.fsi +++ b/src/absil/ilx.fsi @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// ILX extensions to Abstract IL types and instructions F# -module internal Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.Types +module internal FSharp.Compiler.AbstractIL.Extensions.ILX.Types open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.IL // -------------------------------------------------------------------- // Union references diff --git a/src/absil/zmap.fs b/src/absil/zmap.fs index c08767e2744..4702eec5c72 100644 --- a/src/absil/zmap.fs +++ b/src/absil/zmap.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.AbstractIL.Internal +namespace FSharp.Compiler.AbstractIL.Internal open Internal.Utilities.Collections.Tagged open System.Collections.Generic diff --git a/src/absil/zmap.fsi b/src/absil/zmap.fsi index 12a17400029..733d11870f1 100644 --- a/src/absil/zmap.fsi +++ b/src/absil/zmap.fsi @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.AbstractIL.Internal +namespace FSharp.Compiler.AbstractIL.Internal open Internal.Utilities open Internal.Utilities.Collections.Tagged -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Internal.Library open System.Collections.Generic /// Maps with a specific comparison function diff --git a/src/absil/zset.fs b/src/absil/zset.fs index 960caa06e36..2f626674c8d 100644 --- a/src/absil/zset.fs +++ b/src/absil/zset.fs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.AbstractIL.Internal +namespace FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library open Internal.Utilities open Internal.Utilities.Collections.Tagged open System.Collections.Generic diff --git a/src/absil/zset.fsi b/src/absil/zset.fsi index 094e0288128..5d1d3419747 100644 --- a/src/absil/zset.fsi +++ b/src/absil/zset.fsi @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.AbstractIL.Internal +namespace FSharp.Compiler.AbstractIL.Internal open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal.Library open System.Collections.Generic /// Sets with a specific comparison function diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/buildfromsource/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj index 7edd03a10e8..334d7c1096b 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj +++ b/src/buildfromsource/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj @@ -152,7 +152,7 @@ AbsIL\illex.fsl - --module Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser --open Microsoft.FSharp.Compiler.AbstractIL --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing + --module FSharp.Compiler.AbstractIL.Internal.AsciiParser --open FSharp.Compiler.AbstractIL --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing AbsIL\ilpars.fsy @@ -253,7 +253,7 @@ ParserAndUntypedAST\pplex.fsl - --module Microsoft.FSharp.Compiler.PPParser --open Microsoft.FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing + --module FSharp.Compiler.PPParser --open FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing ParserAndUntypedAST\pppars.fsy @@ -261,7 +261,7 @@ ParserAndUntypedAST\lex.fsl - --module Microsoft.FSharp.Compiler.Parser --open Microsoft.FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing + --module FSharp.Compiler.Parser --open FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing ParserAndUntypedAST\pars.fsy diff --git a/src/buildtools/fslex/fslex.fs b/src/buildtools/fslex/fslex.fs index d2f1af826bd..e35f9559143 100644 --- a/src/buildtools/fslex/fslex.fs +++ b/src/buildtools/fslex/fslex.fs @@ -13,7 +13,7 @@ open System.Collections.Generic open System.IO //------------------------------------------------------------------ -// This code is duplicated from Microsoft.FSharp.Compiler.UnicodeLexing +// This code is duplicated from FSharp.Compiler.UnicodeLexing type Lexbuf = LexBuffer diff --git a/src/buildtools/fsyacc/fsyacc.fs b/src/buildtools/fsyacc/fsyacc.fs index 185ff33232b..b4d0a39093e 100644 --- a/src/buildtools/fsyacc/fsyacc.fs +++ b/src/buildtools/fsyacc/fsyacc.fs @@ -12,7 +12,7 @@ open FsLexYacc.FsYacc open FsLexYacc.FsYacc.AST //------------------------------------------------------------------ -// This code is duplicated from Microsoft.FSharp.Compiler.UnicodeLexing +// This code is duplicated from FSharp.Compiler.UnicodeLexing type Lexbuf = LexBuffer diff --git a/src/fsharp/AccessibilityLogic.fs b/src/fsharp/AccessibilityLogic.fs index dcd8d5d801e..009846bf4fd 100644 --- a/src/fsharp/AccessibilityLogic.fs +++ b/src/fsharp/AccessibilityLogic.fs @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// The basic logic of private/internal/protected/InternalsVisibleTo/public accessibility -module internal Microsoft.FSharp.Compiler.AccessibilityLogic +module internal FSharp.Compiler.AccessibilityLogic -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Infos +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals #if !NO_EXTENSIONTYPING -open Microsoft.FSharp.Compiler.ExtensionTyping +open FSharp.Compiler.ExtensionTyping #endif /// Represents the 'keys' a particular piece of code can use to access other constructs?. diff --git a/src/fsharp/AttributeChecking.fs b/src/fsharp/AttributeChecking.fs index a28598d9708..17e01bdaba3 100644 --- a/src/fsharp/AttributeChecking.fs +++ b/src/fsharp/AttributeChecking.fs @@ -2,22 +2,22 @@ /// Logic associated with checking "ObsoleteAttribute" and other attributes /// on items from name resolution -module internal Microsoft.FSharp.Compiler.AttributeChecking +module internal FSharp.Compiler.AttributeChecking open System.Collections.Generic -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Infos +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals #if !NO_EXTENSIONTYPING -open Microsoft.FSharp.Compiler.ExtensionTyping +open FSharp.Compiler.ExtensionTyping open Microsoft.FSharp.Core.CompilerServices #endif diff --git a/src/fsharp/AugmentWithHashCompare.fs b/src/fsharp/AugmentWithHashCompare.fs index 6d9abf0dc10..70fc0df123f 100644 --- a/src/fsharp/AugmentWithHashCompare.fs +++ b/src/fsharp/AugmentWithHashCompare.fs @@ -1,17 +1,17 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Generate the hash/compare functions we add to user-defined types by default. -module internal Microsoft.FSharp.Compiler.AugmentWithHashCompare +module internal FSharp.Compiler.AugmentWithHashCompare -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Infos +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Infos let mkIComparableCompareToSlotSig (g: TcGlobals) = TSlotSig("CompareTo",g.mk_IComparable_ty, [],[], [[TSlotParam(Some("obj"),g.obj_ty,false,false,false,[])]],Some g.int_ty) diff --git a/src/fsharp/AugmentWithHashCompare.fsi b/src/fsharp/AugmentWithHashCompare.fsi index 089966c8b1e..13d3f18f0e9 100644 --- a/src/fsharp/AugmentWithHashCompare.fsi +++ b/src/fsharp/AugmentWithHashCompare.fsi @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Generate the hash/compare functions we add to user-defined types by default. -module internal Microsoft.FSharp.Compiler.AugmentWithHashCompare +module internal FSharp.Compiler.AugmentWithHashCompare -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.TcGlobals +open FSharp.Compiler +open FSharp.Compiler.Tast +open FSharp.Compiler.TcGlobals val CheckAugmentationAttribs : bool -> TcGlobals -> Import.ImportMap -> Tycon -> unit val TyconIsCandidateForAugmentationWithCompare : TcGlobals -> Tycon -> bool diff --git a/src/fsharp/CheckFormatStrings.fs b/src/fsharp/CheckFormatStrings.fs index 9d7fd72d7a0..bf1f6bbcb3e 100644 --- a/src/fsharp/CheckFormatStrings.fs +++ b/src/fsharp/CheckFormatStrings.fs @@ -1,16 +1,16 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.CheckFormatStrings - -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.ConstraintSolver -open Microsoft.FSharp.Compiler.NameResolution +module internal FSharp.Compiler.CheckFormatStrings + +open FSharp.Compiler +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.Ast +open FSharp.Compiler.Range +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.ConstraintSolver +open FSharp.Compiler.NameResolution type FormatItem = Simple of TType | FuncAndVal diff --git a/src/fsharp/CheckFormatStrings.fsi b/src/fsharp/CheckFormatStrings.fsi index 2b6d8d4f020..10768a94242 100644 --- a/src/fsharp/CheckFormatStrings.fsi +++ b/src/fsharp/CheckFormatStrings.fsi @@ -5,12 +5,12 @@ /// /// Must be updated if the Printf runtime component is updated. -module internal Microsoft.FSharp.Compiler.CheckFormatStrings +module internal FSharp.Compiler.CheckFormatStrings -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.NameResolution -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.TcGlobals +open FSharp.Compiler +open FSharp.Compiler.NameResolution +open FSharp.Compiler.Tast +open FSharp.Compiler.TcGlobals val ParseFormatString : Range.range -> TcGlobals -> formatStringCheckContext: FormatStringCheckContext option -> fmt: string -> bty: TType -> cty: TType -> dty: TType -> (TType * TType) * (Range.range * int) list diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs index c3f7ab6e0a2..7602ceed55c 100644 --- a/src/fsharp/CompileOps.fs +++ b/src/fsharp/CompileOps.fs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Coordinating compiler operations - configuration, loading initial context, reporting errors etc. -module internal Microsoft.FSharp.Compiler.CompileOps +module internal FSharp.Compiler.CompileOps open System open System.Collections.Generic @@ -14,39 +14,39 @@ open Internal.Utilities.Collections open Internal.Utilities.Filename open Internal.Utilities.Text -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.ILBinaryReader -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics - -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.AttributeChecking -open Microsoft.FSharp.Compiler.ConstraintSolver -open Microsoft.FSharp.Compiler.DiagnosticMessage -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Import -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.Lexhelp -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.MethodCalls -open Microsoft.FSharp.Compiler.MethodOverrides -open Microsoft.FSharp.Compiler.NameResolution -open Microsoft.FSharp.Compiler.PrettyNaming -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.ReferenceResolver -open Microsoft.FSharp.Compiler.SignatureConformance -open Microsoft.FSharp.Compiler.TastPickle -open Microsoft.FSharp.Compiler.TypeChecker -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.ILBinaryReader +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Extensions.ILX +open FSharp.Compiler.AbstractIL.Diagnostics + +open FSharp.Compiler +open FSharp.Compiler.Ast +open FSharp.Compiler.AttributeChecking +open FSharp.Compiler.ConstraintSolver +open FSharp.Compiler.DiagnosticMessage +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Import +open FSharp.Compiler.Infos +open FSharp.Compiler.Lexhelp +open FSharp.Compiler.Lib +open FSharp.Compiler.MethodCalls +open FSharp.Compiler.MethodOverrides +open FSharp.Compiler.NameResolution +open FSharp.Compiler.PrettyNaming +open FSharp.Compiler.Range +open FSharp.Compiler.ReferenceResolver +open FSharp.Compiler.SignatureConformance +open FSharp.Compiler.TastPickle +open FSharp.Compiler.TypeChecker +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals #if !NO_EXTENSIONTYPING -open Microsoft.FSharp.Compiler.ExtensionTyping +open FSharp.Compiler.ExtensionTyping open Microsoft.FSharp.Core.CompilerServices #endif @@ -434,7 +434,7 @@ let SplitRelatedDiagnostics(err:PhasedDiagnostic) = SplitRelatedException(err.Exception) -let DeclareMesssage = Microsoft.FSharp.Compiler.DiagnosticMessage.DeclareResourceString +let DeclareMesssage = FSharp.Compiler.DiagnosticMessage.DeclareResourceString do FSComp.SR.RunStartupValidation() let SeeAlsoE() = DeclareResourceString("SeeAlso", "%s") @@ -2542,12 +2542,12 @@ type TcConfigBuilder = let pdbfile = if tcConfigB.debuginfo then Some (match tcConfigB.debugSymbolFile with - | None -> Microsoft.FSharp.Compiler.AbstractIL.ILPdbWriter.getDebugFileName outfile tcConfigB.portablePDB + | None -> FSharp.Compiler.AbstractIL.ILPdbWriter.getDebugFileName outfile tcConfigB.portablePDB #if ENABLE_MONO_SUPPORT | Some _ when runningOnMono -> // On Mono, the name of the debug file has to be ".mdb" so specifying it explicitly is an error warning(Error(FSComp.SR.ilwriteMDBFileNameCannotBeChangedWarning(), rangeCmdArgs)) - Microsoft.FSharp.Compiler.AbstractIL.ILPdbWriter.getDebugFileName outfile tcConfigB.portablePDB + FSharp.Compiler.AbstractIL.ILPdbWriter.getDebugFileName outfile tcConfigB.portablePDB #endif | Some f -> f) elif (tcConfigB.debugSymbolFile <> None) && (not (tcConfigB.debuginfo)) then @@ -4804,7 +4804,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti #endif // do this prior to parsing, since parsing IL assembly code may refer to mscorlib #if !NO_INLINE_IL_PARSER - Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiConstants.parseILGlobals := tcGlobals.ilg + FSharp.Compiler.AbstractIL.Internal.AsciiConstants.parseILGlobals := tcGlobals.ilg #endif frameworkTcImports.SetTcGlobals(tcGlobals) return tcGlobals, frameworkTcImports diff --git a/src/fsharp/CompileOps.fsi b/src/fsharp/CompileOps.fsi index 9ee74ee9930..912bcf137cf 100755 --- a/src/fsharp/CompileOps.fsi +++ b/src/fsharp/CompileOps.fsi @@ -1,25 +1,25 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Coordinating compiler operations - configuration, loading initial context, reporting errors etc. -module internal Microsoft.FSharp.Compiler.CompileOps +module internal FSharp.Compiler.CompileOps open System open System.Text open System.Collections.Generic -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.ILBinaryReader -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.TypeChecker -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.TcGlobals +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.ILBinaryReader +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler +open FSharp.Compiler.TypeChecker +open FSharp.Compiler.Range +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Tast +open FSharp.Compiler.TcGlobals open Microsoft.FSharp.Core.CompilerServices #if !NO_EXTENSIONTYPING -open Microsoft.FSharp.Compiler.ExtensionTyping +open FSharp.Compiler.ExtensionTyping #endif diff --git a/src/fsharp/CompileOptions.fs b/src/fsharp/CompileOptions.fs index 344c0e1412a..5bab2659381 100644 --- a/src/fsharp/CompileOptions.fs +++ b/src/fsharp/CompileOptions.fs @@ -2,31 +2,31 @@ // # FSComp.SR.opts -module internal Microsoft.FSharp.Compiler.CompileOptions +module internal FSharp.Compiler.CompileOptions open Internal.Utilities open System open System.Collections.Generic -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.CompileOps -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.TypeChecker -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.Tastops.DebugPrint -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Lexhelp -open Microsoft.FSharp.Compiler.IlxGen +open FSharp.Compiler +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Extensions.ILX +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.CompileOps +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.TypeChecker +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.Tastops.DebugPrint +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.Lib +open FSharp.Compiler.Range +open FSharp.Compiler.Lexhelp +open FSharp.Compiler.IlxGen #if FX_RESHAPED_REFLECTION open Microsoft.FSharp.Core.ReflectionAdapters diff --git a/src/fsharp/CompileOptions.fsi b/src/fsharp/CompileOptions.fsi index 50e7a3acefc..e6e010bff2c 100644 --- a/src/fsharp/CompileOptions.fsi +++ b/src/fsharp/CompileOptions.fsi @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.CompileOptions - -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.CompileOps -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Import -open Microsoft.FSharp.Compiler.Optimizer -open Microsoft.FSharp.Compiler.TcGlobals +module internal FSharp.Compiler.CompileOptions + +open FSharp.Compiler +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.CompileOps +open FSharp.Compiler.Tast +open FSharp.Compiler.Import +open FSharp.Compiler.Optimizer +open FSharp.Compiler.TcGlobals //---------------------------------------------------------------------------- // Compiler Option Parser diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs index dfa5999fc72..39227c8f3f5 100644 --- a/src/fsharp/ConstraintSolver.fs +++ b/src/fsharp/ConstraintSolver.fs @@ -30,28 +30,28 @@ //------------------------------------------------------------------------- -module internal Microsoft.FSharp.Compiler.ConstraintSolver +module internal FSharp.Compiler.ConstraintSolver open Internal.Utilities.Collections -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.AccessibilityLogic -open Microsoft.FSharp.Compiler.AttributeChecking -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.MethodCalls -open Microsoft.FSharp.Compiler.PrettyNaming -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Rational -open Microsoft.FSharp.Compiler.InfoReader -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.TypeRelations +open FSharp.Compiler +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Infos +open FSharp.Compiler.AccessibilityLogic +open FSharp.Compiler.AttributeChecking +open FSharp.Compiler.Lib +open FSharp.Compiler.MethodCalls +open FSharp.Compiler.PrettyNaming +open FSharp.Compiler.Range +open FSharp.Compiler.Rational +open FSharp.Compiler.InfoReader +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.TypeRelations //------------------------------------------------------------------------- // Generate type variables and record them in within the scope of the diff --git a/src/fsharp/ConstraintSolver.fsi b/src/fsharp/ConstraintSolver.fsi index e943d7be69a..4626c736bdb 100644 --- a/src/fsharp/ConstraintSolver.fsi +++ b/src/fsharp/ConstraintSolver.fsi @@ -1,20 +1,20 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Solves constraints using a mutable constraint-solver state -module internal Microsoft.FSharp.Compiler.ConstraintSolver - -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AccessibilityLogic -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Import -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.MethodCalls -open Microsoft.FSharp.Compiler.InfoReader +module internal FSharp.Compiler.ConstraintSolver + +open FSharp.Compiler +open FSharp.Compiler.AccessibilityLogic +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Tast +open FSharp.Compiler.Range +open FSharp.Compiler.Import +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Infos +open FSharp.Compiler.MethodCalls +open FSharp.Compiler.InfoReader /// Create a type variable representing the use of a "_" in F# code val NewAnonTypar : TyparKind * range * TyparRigidity * TyparStaticReq * TyparDynamicReq -> Typar diff --git a/src/fsharp/DetupleArgs.fs b/src/fsharp/DetupleArgs.fs index 9a7f99e63a6..9973e452761 100644 --- a/src/fsharp/DetupleArgs.fs +++ b/src/fsharp/DetupleArgs.fs @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.Detuple - -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Lib +module internal FSharp.Compiler.Detuple + +open FSharp.Compiler +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.Ast +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Lib // // This pass has one aim. diff --git a/src/fsharp/DetupleArgs.fsi b/src/fsharp/DetupleArgs.fsi index 58412315820..c76c02b1c40 100644 --- a/src/fsharp/DetupleArgs.fsi +++ b/src/fsharp/DetupleArgs.fsi @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.Detuple +module internal FSharp.Compiler.Detuple -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.TcGlobals +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.Tast +open FSharp.Compiler.TcGlobals val DetupleImplFile : CcuThunk -> TcGlobals -> TypedImplFile -> TypedImplFile diff --git a/src/fsharp/ErrorLogger.fs b/src/fsharp/ErrorLogger.fs index 41be3768ed2..8c5aa94fc6a 100755 --- a/src/fsharp/ErrorLogger.fs +++ b/src/fsharp/ErrorLogger.fs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module public Microsoft.FSharp.Compiler.ErrorLogger +module public FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler +open FSharp.Compiler.Range open System //------------------------------------------------------------------------ diff --git a/src/fsharp/ErrorResolutionHints.fs b/src/fsharp/ErrorResolutionHints.fs index 20bcb13fd21..f40dd8f914e 100644 --- a/src/fsharp/ErrorResolutionHints.fs +++ b/src/fsharp/ErrorResolutionHints.fs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Functions to format error message details -module internal Microsoft.FSharp.Compiler.ErrorResolutionHints +module internal FSharp.Compiler.ErrorResolutionHints open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Internal.Library let maxSuggestions = 5 let minThresholdForSuggestions = 0.7 diff --git a/src/fsharp/ExtensionTyping.fs b/src/fsharp/ExtensionTyping.fs index 0d86ca58a05..eda980f5e28 100755 --- a/src/fsharp/ExtensionTyping.fs +++ b/src/fsharp/ExtensionTyping.fs @@ -2,7 +2,7 @@ // Type providers, validation of provided types, etc. -namespace Microsoft.FSharp.Compiler +namespace FSharp.Compiler #if !NO_EXTENSIONTYPING @@ -12,11 +12,11 @@ module internal ExtensionTyping = open System.Collections.Generic open System.Reflection open Microsoft.FSharp.Core.CompilerServices - open Microsoft.FSharp.Compiler.ErrorLogger - open Microsoft.FSharp.Compiler.Range - open Microsoft.FSharp.Compiler.AbstractIL.IL - open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics // dprintfn - open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library // frontAndBack + open FSharp.Compiler.ErrorLogger + open FSharp.Compiler.Range + open FSharp.Compiler.AbstractIL.IL + open FSharp.Compiler.AbstractIL.Diagnostics // dprintfn + open FSharp.Compiler.AbstractIL.Internal.Library // frontAndBack #if FX_RESHAPED_REFLECTION open Microsoft.FSharp.Core.ReflectionAdapters diff --git a/src/fsharp/ExtensionTyping.fsi b/src/fsharp/ExtensionTyping.fsi index a16788e2bb7..f062717fec7 100755 --- a/src/fsharp/ExtensionTyping.fsi +++ b/src/fsharp/ExtensionTyping.fsi @@ -2,7 +2,7 @@ // Extension typing, validation of extension types, etc. -namespace Microsoft.FSharp.Compiler +namespace FSharp.Compiler #if !NO_EXTENSIONTYPING @@ -12,9 +12,9 @@ module internal ExtensionTyping = open System.IO open System.Collections.Generic open Microsoft.FSharp.Core.CompilerServices - open Microsoft.FSharp.Compiler.AbstractIL.IL - open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library - open Microsoft.FSharp.Compiler.Range + open FSharp.Compiler.AbstractIL.IL + open FSharp.Compiler.AbstractIL.Internal.Library + open FSharp.Compiler.Range type TypeProviderDesignation = TypeProviderDesignation of string @@ -351,11 +351,11 @@ module internal ExtensionTyping = /// Get the ILTypeRef for the provided type (including for nested types). Take into account /// any type relocations or static linking for generated types. - val GetILTypeRefOfProvidedType : Tainted * range:range -> Microsoft.FSharp.Compiler.AbstractIL.IL.ILTypeRef + val GetILTypeRefOfProvidedType : Tainted * range:range -> FSharp.Compiler.AbstractIL.IL.ILTypeRef /// Get the ILTypeRef for the provided type (including for nested types). Do not take into account /// any type relocations or static linking for generated types. - val GetOriginalILTypeRefOfProvidedType : Tainted * range:range -> Microsoft.FSharp.Compiler.AbstractIL.IL.ILTypeRef + val GetOriginalILTypeRefOfProvidedType : Tainted * range:range -> FSharp.Compiler.AbstractIL.IL.ILTypeRef /// Represents the remapping information for a generated provided type and its nested types. diff --git a/src/fsharp/FSharp.Build/CreateFSharpManifestResourceName.fs b/src/fsharp/FSharp.Build/CreateFSharpManifestResourceName.fs index 4b4a9fc8130..e4defc092e6 100644 --- a/src/fsharp/FSharp.Build/CreateFSharpManifestResourceName.fs +++ b/src/fsharp/FSharp.Build/CreateFSharpManifestResourceName.fs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Build +namespace FSharp.Build + open System open System.IO open System.Text diff --git a/src/fsharp/FSharp.Build/FSharpCommandLineBuilder.fs b/src/fsharp/FSharp.Build/FSharpCommandLineBuilder.fs index 8ea25e12d61..0ea056694c6 100644 --- a/src/fsharp/FSharp.Build/FSharpCommandLineBuilder.fs +++ b/src/fsharp/FSharp.Build/FSharpCommandLineBuilder.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Build +namespace FSharp.Build open System open System.Text diff --git a/src/fsharp/FSharp.Build/FSharpEmbedResXSource.fs b/src/fsharp/FSharp.Build/FSharpEmbedResXSource.fs index 0150ef26ec5..80ab03249f0 100644 --- a/src/fsharp/FSharp.Build/FSharpEmbedResXSource.fs +++ b/src/fsharp/FSharp.Build/FSharpEmbedResXSource.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Build +namespace FSharp.Build open System open System.Collections diff --git a/src/fsharp/FSharp.Build/FSharpEmbedResourceText.fs b/src/fsharp/FSharp.Build/FSharpEmbedResourceText.fs index 8be55fda907..606fc9c23c9 100644 --- a/src/fsharp/FSharp.Build/FSharpEmbedResourceText.fs +++ b/src/fsharp/FSharp.Build/FSharpEmbedResourceText.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Build +namespace FSharp.Build open System.Collections open System.IO diff --git a/src/fsharp/FSharp.Build/Fsc.fs b/src/fsharp/FSharp.Build/Fsc.fs index 307261b3a21..850ec3d9d18 100644 --- a/src/fsharp/FSharp.Build/Fsc.fs +++ b/src/fsharp/FSharp.Build/Fsc.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Build +namespace FSharp.Build open System open System.Diagnostics diff --git a/src/fsharp/FSharp.Build/Fsi.fs b/src/fsharp/FSharp.Build/Fsi.fs index f30a5bb2fb3..c019a8a2dc2 100644 --- a/src/fsharp/FSharp.Build/Fsi.fs +++ b/src/fsharp/FSharp.Build/Fsi.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Build +namespace FSharp.Build open System open System.Diagnostics diff --git a/src/fsharp/FSharp.Build/WriteCodeFragment.fs b/src/fsharp/FSharp.Build/WriteCodeFragment.fs index fd92e6c6596..b878dadaba0 100644 --- a/src/fsharp/FSharp.Build/WriteCodeFragment.fs +++ b/src/fsharp/FSharp.Build/WriteCodeFragment.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Build +namespace FSharp.Build open System open System.Collections diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj index 07aaabae452..7afc21b96cf 100644 --- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj +++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj @@ -193,7 +193,7 @@ AbsIL\illex.fsl - --module Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser --open Microsoft.FSharp.Compiler.AbstractIL --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing + --module FSharp.Compiler.AbstractIL.Internal.AsciiParser --open FSharp.Compiler.AbstractIL --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing AbsIL\ilpars.fsy @@ -294,7 +294,7 @@ ParserAndUntypedAST\pplex.fsl - --module Microsoft.FSharp.Compiler.PPParser --open Microsoft.FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing + --module FSharp.Compiler.PPParser --open FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing ParserAndUntypedAST\pppars.fsy @@ -302,7 +302,7 @@ ParserAndUntypedAST\lex.fsl - --module Microsoft.FSharp.Compiler.Parser --open Microsoft.FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing + --module FSharp.Compiler.Parser --open FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing ParserAndUntypedAST\pars.fsy diff --git a/src/fsharp/FSharp.Compiler.Server.Shared/FSharpInteractiveServer.fs b/src/fsharp/FSharp.Compiler.Server.Shared/FSharpInteractiveServer.fs index 44a5e2f90e2..60da7a58c0f 100644 --- a/src/fsharp/FSharp.Compiler.Server.Shared/FSharpInteractiveServer.fs +++ b/src/fsharp/FSharp.Compiler.Server.Shared/FSharpInteractiveServer.fs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. //[] // avoid calling the type "Shared" which is keyword in some languages -namespace Microsoft.FSharp.Compiler.Server.Shared +namespace FSharp.Compiler.Server.Shared // For FSI VS plugin, require FSI to provide services: // e.g. diff --git a/src/fsharp/FindUnsolved.fs b/src/fsharp/FindUnsolved.fs index 9c38f26a2a7..386545c7e2a 100644 --- a/src/fsharp/FindUnsolved.fs +++ b/src/fsharp/FindUnsolved.fs @@ -2,15 +2,15 @@ /// Find unsolved, uninstantiated type variables -module internal Microsoft.FSharp.Compiler.FindUnsolved - -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.TypeRelations +module internal FSharp.Compiler.FindUnsolved + +open FSharp.Compiler +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.TypeRelations type env = Nix diff --git a/src/fsharp/IlxGen.fs b/src/fsharp/IlxGen.fs index d027afabeb5..4c5fd764121 100644 --- a/src/fsharp/IlxGen.fs +++ b/src/fsharp/IlxGen.fs @@ -4,7 +4,7 @@ // The ILX generator. //-------------------------------------------------------------------------- -module internal Microsoft.FSharp.Compiler.IlxGen +module internal FSharp.Compiler.IlxGen open System.IO open System.Reflection @@ -13,29 +13,29 @@ open System.Collections.Generic open Internal.Utilities open Internal.Utilities.Collections -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.Types -open Microsoft.FSharp.Compiler.AbstractIL.Internal.BinaryConstants - -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AttributeChecking -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.Import -open Microsoft.FSharp.Compiler.Layout -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.PrettyNaming -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.Tastops.DebugPrint -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.TypeRelations +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Extensions.ILX +open FSharp.Compiler.AbstractIL.Extensions.ILX.Types +open FSharp.Compiler.AbstractIL.Internal.BinaryConstants + +open FSharp.Compiler +open FSharp.Compiler.AttributeChecking +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Infos +open FSharp.Compiler.Import +open FSharp.Compiler.Layout +open FSharp.Compiler.Lib +open FSharp.Compiler.PrettyNaming +open FSharp.Compiler.Range +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.Tastops.DebugPrint +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.TypeRelations let IsNonErasedTypar (tp:Typar) = not tp.IsErased let DropErasedTypars (tps:Typar list) = tps |> List.filter IsNonErasedTypar @@ -755,9 +755,9 @@ let AddStorageForLocalVals g vals eenv = List.foldBack (fun (v,s) acc -> AddStor // Lookup eenv //-------------------------------------------------------------------------- -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library let StorageForVal m v eenv = let v = diff --git a/src/fsharp/IlxGen.fsi b/src/fsharp/IlxGen.fsi index 6d50da1bfd3..5e2823f8e38 100644 --- a/src/fsharp/IlxGen.fsi +++ b/src/fsharp/IlxGen.fsi @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.IlxGen +module internal FSharp.Compiler.IlxGen open System open System.IO open System.Reflection -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.TcGlobals +open FSharp.Compiler +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.Tast +open FSharp.Compiler.TcGlobals /// Indicates how the generated IL code is ultimately emitted type IlxGenBackend = diff --git a/src/fsharp/InfoReader.fs b/src/fsharp/InfoReader.fs index e04485887e1..dc49d1b1a10 100644 --- a/src/fsharp/InfoReader.fs +++ b/src/fsharp/InfoReader.fs @@ -2,23 +2,23 @@ /// Select members from a type by name, searching the type hierarchy if needed -module internal Microsoft.FSharp.Compiler.InfoReader +module internal FSharp.Compiler.InfoReader open System.Collections.Generic -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library - -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AccessibilityLogic -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.AttributeChecking -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal.Library + +open FSharp.Compiler +open FSharp.Compiler.AccessibilityLogic +open FSharp.Compiler.Ast +open FSharp.Compiler.AttributeChecking +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Infos +open FSharp.Compiler.Range +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals /// Use the given function to select some of the member values from the members of an F# type let private SelectImmediateMemberVals g optFilter f (tcref:TyconRef) = diff --git a/src/fsharp/InnerLambdasToTopLevelFuncs.fs b/src/fsharp/InnerLambdasToTopLevelFuncs.fs index c783c1efe1c..c03ac2ace3c 100644 --- a/src/fsharp/InnerLambdasToTopLevelFuncs.fs +++ b/src/fsharp/InnerLambdasToTopLevelFuncs.fs @@ -1,20 +1,20 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.InnerLambdasToTopLevelFuncs - -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.Tastops.DebugPrint -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Layout -open Microsoft.FSharp.Compiler.Detuple.GlobalUsageAnalysis -open Microsoft.FSharp.Compiler.Lib +module internal FSharp.Compiler.InnerLambdasToTopLevelFuncs + +open FSharp.Compiler +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.Tastops.DebugPrint +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Layout +open FSharp.Compiler.Detuple.GlobalUsageAnalysis +open FSharp.Compiler.Lib let verboseTLR = false diff --git a/src/fsharp/InnerLambdasToTopLevelFuncs.fsi b/src/fsharp/InnerLambdasToTopLevelFuncs.fsi index 916d5634384..5a25c27ac59 100644 --- a/src/fsharp/InnerLambdasToTopLevelFuncs.fsi +++ b/src/fsharp/InnerLambdasToTopLevelFuncs.fsi @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.InnerLambdasToTopLevelFuncs +module internal FSharp.Compiler.InnerLambdasToTopLevelFuncs -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.TcGlobals +open FSharp.Compiler +open FSharp.Compiler.TcGlobals val MakeTLRDecisions : Tast.CcuThunk -> TcGlobals -> Tast.TypedImplFile -> Tast.TypedImplFile diff --git a/src/fsharp/LegacyHostedCompilerForTesting.fs b/src/fsharp/LegacyHostedCompilerForTesting.fs index 1f8e258e07e..b793915b5c8 100644 --- a/src/fsharp/LegacyHostedCompilerForTesting.fs +++ b/src/fsharp/LegacyHostedCompilerForTesting.fs @@ -9,12 +9,12 @@ open System open System.IO open System.Text open System.Text.RegularExpressions -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Driver -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.CompileOps -open Microsoft.FSharp.Compiler.AbstractIL.ILBinaryReader -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler +open FSharp.Compiler.Driver +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.CompileOps +open FSharp.Compiler.AbstractIL.ILBinaryReader +open FSharp.Compiler.AbstractIL.Internal.Library /// build issue location type internal Location = diff --git a/src/fsharp/LexFilter.fs b/src/fsharp/LexFilter.fs index c67aa06cb42..507f02ad65b 100755 --- a/src/fsharp/LexFilter.fs +++ b/src/fsharp/LexFilter.fs @@ -2,18 +2,18 @@ /// LexFilter - process the token stream prior to parsing. /// Implements the offside rule and a copule of other lexical transformations. -module internal Microsoft.FSharp.Compiler.LexFilter +module internal FSharp.Compiler.LexFilter open Internal.Utilities.Text.Lexing -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Parser -open Microsoft.FSharp.Compiler.Lexhelp +open FSharp.Compiler +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Parser +open FSharp.Compiler.Lexhelp let debug = false diff --git a/src/fsharp/Logger.fs b/src/fsharp/Logger.fs index 7ecfe842f27..b1968240d23 100644 --- a/src/fsharp/Logger.fs +++ b/src/fsharp/Logger.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler +namespace FSharp.Compiler open System.Diagnostics.Tracing open System diff --git a/src/fsharp/Logger.fsi b/src/fsharp/Logger.fsi index 324a0d09366..cb84dde5f54 100644 --- a/src/fsharp/Logger.fsi +++ b/src/fsharp/Logger.fsi @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler +namespace FSharp.Compiler open System diff --git a/src/fsharp/LowerCallsAndSeqs.fs b/src/fsharp/LowerCallsAndSeqs.fs index 15904bfabd6..bec0d2afe86 100644 --- a/src/fsharp/LowerCallsAndSeqs.fs +++ b/src/fsharp/LowerCallsAndSeqs.fs @@ -1,22 +1,22 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.LowerCallsAndSeqs - -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library - -open Microsoft.FSharp.Compiler.AccessibilityLogic -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.InfoReader -open Microsoft.FSharp.Compiler.MethodCalls +module internal FSharp.Compiler.LowerCallsAndSeqs + +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library + +open FSharp.Compiler.AccessibilityLogic +open FSharp.Compiler.Ast +open FSharp.Compiler.Infos +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.Lib +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.InfoReader +open FSharp.Compiler.MethodCalls //---------------------------------------------------------------------------- // Eta-expansion of calls to top-level-methods diff --git a/src/fsharp/MSBuildReferenceResolver.fs b/src/fsharp/MSBuildReferenceResolver.fs index c2a9d2133b7..6e95496fa06 100644 --- a/src/fsharp/MSBuildReferenceResolver.fs +++ b/src/fsharp/MSBuildReferenceResolver.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.MSBuildReferenceResolver +module internal FSharp.Compiler.MSBuildReferenceResolver open System open System.IO @@ -10,12 +10,12 @@ module internal Microsoft.FSharp.Compiler.MSBuildReferenceResolver open Microsoft.FSharp.Core.ReflectionAdapters #endif #if FX_RESHAPED_MSBUILD - open Microsoft.FSharp.Compiler.MsBuildAdapters - open Microsoft.FSharp.Compiler.ToolLocationHelper + open FSharp.Compiler.MsBuildAdapters + open FSharp.Compiler.ToolLocationHelper #endif - open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library - open Microsoft.FSharp.Compiler.ReferenceResolver + open FSharp.Compiler.AbstractIL.Internal.Library + open FSharp.Compiler.ReferenceResolver open Microsoft.Build.Tasks open Microsoft.Build.Utilities open Microsoft.Build.Framework @@ -344,7 +344,7 @@ module internal Microsoft.FSharp.Compiler.MSBuildReferenceResolver #if ENABLE_MONO_SUPPORT // The properties TargetedRuntimeVersion and CopyLocalDependenciesWhenParentReferenceInGac // are not available on Mono. So we only set them if available (to avoid a compile-time dependency). - if not Microsoft.FSharp.Compiler.AbstractIL.IL.runningOnMono then + if not FSharp.Compiler.AbstractIL.IL.runningOnMono then typeof.InvokeMember("TargetedRuntimeVersion",(BindingFlags.Instance ||| BindingFlags.SetProperty ||| BindingFlags.Public),null,rar,[| box targetedRuntimeVersionValue |]) |> ignore typeof.InvokeMember("CopyLocalDependenciesWhenParentReferenceInGac",(BindingFlags.Instance ||| BindingFlags.SetProperty ||| BindingFlags.Public),null,rar,[| box true |]) |> ignore #else diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs index de5271eb674..e7737b3f259 100644 --- a/src/fsharp/MethodCalls.fs +++ b/src/fsharp/MethodCalls.fs @@ -1,28 +1,28 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Logic associated with resolving method calls. -module internal Microsoft.FSharp.Compiler.MethodCalls - -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.AccessibilityLogic -open Microsoft.FSharp.Compiler.NameResolution -open Microsoft.FSharp.Compiler.InfoReader -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.Tastops.DebugPrint -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.TypeRelations -open Microsoft.FSharp.Compiler.AttributeChecking +module internal FSharp.Compiler.MethodCalls + +open FSharp.Compiler +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.Range +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Lib +open FSharp.Compiler.Infos +open FSharp.Compiler.AccessibilityLogic +open FSharp.Compiler.NameResolution +open FSharp.Compiler.InfoReader +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.Tastops.DebugPrint +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.TypeRelations +open FSharp.Compiler.AttributeChecking #if !NO_EXTENSIONTYPING -open Microsoft.FSharp.Compiler.ExtensionTyping +open FSharp.Compiler.ExtensionTyping #endif diff --git a/src/fsharp/MethodOverrides.fs b/src/fsharp/MethodOverrides.fs index 77b98010d31..68669102860 100644 --- a/src/fsharp/MethodOverrides.fs +++ b/src/fsharp/MethodOverrides.fs @@ -1,22 +1,22 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Primary logic related to method overrides. -module internal Microsoft.FSharp.Compiler.MethodOverrides - -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.AccessibilityLogic -open Microsoft.FSharp.Compiler.NameResolution -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.InfoReader -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.TypeRelations +module internal FSharp.Compiler.MethodOverrides + +open FSharp.Compiler +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Lib +open FSharp.Compiler.Infos +open FSharp.Compiler.AccessibilityLogic +open FSharp.Compiler.NameResolution +open FSharp.Compiler.Range +open FSharp.Compiler.InfoReader +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.TypeRelations //------------------------------------------------------------------------- // Completeness of classes diff --git a/src/fsharp/NameResolution.fs b/src/fsharp/NameResolution.fs index 9434740d314..47f676fed58 100644 --- a/src/fsharp/NameResolution.fs +++ b/src/fsharp/NameResolution.fs @@ -2,31 +2,31 @@ /// Name environment and name resolution -module internal Microsoft.FSharp.Compiler.NameResolution +module internal FSharp.Compiler.NameResolution open Internal.Utilities -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library.ResultOrException -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.AccessibilityLogic -open Microsoft.FSharp.Compiler.AttributeChecking -open Microsoft.FSharp.Compiler.InfoReader -open Microsoft.FSharp.Compiler.PrettyNaming +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Lib +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Internal.Library.ResultOrException +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.Infos +open FSharp.Compiler.AccessibilityLogic +open FSharp.Compiler.AttributeChecking +open FSharp.Compiler.InfoReader +open FSharp.Compiler.PrettyNaming open System.Collections.Generic #if !NO_EXTENSIONTYPING -open Microsoft.FSharp.Compiler.ExtensionTyping +open FSharp.Compiler.ExtensionTyping #endif /// An object that captures the logical context for name resolution. diff --git a/src/fsharp/NameResolution.fsi b/src/fsharp/NameResolution.fsi index a302e22ef17..c887aad2fd3 100755 --- a/src/fsharp/NameResolution.fsi +++ b/src/fsharp/NameResolution.fsi @@ -1,19 +1,19 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.NameResolution - -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AccessibilityLogic -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Import -open Microsoft.FSharp.Compiler.InfoReader -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.PrettyNaming +module internal FSharp.Compiler.NameResolution + +open FSharp.Compiler +open FSharp.Compiler.AccessibilityLogic +open FSharp.Compiler.Ast +open FSharp.Compiler.Infos +open FSharp.Compiler.Range +open FSharp.Compiler.Import +open FSharp.Compiler.InfoReader +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.PrettyNaming /// A NameResolver is a context for name resolution. It primarily holds an InfoReader. type NameResolver = @@ -240,7 +240,7 @@ type TypeNameResolutionInfo = static member ResolveToTypeRefs : TypeNameResolutionStaticArgsInfo -> TypeNameResolutionInfo /// Represents the kind of the occurrence when reporting a name in name resolution -[] +[] type internal ItemOccurence = | Binding | Use @@ -319,7 +319,7 @@ type internal TcSymbolUses = member GetUsesOfSymbol : Item -> TcSymbolUseData[] /// All the uses of all items within the file - member AllUsesOfSymbols : TcSymbolUseData[][] + member AllUsesOfSymbols : TcSymbolUseData[][] /// Get the locations of all the printf format specifiers in the file member GetFormatSpecifierLocationsAndArity : unit -> (range * int)[] diff --git a/src/fsharp/NicePrint.fs b/src/fsharp/NicePrint.fs index 142ccbae076..9798b6f97b6 100755 --- a/src/fsharp/NicePrint.fs +++ b/src/fsharp/NicePrint.fs @@ -4,26 +4,26 @@ // Print Signatures/Types, for signatures, intellisense, quick info, FSI responses //-------------------------------------------------------------------------- -module internal Microsoft.FSharp.Compiler.NicePrint - -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Rational -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.InfoReader -open Microsoft.FSharp.Compiler.AttributeChecking -open Microsoft.FSharp.Compiler.Layout -open Microsoft.FSharp.Compiler.Layout.TaggedTextOps -open Microsoft.FSharp.Compiler.PrettyNaming +module internal FSharp.Compiler.NicePrint + +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler +open FSharp.Compiler.Rational +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Lib +open FSharp.Compiler.Infos +open FSharp.Compiler.InfoReader +open FSharp.Compiler.AttributeChecking +open FSharp.Compiler.Layout +open FSharp.Compiler.Layout.TaggedTextOps +open FSharp.Compiler.PrettyNaming open Microsoft.FSharp.Core.Printf @@ -100,7 +100,7 @@ module internal PrintUtilities = module private PrintIL = - open Microsoft.FSharp.Compiler.AbstractIL.IL + open FSharp.Compiler.AbstractIL.IL let fullySplitILTypeRef (tref:ILTypeRef) = (List.collect IL.splitNamespace (tref.Enclosing @ [PrettyNaming.DemangleGenericTypeName tref.Name])) diff --git a/src/fsharp/Optimizer.fs b/src/fsharp/Optimizer.fs index 5e345822675..4225ec74223 100644 --- a/src/fsharp/Optimizer.fs +++ b/src/fsharp/Optimizer.fs @@ -7,29 +7,29 @@ //------------------------------------------------------------------------- -module internal Microsoft.FSharp.Compiler.Optimizer +module internal FSharp.Compiler.Optimizer open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library - -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.AttributeChecking -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.TastPickle -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.Tastops.DebugPrint -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Layout -open Microsoft.FSharp.Compiler.Layout.TaggedTextOps -open Microsoft.FSharp.Compiler.TypeRelations +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library + +open FSharp.Compiler +open FSharp.Compiler.Lib +open FSharp.Compiler.Range +open FSharp.Compiler.Ast +open FSharp.Compiler.AttributeChecking +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Infos +open FSharp.Compiler.Tast +open FSharp.Compiler.TastPickle +open FSharp.Compiler.Tastops +open FSharp.Compiler.Tastops.DebugPrint +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Layout +open FSharp.Compiler.Layout.TaggedTextOps +open FSharp.Compiler.TypeRelations open System.Collections.Generic diff --git a/src/fsharp/Optimizer.fsi b/src/fsharp/Optimizer.fsi index d99d3703589..e156a26d3ea 100644 --- a/src/fsharp/Optimizer.fsi +++ b/src/fsharp/Optimizer.fsi @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.Optimizer +module internal FSharp.Compiler.Optimizer -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals +open FSharp.Compiler +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals type OptimizationSettings = { abstractBigTargets : bool diff --git a/src/fsharp/PatternMatchCompilation.fs b/src/fsharp/PatternMatchCompilation.fs index 625b23a70d0..a67dc7c4488 100644 --- a/src/fsharp/PatternMatchCompilation.fs +++ b/src/fsharp/PatternMatchCompilation.fs @@ -1,22 +1,22 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.PatternMatchCompilation +module internal FSharp.Compiler.PatternMatchCompilation open System.Collections.Generic -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.Tastops.DebugPrint -open Microsoft.FSharp.Compiler.PrettyNaming -open Microsoft.FSharp.Compiler.TypeRelations -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Lib +open FSharp.Compiler +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.Range +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.Tastops.DebugPrint +open FSharp.Compiler.PrettyNaming +open FSharp.Compiler.TypeRelations +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Lib exception MatchIncomplete of bool * (string * bool) option * range exception RuleNeverMatched of range diff --git a/src/fsharp/PatternMatchCompilation.fsi b/src/fsharp/PatternMatchCompilation.fsi index d4fbba2588c..8394611a16f 100644 --- a/src/fsharp/PatternMatchCompilation.fsi +++ b/src/fsharp/PatternMatchCompilation.fsi @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.PatternMatchCompilation +module internal FSharp.Compiler.PatternMatchCompilation -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Range /// What should the decision tree contain for any incomplete match? diff --git a/src/fsharp/PostInferenceChecks.fs b/src/fsharp/PostInferenceChecks.fs index acc3c0c03a2..fe2a1f0240d 100644 --- a/src/fsharp/PostInferenceChecks.fs +++ b/src/fsharp/PostInferenceChecks.fs @@ -2,28 +2,28 @@ /// Implements a set of checks on the TAST for a file that can only be performed after type inference /// is complete. -module internal Microsoft.FSharp.Compiler.PostTypeCheckSemanticChecks +module internal FSharp.Compiler.PostTypeCheckSemanticChecks open System open System.Collections.Generic -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library - -open Microsoft.FSharp.Compiler.AccessibilityLogic -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.PrettyNaming -open Microsoft.FSharp.Compiler.InfoReader -open Microsoft.FSharp.Compiler.TypeRelations +open FSharp.Compiler +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library + +open FSharp.Compiler.AccessibilityLogic +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Range +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Lib +open FSharp.Compiler.Infos +open FSharp.Compiler.PrettyNaming +open FSharp.Compiler.InfoReader +open FSharp.Compiler.TypeRelations //-------------------------------------------------------------------------- // TestHooks - for dumping range to support source transforms diff --git a/src/fsharp/PostInferenceChecks.fsi b/src/fsharp/PostInferenceChecks.fsi index 62ad52d4495..54f4ba7db11 100644 --- a/src/fsharp/PostInferenceChecks.fsi +++ b/src/fsharp/PostInferenceChecks.fsi @@ -2,13 +2,13 @@ /// Implements a set of checks on the TAST for a file that can only be performed after type inference /// is complete. -module internal Microsoft.FSharp.Compiler.PostTypeCheckSemanticChecks +module internal FSharp.Compiler.PostTypeCheckSemanticChecks -open Microsoft.FSharp.Compiler.Import -open Microsoft.FSharp.Compiler.InfoReader -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals +open FSharp.Compiler.Import +open FSharp.Compiler.InfoReader +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals val testFlagMemberBody : bool ref diff --git a/src/fsharp/PrettyNaming.fs b/src/fsharp/PrettyNaming.fs index 923be2ccea3..6f5222b7d47 100755 --- a/src/fsharp/PrettyNaming.fs +++ b/src/fsharp/PrettyNaming.fs @@ -5,15 +5,15 @@ //-------------------------------------------------------------------------- /// Anything to do with special names of identifiers and other lexical rules -module public Microsoft.FSharp.Compiler.PrettyNaming +module public FSharp.Compiler.PrettyNaming open System open System.Collections.Generic open System.Collections.Concurrent open System.Globalization open System.Text - open Microsoft.FSharp.Compiler - open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library + open FSharp.Compiler + open FSharp.Compiler.AbstractIL.Internal.Library open Internal.Utilities open Internal.Utilities.StructuredFormat diff --git a/src/fsharp/QuotationPickler.fs b/src/fsharp/QuotationPickler.fs index 79c2ac27968..7cd8cb99182 100644 --- a/src/fsharp/QuotationPickler.fs +++ b/src/fsharp/QuotationPickler.fs @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.QuotationPickler +module internal FSharp.Compiler.QuotationPickler open System.Text open Internal.Utilities.Collections -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Lib +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler +open FSharp.Compiler.Lib let mkRLinear mk (vs,body) = List.foldBack (fun v acc -> mk (v,acc)) vs body diff --git a/src/fsharp/QuotationPickler.fsi b/src/fsharp/QuotationPickler.fsi index da37b63de28..ffe23215886 100644 --- a/src/fsharp/QuotationPickler.fsi +++ b/src/fsharp/QuotationPickler.fsi @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Code to pickle out quotations in the quotation binary format. -module internal Microsoft.FSharp.Compiler.QuotationPickler +module internal FSharp.Compiler.QuotationPickler #nowarn "1178" // The struct, record or union type 'internal_instr_extension' is not structurally comparable because the type open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Bytes -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Lib +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Bytes +open FSharp.Compiler +open FSharp.Compiler.Lib type TypeData type TypeVarData = { tvName: string } diff --git a/src/fsharp/QuotationTranslator.fs b/src/fsharp/QuotationTranslator.fs index b0f1e7ce4c7..ab7d63348d0 100644 --- a/src/fsharp/QuotationTranslator.fs +++ b/src/fsharp/QuotationTranslator.fs @@ -1,23 +1,23 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.QuotationTranslator +module internal FSharp.Compiler.QuotationTranslator open Internal.Utilities -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.PrettyNaming -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.Lib +open FSharp.Compiler.Ast +open FSharp.Compiler.PrettyNaming +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Range open System.Collections.Generic -module QP = Microsoft.FSharp.Compiler.QuotationPickler +module QP = FSharp.Compiler.QuotationPickler let verboseCReflect = condition "VERBOSE_CREFLECT" diff --git a/src/fsharp/QuotationTranslator.fsi b/src/fsharp/QuotationTranslator.fsi index 2558b6f7680..184f1d3da4e 100755 --- a/src/fsharp/QuotationTranslator.fsi +++ b/src/fsharp/QuotationTranslator.fsi @@ -2,14 +2,14 @@ // Convert quoted TAST data structures to structures ready for pickling -module internal Microsoft.FSharp.Compiler.QuotationTranslator - -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Import -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.AbstractIL.IL +module internal FSharp.Compiler.QuotationTranslator + +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.Import +open FSharp.Compiler.Tast +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.AbstractIL.IL [] type QuotationTranslationEnv = diff --git a/src/fsharp/ReferenceResolver.fs b/src/fsharp/ReferenceResolver.fs index 62fe8c22f6a..d9a23ecb2a1 100644 --- a/src/fsharp/ReferenceResolver.fs +++ b/src/fsharp/ReferenceResolver.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler +namespace FSharp.Compiler module public ReferenceResolver = diff --git a/src/fsharp/SignatureConformance.fs b/src/fsharp/SignatureConformance.fs index ac0c23e9709..0f2dccd99a1 100644 --- a/src/fsharp/SignatureConformance.fs +++ b/src/fsharp/SignatureConformance.fs @@ -2,23 +2,23 @@ /// Primary relations on types and signatures, with the exception of /// constraint solving and method overload resolution. -module internal Microsoft.FSharp.Compiler.SignatureConformance +module internal FSharp.Compiler.SignatureConformance open System.Text -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.Infos +open FSharp.Compiler +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.Range +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.Lib +open FSharp.Compiler.Infos #if !NO_EXTENSIONTYPING -open Microsoft.FSharp.Compiler.ExtensionTyping +open FSharp.Compiler.ExtensionTyping #endif diff --git a/src/fsharp/SimulatedMSBuildReferenceResolver.fs b/src/fsharp/SimulatedMSBuildReferenceResolver.fs index fd6acf30bbb..7eb4df154cd 100644 --- a/src/fsharp/SimulatedMSBuildReferenceResolver.fs +++ b/src/fsharp/SimulatedMSBuildReferenceResolver.fs @@ -3,16 +3,16 @@ #if INTERACTIVE #load "../utils/ResizeArray.fs" "../absil/illib.fs" "../fsharp/ReferenceResolver.fs" #else -module internal Microsoft.FSharp.Compiler.SimulatedMSBuildReferenceResolver +module internal FSharp.Compiler.SimulatedMSBuildReferenceResolver #endif open System open System.IO open System.Reflection open Microsoft.Win32 -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.ReferenceResolver -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler +open FSharp.Compiler.ReferenceResolver +open FSharp.Compiler.AbstractIL.Internal.Library let internal SimulatedMSBuildResolver = let supportedFrameworks = [| @@ -189,7 +189,7 @@ let internal GetBestAvailableResolver() = // Detect if MSBuild is on the machine, if so use the resolver from there let mb = try Assembly.Load(sprintf "Microsoft.Build.Framework, Version=%s.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" v) |> Option.ofObj with _ -> None let assembly = mb |> Option.bind (fun _ -> try Assembly.Load(sprintf "FSharp.Compiler.Service.MSBuild.v%s" v) |> Option.ofObj with _ -> None) - let ty = assembly |> Option.bind (fun a -> a.GetType("Microsoft.FSharp.Compiler.MSBuildReferenceResolver") |> Option.ofObj) + let ty = assembly |> Option.bind (fun a -> a.GetType("FSharp.Compiler.MSBuildReferenceResolver") |> Option.ofObj) let obj = ty |> Option.bind (fun ty -> ty.InvokeMember("get_Resolver",BindingFlags.Static ||| BindingFlags.Public ||| BindingFlags.InvokeMethod ||| BindingFlags.NonPublic, null, null, [| |]) |> Option.ofObj) let resolver = obj |> Option.bind (fun obj -> match obj with :? Resolver as r -> Some r | _ -> None) resolver diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs index 23242b1aff6..79175de8946 100644 --- a/src/fsharp/TastOps.fs +++ b/src/fsharp/TastOps.fs @@ -1,29 +1,29 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Defines derived expression manipulation and construction functions. -module internal Microsoft.FSharp.Compiler.Tastops +module internal FSharp.Compiler.Tastops open System.Collections.Generic open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Rational -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Layout -open Microsoft.FSharp.Compiler.Layout.TaggedTextOps -open Microsoft.FSharp.Compiler.PrettyNaming +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Extensions.ILX +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.Rational +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Tast +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.Lib +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Layout +open FSharp.Compiler.Layout.TaggedTextOps +open FSharp.Compiler.PrettyNaming #if !NO_EXTENSIONTYPING -open Microsoft.FSharp.Compiler.ExtensionTyping +open FSharp.Compiler.ExtensionTyping #endif //--------------------------------------------------------------------------- @@ -3174,7 +3174,7 @@ let (|TypeDefOfExpr|_|) g expr = //--------------------------------------------------------------------------- module DebugPrint = begin - open Microsoft.FSharp.Compiler.Layout + open FSharp.Compiler.Layout open PrettyTypes let layoutRanges = ref false diff --git a/src/fsharp/TastOps.fsi b/src/fsharp/TastOps.fsi index badacfda0ea..c719406d5ae 100755 --- a/src/fsharp/TastOps.fsi +++ b/src/fsharp/TastOps.fsi @@ -1,20 +1,20 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Defines derived expression manipulation and construction functions. -module internal Microsoft.FSharp.Compiler.Tastops +module internal FSharp.Compiler.Tastops open System.Collections.Generic open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Rational -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Layout +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.Rational +open FSharp.Compiler.Ast +open FSharp.Compiler.Tast +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Layout //------------------------------------------------------------------------- // Type equivalence diff --git a/src/fsharp/TastPickle.fs b/src/fsharp/TastPickle.fs index e780768c29a..e9a18f6f5c1 100755 --- a/src/fsharp/TastPickle.fs +++ b/src/fsharp/TastPickle.fs @@ -1,25 +1,25 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.TastPickle +module internal FSharp.Compiler.TastPickle open System.Collections.Generic open System.Text open Internal.Utilities -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.Lib.Bits -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Rational -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.ErrorLogger +open FSharp.Compiler +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.Tastops +open FSharp.Compiler.Lib +open FSharp.Compiler.Lib.Bits +open FSharp.Compiler.Range +open FSharp.Compiler.Rational +open FSharp.Compiler.Ast +open FSharp.Compiler.Tast +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.ErrorLogger let verbose = false diff --git a/src/fsharp/TastPickle.fsi b/src/fsharp/TastPickle.fsi index 97eab4b30b9..9f1000580ae 100644 --- a/src/fsharp/TastPickle.fsi +++ b/src/fsharp/TastPickle.fsi @@ -1,16 +1,16 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Defines the framework for serializing and de-serializing TAST data structures as binary blobs for the F# metadata format. -module internal Microsoft.FSharp.Compiler.TastPickle +module internal FSharp.Compiler.TastPickle open Internal.Utilities -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.TcGlobals +open FSharp.Compiler +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.Tast +open FSharp.Compiler.TcGlobals /// Represents deserialized data with a dangling set of CCU fixup thunks indexed by name [] diff --git a/src/fsharp/TcGlobals.fs b/src/fsharp/TcGlobals.fs index 85f12f8b3fd..86cea705baf 100755 --- a/src/fsharp/TcGlobals.fs +++ b/src/fsharp/TcGlobals.fs @@ -6,22 +6,22 @@ /// into the compiler. This lets the compiler perform particular optimizations /// for these types and values, for example emitting optimized calls for /// comparison and hashing functions. -module internal Microsoft.FSharp.Compiler.TcGlobals +module internal FSharp.Compiler.TcGlobals open System.Collections.Generic open System.Diagnostics -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library - -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.PrettyNaming +open FSharp.Compiler +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Extensions.ILX +open FSharp.Compiler.AbstractIL.Internal.Library + +open FSharp.Compiler.Tast +open FSharp.Compiler.Range +open FSharp.Compiler.Ast +open FSharp.Compiler.Lib +open FSharp.Compiler.PrettyNaming open Internal.Utilities diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs index 14e9fad77ae..18dc43f9ab7 100755 --- a/src/fsharp/TypeChecker.fs +++ b/src/fsharp/TypeChecker.fs @@ -2,43 +2,43 @@ /// The typechecker. Left-to-right constrained type checking /// with generalization at appropriate points. -module internal Microsoft.FSharp.Compiler.TypeChecker +module internal FSharp.Compiler.TypeChecker open System open System.Collections.Generic open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library.ResultOrException -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics - -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Rational -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.PatternMatchCompilation -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.AccessibilityLogic -open Microsoft.FSharp.Compiler.AttributeChecking -open Microsoft.FSharp.Compiler.TypeRelations -open Microsoft.FSharp.Compiler.MethodCalls -open Microsoft.FSharp.Compiler.MethodOverrides -open Microsoft.FSharp.Compiler.ConstraintSolver -open Microsoft.FSharp.Compiler.NameResolution -open Microsoft.FSharp.Compiler.PrettyNaming -open Microsoft.FSharp.Compiler.InfoReader +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Internal.Library.ResultOrException +open FSharp.Compiler.AbstractIL.Diagnostics + +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.Rational +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.PatternMatchCompilation +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Lib +open FSharp.Compiler.Infos +open FSharp.Compiler.AccessibilityLogic +open FSharp.Compiler.AttributeChecking +open FSharp.Compiler.TypeRelations +open FSharp.Compiler.MethodCalls +open FSharp.Compiler.MethodOverrides +open FSharp.Compiler.ConstraintSolver +open FSharp.Compiler.NameResolution +open FSharp.Compiler.PrettyNaming +open FSharp.Compiler.InfoReader #if !NO_EXTENSIONTYPING -open Microsoft.FSharp.Compiler.ExtensionTyping +open FSharp.Compiler.ExtensionTyping #endif //------------------------------------------------------------------------- @@ -17307,7 +17307,7 @@ let rec IterTyconsOfModuleOrNamespaceType f (mty:ModuleOrNamespaceType) = // Defaults get applied in priority order. Defaults listed last get priority 0 (lowest), 2nd last priority 1 etc. let ApplyDefaults cenv g denvAtEnd m mexpr extraAttribs = try - let unsolved = Microsoft.FSharp.Compiler.FindUnsolved.UnsolvedTyparsOfModuleDef g cenv.amap denvAtEnd (mexpr, extraAttribs) + let unsolved = FSharp.Compiler.FindUnsolved.UnsolvedTyparsOfModuleDef g cenv.amap denvAtEnd (mexpr, extraAttribs) GeneralizationHelpers.CanonicalizePartialInferenceProblem (cenv, denvAtEnd, m) unsolved @@ -17359,7 +17359,7 @@ let CheckValueRestriction denvAtEnd rootSigOpt implFileTypePriorToSig m = let SolveInternalUnknowns g cenv denvAtEnd mexpr extraAttribs = - let unsolved = Microsoft.FSharp.Compiler.FindUnsolved.UnsolvedTyparsOfModuleDef g cenv.amap denvAtEnd (mexpr, extraAttribs) + let unsolved = FSharp.Compiler.FindUnsolved.UnsolvedTyparsOfModuleDef g cenv.amap denvAtEnd (mexpr, extraAttribs) unsolved |> List.iter (fun tp -> if (tp.Rigidity <> TyparRigidity.Rigid) && not tp.IsSolved then diff --git a/src/fsharp/TypeChecker.fsi b/src/fsharp/TypeChecker.fsi index aae09544998..09856e04895 100644 --- a/src/fsharp/TypeChecker.fsi +++ b/src/fsharp/TypeChecker.fsi @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.TypeChecker +module internal FSharp.Compiler.TypeChecker -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AccessibilityLogic -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.Import -open Microsoft.FSharp.Compiler.TcGlobals +open FSharp.Compiler +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AccessibilityLogic +open FSharp.Compiler.Ast +open FSharp.Compiler.Range +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.Infos +open FSharp.Compiler.Import +open FSharp.Compiler.TcGlobals open System.Collections.Generic diff --git a/src/fsharp/TypeRelations.fs b/src/fsharp/TypeRelations.fs index 43944d7a92f..5b633acb50d 100755 --- a/src/fsharp/TypeRelations.fs +++ b/src/fsharp/TypeRelations.fs @@ -2,16 +2,16 @@ /// Primary relations on types and signatures, with the exception of /// constraint solving and method overload resolution. -module internal Microsoft.FSharp.Compiler.TypeRelations +module internal FSharp.Compiler.TypeRelations -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.PrettyNaming +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Infos +open FSharp.Compiler.PrettyNaming //------------------------------------------------------------------------- // a :> b without coercion based on finalized (no type variable) types diff --git a/src/fsharp/UnicodeLexing.fs b/src/fsharp/UnicodeLexing.fs index b6013c0342d..f484a5f1a80 100644 --- a/src/fsharp/UnicodeLexing.fs +++ b/src/fsharp/UnicodeLexing.fs @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.UnicodeLexing +module internal FSharp.Compiler.UnicodeLexing //------------------------------------------------------------------ // Functions for Unicode char-based lexing (new code). // -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Internal.Library open Internal.Utilities open System.IO diff --git a/src/fsharp/UnicodeLexing.fsi b/src/fsharp/UnicodeLexing.fsi index 58f6828c95e..9f02c3e1972 100644 --- a/src/fsharp/UnicodeLexing.fsi +++ b/src/fsharp/UnicodeLexing.fsi @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.UnicodeLexing +module internal FSharp.Compiler.UnicodeLexing open Microsoft.FSharp.Text open Internal.Utilities.Text.Lexing diff --git a/src/fsharp/ast.fs b/src/fsharp/ast.fs index 22b960d18c6..94213096659 100644 --- a/src/fsharp/ast.fs +++ b/src/fsharp/ast.fs @@ -1,19 +1,19 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module public Microsoft.FSharp.Compiler.Ast +module public FSharp.Compiler.Ast open System.Collections.Generic open Internal.Utilities.Text.Lexing open Internal.Utilities.Text.Parsing -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.UnicodeLexing -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.PrettyNaming -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler +open FSharp.Compiler.UnicodeLexing +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.PrettyNaming +open FSharp.Compiler.Range /// The prefix of the names used for the fake namespace path added to all dynamic code entries in FSI.EXE let FsiDynamicModulePrefix = "FSI_" @@ -1805,8 +1805,8 @@ let ParseAssemblyCodeInstructions _s m = [| |] #else let ParseAssemblyCodeInstructions s m = - try Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser.ilInstrs - Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiLexer.token + try FSharp.Compiler.AbstractIL.Internal.AsciiParser.ilInstrs + FSharp.Compiler.AbstractIL.Internal.AsciiLexer.token (UnicodeLexing.StringAsLexbuf s) with RecoverableParseError -> errorR(Error(FSComp.SR.astParseEmbeddedILError(), m)); [| |] @@ -1820,8 +1820,8 @@ let ParseAssemblyCodeType _s m = IL.EcmaMscorlibILGlobals.typ_Object #else let ParseAssemblyCodeType s m = - try Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser.ilType - Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiLexer.token + try FSharp.Compiler.AbstractIL.Internal.AsciiParser.ilType + FSharp.Compiler.AbstractIL.Internal.AsciiLexer.token (UnicodeLexing.StringAsLexbuf s) with RecoverableParseError -> errorR(Error(FSComp.SR.astParseEmbeddedILTypeError(),m)); diff --git a/src/fsharp/autobox.fs b/src/fsharp/autobox.fs index 4c929e006ce..22e9409a69d 100644 --- a/src/fsharp/autobox.fs +++ b/src/fsharp/autobox.fs @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.AutoBox - -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.TypeRelations +module internal FSharp.Compiler.AutoBox + +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.Lib +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.TypeRelations //---------------------------------------------------------------------------- // Decide the set of mutable locals to promote to heap-allocated reference cells diff --git a/src/fsharp/fsc.fs b/src/fsharp/fsc.fs index f3117e16e86..0e896475e98 100644 --- a/src/fsharp/fsc.fs +++ b/src/fsharp/fsc.fs @@ -10,7 +10,7 @@ // - Linking (including ILX-IL transformation) -module internal Microsoft.FSharp.Compiler.Driver +module internal FSharp.Compiler.Driver open System open System.Collections.Concurrent @@ -27,31 +27,31 @@ open Internal.Utilities open Internal.Utilities.Collections open Internal.Utilities.Filename -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.ILBinaryReader -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.IlxGen - -open Microsoft.FSharp.Compiler.AccessibilityLogic -open Microsoft.FSharp.Compiler.AttributeChecking -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.CompileOps -open Microsoft.FSharp.Compiler.CompileOptions -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.InfoReader -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.TypeChecker +open FSharp.Compiler +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.ILBinaryReader +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.IlxGen + +open FSharp.Compiler.AccessibilityLogic +open FSharp.Compiler.AttributeChecking +open FSharp.Compiler.Ast +open FSharp.Compiler.CompileOps +open FSharp.Compiler.CompileOptions +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.InfoReader +open FSharp.Compiler.Lib +open FSharp.Compiler.Range +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.TypeChecker #if !NO_EXTENSIONTYPING -open Microsoft.FSharp.Compiler.ExtensionTyping +open FSharp.Compiler.ExtensionTyping #endif #nowarn "45" // This method will be made public in the underlying IL because it may implement an interface or override a method diff --git a/src/fsharp/fsc.fsi b/src/fsharp/fsc.fsi index 2e20a700cd0..b07c6fd120e 100755 --- a/src/fsharp/fsc.fsi +++ b/src/fsharp/fsc.fsi @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.Driver +module internal FSharp.Compiler.Driver -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.ILBinaryReader -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.CompileOps -open Microsoft.FSharp.Compiler.TcGlobals +open FSharp.Compiler.Ast +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.ILBinaryReader +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.CompileOps +open FSharp.Compiler.TcGlobals [] type ErrorLoggerProvider = diff --git a/src/fsharp/fscmain.fs b/src/fsharp/fscmain.fs index 1d50e0c68de..d8627150538 100644 --- a/src/fsharp/fscmain.fs +++ b/src/fsharp/fscmain.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.CommandLineMain +module internal FSharp.Compiler.CommandLineMain open System open System.Diagnostics @@ -8,16 +8,16 @@ open System.IO open System.Reflection open System.Runtime.CompilerServices -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.ILBinaryReader -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Driver -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.CompileOps -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.ILBinaryReader +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Driver +open FSharp.Compiler.Lib +open FSharp.Compiler.Range +open FSharp.Compiler.CompileOps +open FSharp.Compiler.AbstractIL.Internal.Library open Internal.Utilities #if FX_RESHAPED_REFLECTION @@ -85,5 +85,5 @@ let main(argv) = try Driver.main(Array.append [| "fsc.exe" |] argv) with e -> - errorRecovery e Microsoft.FSharp.Compiler.Range.range0 + errorRecovery e FSharp.Compiler.Range.range0 1 diff --git a/src/fsharp/fsi/console.fs b/src/fsharp/fsi/console.fs index 2ec0a73f3a7..78f6edef349 100644 --- a/src/fsharp/fsi/console.fs +++ b/src/fsharp/fsi/console.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.Interactive +namespace FSharp.Compiler.Interactive open System open System.Text @@ -96,7 +96,7 @@ module internal Utils = let guard(f) = try f() with e -> - Microsoft.FSharp.Compiler.ErrorLogger.warning(Failure(sprintf "Note: an unexpected exception in fsi.exe readline console support. Consider starting fsi.exe with the --no-readline option and report the stack trace below to the .NET or Mono implementors\n%s\n%s\n" e.Message e.StackTrace)); + FSharp.Compiler.ErrorLogger.warning(Failure(sprintf "Note: an unexpected exception in fsi.exe readline console support. Consider starting fsi.exe with the --no-readline option and report the stack trace below to the .NET or Mono implementors\n%s\n%s\n" e.Message e.StackTrace)); // Quick and dirty dirty method lookup for inlined IL // In some situations, we can't use ldtoken to obtain a RuntimeMethodHandle, since the method diff --git a/src/fsharp/fsi/fsi.fs b/src/fsharp/fsi/fsi.fs index 8190be40784..f45889eff31 100644 --- a/src/fsharp/fsi/fsi.fs +++ b/src/fsharp/fsi/fsi.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module Microsoft.FSharp.Compiler.Interactive.Shell +module FSharp.Compiler.Interactive.Shell #nowarn "55" @@ -19,37 +19,37 @@ open System.Text open System.Threading open System.Reflection open System.Runtime.CompilerServices -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.ILBinaryReader -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX -open Microsoft.FSharp.Compiler.AbstractIL.ILRuntimeWriter -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.AccessibilityLogic -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.CompileOptions -open Microsoft.FSharp.Compiler.CompileOps -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.InfoReader -open Microsoft.FSharp.Compiler.NameResolution -open Microsoft.FSharp.Compiler.IlxGen -open Microsoft.FSharp.Compiler.Lexhelp -open Microsoft.FSharp.Compiler.Layout -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.Optimizer -open Microsoft.FSharp.Compiler.PostTypeCheckSemanticChecks -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.TypeChecker -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.ReferenceResolver +open FSharp.Compiler +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.ILBinaryReader +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Extensions.ILX +open FSharp.Compiler.AbstractIL.ILRuntimeWriter +open FSharp.Compiler.Lib +open FSharp.Compiler.AccessibilityLogic +open FSharp.Compiler.Ast +open FSharp.Compiler.CompileOptions +open FSharp.Compiler.CompileOps +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Infos +open FSharp.Compiler.InfoReader +open FSharp.Compiler.NameResolution +open FSharp.Compiler.IlxGen +open FSharp.Compiler.Lexhelp +open FSharp.Compiler.Layout +open FSharp.Compiler.Lib +open FSharp.Compiler.Optimizer +open FSharp.Compiler.PostTypeCheckSemanticChecks +open FSharp.Compiler.Range +open FSharp.Compiler.TypeChecker +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.ReferenceResolver open Internal.Utilities open Internal.Utilities.Collections @@ -2641,8 +2641,7 @@ type FsiEvaluationSession (fsi: FsiEvaluationSessionHostConfig, argv:string[], i try errorLogger.AbortOnError(fsiConsoleOutput) with StopProcessing -> - // BUG 664864: Watson Clr20r3 across buckets with: Application fsiAnyCpu.exe from Dev11 RTM; Exception AE251Y0L0P2WC0QSWDZ0E2IDRYQTDSVB; FSIANYCPU.NI.EXE!Microsoft.FSharp.Compiler.Interactive.Shell+threadException - // reason: some window that use System.Windows.Forms.DataVisualization types (possible FSCharts) was created in FSI. + // BUG 664864 some window that use System.Windows.Forms.DataVisualization types (possible FSCharts) was created in FSI. // at some moment one chart has raised InvalidArgumentException from OnPaint, this exception was intercepted by the code in higher layer and // passed to Application.OnThreadException. FSI has already attached its own ThreadException handler, inside it will log the original error // and then raise StopProcessing exception to unwind the stack (and possibly shut down current Application) and get to DriveFsiEventLoop. diff --git a/src/fsharp/fsi/fsi.fsi b/src/fsharp/fsi/fsi.fsi index 894635e338b..49c307b6cb1 100644 --- a/src/fsharp/fsi/fsi.fsi +++ b/src/fsharp/fsi/fsi.fsi @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module public Microsoft.FSharp.Compiler.Interactive.Shell +module public FSharp.Compiler.Interactive.Shell open System.IO -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices [] /// Represents an evaluated F# value diff --git a/src/fsharp/fsi/fsimain.fs b/src/fsharp/fsi/fsimain.fs index 92a2f722709..90bf78b6508 100644 --- a/src/fsharp/fsi/fsimain.fs +++ b/src/fsharp/fsi/fsimain.fs @@ -9,7 +9,7 @@ // 3. connect the configuration to the global state programmer-settable settings in FSharp.Compiler.Interactive.Settings.dll // 4. implement shadow copy of references -module internal Sample.Microsoft.FSharp.Compiler.Interactive.Main +module internal Sample.FSharp.Compiler.Interactive.Main open System open System.Globalization @@ -21,12 +21,12 @@ open System.Runtime.CompilerServices open System.Windows.Forms #endif -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.Interactive.Shell -open Microsoft.FSharp.Compiler.Interactive -open Microsoft.FSharp.Compiler.Interactive.Shell.Settings +open FSharp.Compiler +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.Lib +open FSharp.Compiler.Interactive.Shell +open FSharp.Compiler.Interactive +open FSharp.Compiler.Interactive.Shell.Settings #if FX_RESHAPED_REFLECTION open Microsoft.FSharp.Core.ReflectionAdapters @@ -177,7 +177,7 @@ let evaluateSession(argv: string[]) = try // Create the console reader - let console = new Microsoft.FSharp.Compiler.Interactive.ReadLineConsole() + let console = new FSharp.Compiler.Interactive.ReadLineConsole() // Define the function we pass to the FsiEvaluationSession let getConsoleReadLine (probeToSeeIfConsoleWorks) = @@ -213,8 +213,8 @@ let evaluateSession(argv: string[]) = if isNull fsiAssembly then None else - let fsiTy = fsiAssembly.GetType("Microsoft.FSharp.Compiler.Interactive.Settings") - if isNull fsiAssembly then failwith "failed to find type Microsoft.FSharp.Compiler.Interactive.Settings in FSharp.Compiler.Interactive.Settings.dll" + let fsiTy = fsiAssembly.GetType("FSharp.Compiler.Interactive.Settings") + if isNull fsiAssembly then failwith "failed to find type FSharp.Compiler.Interactive.Settings in FSharp.Compiler.Interactive.Settings.dll" Some (callStaticMethod fsiTy "get_fsi" [ ]) let fsiConfig0 = @@ -317,8 +317,8 @@ let evaluateSession(argv: string[]) = fsiSession.Run() 0 with - | Microsoft.FSharp.Compiler.ErrorLogger.StopProcessingExn _ -> 1 - | Microsoft.FSharp.Compiler.ErrorLogger.ReportedError _ -> 1 + | FSharp.Compiler.ErrorLogger.StopProcessingExn _ -> 1 + | FSharp.Compiler.ErrorLogger.ReportedError _ -> 1 | e -> eprintf "Exception by fsi.exe:\n%+A\n" e; 1 // Mark the main thread as STAThread since it is a GUI thread diff --git a/src/fsharp/fsiattrs.fs b/src/fsharp/fsiattrs.fs index 58de98b4fcb..8e279c43ddd 100644 --- a/src/fsharp/fsiattrs.fs +++ b/src/fsharp/fsiattrs.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module Microsoft.FSharp.Compiler.Interactive.Attributes -[] +module FSharp.Compiler.Interactive.Attributes +[] do() diff --git a/src/fsharp/fsiaux.fs b/src/fsharp/fsiaux.fs index 7fd5d0f146f..f4c5ed9cd57 100644 --- a/src/fsharp/fsiaux.fs +++ b/src/fsharp/fsiaux.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.Interactive +namespace FSharp.Compiler.Interactive #nowarn "51" #nowarn "9" @@ -115,13 +115,25 @@ type InteractiveSession() = member __.Invoke(f) = invoke((fun () -> f() |> box)) |> unbox member __.ScheduleRestart() = restart() } -[] +[] do() module Settings = let fsi = new InteractiveSession() - [] + [] do() +// For legacy compatibility with old naming +namespace Microsoft.FSharp.Compiler.Interactive + + type IEventLoop = FSharp.Compiler.Interactive.IEventLoop + + type InteractiveSession = FSharp.Compiler.Interactive.InteractiveSession + + module Settings = + + let fsi = FSharp.Compiler.Interactive.Settings.fsi + + diff --git a/src/fsharp/fsiaux.fsi b/src/fsharp/fsiaux.fsi index 1c86c3d21cc..d557c17331b 100644 --- a/src/fsharp/fsiaux.fsi +++ b/src/fsharp/fsiaux.fsi @@ -1,64 +1,90 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.Interactive +namespace FSharp.Compiler.Interactive + + /// An event loop used by the currently executing F# Interactive session to execute code + /// in the context of a GUI or another event-based system. + type IEventLoop = + + /// Run the event loop. + /// True if the event loop was restarted; false otherwise. + abstract Run : unit -> bool + + /// Request that the given operation be run synchronously on the event loop. + /// The result of the operation. + abstract Invoke : (unit -> 'T) -> 'T -/// An event loop used by the currently executing F# Interactive session to execute code -/// in the context of a GUI or another event-based system. -type IEventLoop = - /// Run the event loop. - /// True if the event loop was restarted; false otherwise. - abstract Run : unit -> bool - /// Request that the given operation be run synchronously on the event loop. - /// The result of the operation. - abstract Invoke : (unit -> 'T) -> 'T - /// Schedule a restart for the event loop. - abstract ScheduleRestart : unit -> unit + /// Schedule a restart for the event loop. + abstract ScheduleRestart : unit -> unit -[] -/// Operations supported by the currently executing F# Interactive session. -type InteractiveSession = - /// Get or set the floating point format used in the output of the interactive session. - member FloatingPointFormat: string with get,set - /// Get or set the format provider used in the output of the interactive session. - member FormatProvider: System.IFormatProvider with get,set - /// Get or set the print width of the interactive session. - member PrintWidth : int with get,set - /// Get or set the print depth of the interactive session. - member PrintDepth : int with get,set - /// Get or set the total print length of the interactive session. - member PrintLength : int with get,set - /// Get or set the total print size of the interactive session. - member PrintSize : int with get,set - /// When set to 'false', disables the display of properties of evaluated objects in the output of the interactive session. - member ShowProperties : bool with get,set - /// When set to 'false', disables the display of sequences in the output of the interactive session. - member ShowIEnumerable: bool with get,set - /// When set to 'false', disables the display of declaration values in the output of the interactive session. - member ShowDeclarationValues: bool with get,set - /// Register a printer that controls the output of the interactive session. - member AddPrinter: ('T -> string) -> unit - /// Register a print transformer that controls the output of the interactive session. - member AddPrintTransformer: ('T -> obj) -> unit - - member internal AddedPrinters : Choice<(System.Type * (obj -> string)), - (System.Type * (obj -> obj))> list - - /// The command line arguments after ignoring the arguments relevant to the interactive - /// environment and replacing the first argument with the name of the last script file, - /// if any. Thus 'fsi.exe test1.fs test2.fs -- hello goodbye' will give arguments - /// 'test2.fs', 'hello', 'goodbye'. This value will normally be different to those - /// returned by System.Environment.GetCommandLineArgs. - member CommandLineArgs : string [] with get,set - - /// Gets or sets a the current event loop being used to process interactions. - member EventLoop: IEventLoop with get,set + [] + /// Operations supported by the currently executing F# Interactive session. + type InteractiveSession = + + /// Get or set the floating point format used in the output of the interactive session. + member FloatingPointFormat: string with get,set + + /// Get or set the format provider used in the output of the interactive session. + member FormatProvider: System.IFormatProvider with get,set + + /// Get or set the print width of the interactive session. + member PrintWidth : int with get,set + + /// Get or set the print depth of the interactive session. + member PrintDepth : int with get,set + + /// Get or set the total print length of the interactive session. + member PrintLength : int with get,set + + /// Get or set the total print size of the interactive session. + member PrintSize : int with get,set + + /// When set to 'false', disables the display of properties of evaluated objects in the output of the interactive session. + member ShowProperties : bool with get,set + + /// When set to 'false', disables the display of sequences in the output of the interactive session. + member ShowIEnumerable: bool with get,set + + /// When set to 'false', disables the display of declaration values in the output of the interactive session. + member ShowDeclarationValues: bool with get,set + + /// Register a printer that controls the output of the interactive session. + member AddPrinter: ('T -> string) -> unit + + /// Register a print transformer that controls the output of the interactive session. + member AddPrintTransformer: ('T -> obj) -> unit + + member internal AddedPrinters : Choice<(System.Type * (obj -> string)), + (System.Type * (obj -> obj))> list + + /// The command line arguments after ignoring the arguments relevant to the interactive + /// environment and replacing the first argument with the name of the last script file, + /// if any. Thus 'fsi.exe test1.fs test2.fs -- hello goodbye' will give arguments + /// 'test2.fs', 'hello', 'goodbye'. This value will normally be different to those + /// returned by System.Environment.GetCommandLineArgs. + member CommandLineArgs : string [] with get,set + + /// Gets or sets a the current event loop being used to process interactions. + member EventLoop: IEventLoop with get,set - /// Sets the current event loop being used to process interactions. - member internal SetEventLoop: (unit -> bool) * ((unit -> obj) -> obj) * (unit -> unit) -> unit + /// Sets the current event loop being used to process interactions. + member internal SetEventLoop: (unit -> bool) * ((unit -> obj) -> obj) * (unit -> unit) -> unit -module Settings = + module Settings = + + /// The settings associated with the interactive session. + val fsi : InteractiveSession + +// For legacy compatibility with old naming +namespace Microsoft.FSharp.Compiler.Interactive + + type IEventLoop = FSharp.Compiler.Interactive.IEventLoop + + type InteractiveSession = FSharp.Compiler.Interactive.InteractiveSession + + module Settings = + + val fsi : InteractiveSession - /// The settings associated with the interactive session. - val fsi : InteractiveSession diff --git a/src/fsharp/import.fs b/src/fsharp/import.fs index e06ee756da3..c8cb751cca3 100644 --- a/src/fsharp/import.fs +++ b/src/fsharp/import.fs @@ -1,23 +1,23 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Functions to import .NET binary metadata as TAST objects -module internal Microsoft.FSharp.Compiler.Import +module internal FSharp.Compiler.Import open System.Reflection open System.Collections.Concurrent open System.Collections.Generic -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger #if !NO_EXTENSIONTYPING -open Microsoft.FSharp.Compiler.ExtensionTyping +open FSharp.Compiler.ExtensionTyping #endif /// Represents an interface to some of the functionality of TcImports, for loading assemblies diff --git a/src/fsharp/import.fsi b/src/fsharp/import.fsi index 02415e922f8..1070bd302ae 100644 --- a/src/fsharp/import.fsi +++ b/src/fsharp/import.fsi @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Functions to import .NET binary metadata as TAST objects -module internal Microsoft.FSharp.Compiler.Import +module internal FSharp.Compiler.Import -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.Tast +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Range +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal.Library #if !NO_EXTENSIONTYPING -open Microsoft.FSharp.Compiler.ExtensionTyping +open FSharp.Compiler.ExtensionTyping #endif diff --git a/src/fsharp/infos.fs b/src/fsharp/infos.fs index 6ee5a6b53cd..d8b2cc37f41 100755 --- a/src/fsharp/infos.fs +++ b/src/fsharp/infos.fs @@ -4,24 +4,24 @@ /// to .NET and F# constructs. -module internal Microsoft.FSharp.Compiler.Infos - -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.Tastops.DebugPrint -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Lib +module internal FSharp.Compiler.Infos + +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.Tastops.DebugPrint +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Lib open Microsoft.FSharp.Core.Printf #if !NO_EXTENSIONTYPING -open Microsoft.FSharp.Compiler.ExtensionTyping +open FSharp.Compiler.ExtensionTyping #endif #if FX_RESHAPED_REFLECTION diff --git a/src/fsharp/layout.fs b/src/fsharp/layout.fs index 2ee543d9b1f..1664b9c713a 100644 --- a/src/fsharp/layout.fs +++ b/src/fsharp/layout.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module Microsoft.FSharp.Compiler.Layout +module FSharp.Compiler.Layout open System open System.Collections.Generic diff --git a/src/fsharp/layout.fsi b/src/fsharp/layout.fsi index a9ced6d9f2a..00831d49ca6 100644 --- a/src/fsharp/layout.fsi +++ b/src/fsharp/layout.fsi @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module public Microsoft.FSharp.Compiler.Layout +module public FSharp.Compiler.Layout open System.Text open System.Collections.Generic diff --git a/src/fsharp/lex.fsl b/src/fsharp/lex.fsl index 62fea65c296..0af96d71c9a 100644 --- a/src/fsharp/lex.fsl +++ b/src/fsharp/lex.fsl @@ -2,7 +2,7 @@ { -module internal Microsoft.FSharp.Compiler.Lexer +module internal FSharp.Compiler.Lexer //------------------------------------------------------------------------ // The Lexer. Some of the complication arises from the fact it is @@ -15,17 +15,17 @@ open System.Globalization open System.Text open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler - -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Parser -open Microsoft.FSharp.Compiler.Lexhelp -open Microsoft.FSharp.Compiler.Lib +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler + +open FSharp.Compiler.Range +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Parser +open FSharp.Compiler.Lexhelp +open FSharp.Compiler.Lib open Internal.Utilities.Text.Lexing let lexeme (lexbuf : UnicodeLexing.Lexbuf) = UnicodeLexing.Lexbuf.LexemeString lexbuf @@ -155,9 +155,9 @@ let evalIfDefExpression startPos args (lookup:string->bool) (lexed:string) = let lexbuf = LexBuffer.FromChars (lexed.ToCharArray ()) lexbuf.StartPos <- startPos lexbuf.EndPos <- startPos - let tokenStream = Microsoft.FSharp.Compiler.PPLexer.tokenstream args + let tokenStream = FSharp.Compiler.PPLexer.tokenstream args - let expr = Microsoft.FSharp.Compiler.PPParser.start tokenStream lexbuf + let expr = FSharp.Compiler.PPParser.start tokenStream lexbuf LexerIfdefEval lookup expr diff --git a/src/fsharp/lexhelp.fs b/src/fsharp/lexhelp.fs index b7603baf15f..212d7f6c7b5 100644 --- a/src/fsharp/lexhelp.fs +++ b/src/fsharp/lexhelp.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.Lexhelp +module internal FSharp.Compiler.Lexhelp open System open System.Text @@ -10,17 +10,17 @@ open Internal.Utilities.Collections open Internal.Utilities.Text open Internal.Utilities.Text.Lexing -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.PrettyNaming -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Parser +open FSharp.Compiler +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.Lib +open FSharp.Compiler.Ast +open FSharp.Compiler.PrettyNaming +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.Range +open FSharp.Compiler.Parser diff --git a/src/fsharp/lexhelp.fsi b/src/fsharp/lexhelp.fsi index 5c534fd7b38..9518b97d0c0 100644 --- a/src/fsharp/lexhelp.fsi +++ b/src/fsharp/lexhelp.fsi @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.Lexhelp +module internal FSharp.Compiler.Lexhelp open Internal.Utilities open Internal.Utilities.Text -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Ast +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler diff --git a/src/fsharp/lib.fs b/src/fsharp/lib.fs index 18404ba377d..ca6d129a6f7 100755 --- a/src/fsharp/lib.fs +++ b/src/fsharp/lib.fs @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.Lib +module internal FSharp.Compiler.Lib open System.IO open System.Collections.Generic open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library /// is this the developer-debug build? diff --git a/src/fsharp/pars.fsy b/src/fsharp/pars.fsy index 25c8ce10a8c..aef3d2d8d05 100644 --- a/src/fsharp/pars.fsy +++ b/src/fsharp/pars.fsy @@ -6,18 +6,18 @@ open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler open Internal.Utilities.Text.Parsing open System -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.PrettyNaming -open Microsoft.FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Range +open FSharp.Compiler.Ast +open FSharp.Compiler.Lib +open FSharp.Compiler.PrettyNaming +open FSharp.Compiler.ErrorLogger #if DEBUG let debugPrint(s) = diff --git a/src/fsharp/pplex.fsl b/src/fsharp/pplex.fsl index efcb7faac79..35d1c7fc3b7 100644 --- a/src/fsharp/pplex.fsl +++ b/src/fsharp/pplex.fsl @@ -2,13 +2,13 @@ { -module internal Microsoft.FSharp.Compiler.PPLexer +module internal FSharp.Compiler.PPLexer open System -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Lexhelp +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Lexhelp open Internal.Utilities.Text.Lexing diff --git a/src/fsharp/pppars.fsy b/src/fsharp/pppars.fsy index 756eae8bf51..354fd0ac38f 100644 --- a/src/fsharp/pppars.fsy +++ b/src/fsharp/pppars.fsy @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. %{ -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger let dummy = IfdefId("DUMMY") diff --git a/src/fsharp/range.fs b/src/fsharp/range.fs index 4e97edc2b37..84419892a78 100755 --- a/src/fsharp/range.fs +++ b/src/fsharp/range.fs @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Anything to do with special names of identifiers and other lexical rules -module Microsoft.FSharp.Compiler.Range +module FSharp.Compiler.Range open System open System.IO open System.Collections.Concurrent open Microsoft.FSharp.Core.Printf -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.Lib.Bits +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.Lib +open FSharp.Compiler.Lib.Bits type FileIndex = int32 diff --git a/src/fsharp/range.fsi b/src/fsharp/range.fsi index d4ef8be800f..5da9bee549a 100755 --- a/src/fsharp/range.fsi +++ b/src/fsharp/range.fsi @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module public Microsoft.FSharp.Compiler.Range +module public FSharp.Compiler.Range open System.Text open System.Collections.Generic open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler /// An index into a global tables of filenames diff --git a/src/fsharp/rational.fs b/src/fsharp/rational.fs index 4d72c2b5adc..b6c3588cdb0 100644 --- a/src/fsharp/rational.fs +++ b/src/fsharp/rational.fs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Rational arithmetic, used for exponents on units-of-measure -module internal Microsoft.FSharp.Compiler.Rational +module internal FSharp.Compiler.Rational open System.Numerics diff --git a/src/fsharp/rational.fsi b/src/fsharp/rational.fsi index 21115b88802..30b5d6b8e7d 100644 --- a/src/fsharp/rational.fsi +++ b/src/fsharp/rational.fsi @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Rational arithmetic, used for exponents on units-of-measure -module internal Microsoft.FSharp.Compiler.Rational +module internal FSharp.Compiler.Rational type Rational diff --git a/src/fsharp/service/ExternalSymbol.fs b/src/fsharp/service/ExternalSymbol.fs index ba22af94128..c0b4352c473 100644 --- a/src/fsharp/service/ExternalSymbol.fs +++ b/src/fsharp/service/ExternalSymbol.fs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices open FSharp.Reflection -open Microsoft.FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.IL open System.Diagnostics module private Option = diff --git a/src/fsharp/service/ExternalSymbol.fsi b/src/fsharp/service/ExternalSymbol.fsi index bd4cf757392..36d290db4d0 100644 --- a/src/fsharp/service/ExternalSymbol.fsi +++ b/src/fsharp/service/ExternalSymbol.fsi @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices open FSharp.Reflection -open Microsoft.FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.IL /// Represents a type in an external (non F#) assembly. [] diff --git a/src/fsharp/service/IncrementalBuild.fs b/src/fsharp/service/IncrementalBuild.fs index e2504be0cb8..9063c7857a7 100755 --- a/src/fsharp/service/IncrementalBuild.fs +++ b/src/fsharp/service/IncrementalBuild.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler +namespace FSharp.Compiler open System @@ -8,23 +8,23 @@ open System.Collections.Concurrent open System.Collections.Generic open System.IO open System.Threading -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.NameResolution -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.ILBinaryReader -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.CompileOps -open Microsoft.FSharp.Compiler.CompileOptions -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.TypeChecker -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.NameResolution +open FSharp.Compiler.Tastops +open FSharp.Compiler.Lib +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.ILBinaryReader +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.CompileOps +open FSharp.Compiler.CompileOptions +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.TypeChecker +open FSharp.Compiler.Tast +open FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices open Internal.Utilities.Collections [] @@ -1015,7 +1015,7 @@ module IncrementalBuilderEventTesting = let GetMostRecentIncrementalBuildEvents(n) = MRU.MostRecentList(n) let GetCurrentIncrementalBuildEventNum() = MRU.CurrentEventNum -module Tc = Microsoft.FSharp.Compiler.TypeChecker +module Tc = FSharp.Compiler.TypeChecker /// Accumulated results of type checking. diff --git a/src/fsharp/service/IncrementalBuild.fsi b/src/fsharp/service/IncrementalBuild.fsi index 29c7a03a454..ff117a0a5cb 100755 --- a/src/fsharp/service/IncrementalBuild.fsi +++ b/src/fsharp/service/IncrementalBuild.fsi @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler +namespace FSharp.Compiler open System -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.CompileOps -open Microsoft.FSharp.Compiler.NameResolution -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.CompileOps +open FSharp.Compiler.NameResolution +open FSharp.Compiler.Tast +open FSharp.Compiler.SourceCodeServices /// Lookup the global static cache for building the FrameworkTcImports type internal FrameworkImportsCache = diff --git a/src/fsharp/service/QuickParse.fs b/src/fsharp/service/QuickParse.fs index 9e851fef05f..9e962ac3025 100644 --- a/src/fsharp/service/QuickParse.fs +++ b/src/fsharp/service/QuickParse.fs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler +namespace FSharp.Compiler open System -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.SourceCodeServices /// Qualified long name. type PartialLongName = @@ -48,7 +48,7 @@ module QuickParse = // - if we're inside active pattern name (at the bar), correct the token TAG to be an identifier let CorrectIdentifierToken (tokenText: string) (tokenTag: int) = if tokenText.EndsWithOrdinal("|") then - Microsoft.FSharp.Compiler.Parser.tagOfToken (Microsoft.FSharp.Compiler.Parser.token.IDENT tokenText) + FSharp.Compiler.Parser.tagOfToken (FSharp.Compiler.Parser.token.IDENT tokenText) else tokenTag let rec isValidStrippedName (name:string) idx = diff --git a/src/fsharp/service/QuickParse.fsi b/src/fsharp/service/QuickParse.fsi index 7857f94d4cc..5f78dbefd2b 100644 --- a/src/fsharp/service/QuickParse.fsi +++ b/src/fsharp/service/QuickParse.fsi @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler +namespace FSharp.Compiler open System -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices /// Qualified long name. type public PartialLongName = diff --git a/src/fsharp/service/Reactor.fs b/src/fsharp/service/Reactor.fs index d2b8bda7ea6..bae570d0c5f 100755 --- a/src/fsharp/service/Reactor.fs +++ b/src/fsharp/service/Reactor.fs @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices open System open System.Diagnostics open System.Globalization open System.Threading open Microsoft.FSharp.Control -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.Lib +open FSharp.Compiler.AbstractIL.Internal.Library /// Represents the capability to schedule work in the compiler service operations queue for the compilation thread type internal IReactorOperations = diff --git a/src/fsharp/service/Reactor.fsi b/src/fsharp/service/Reactor.fsi index b4bd46d167e..5ea9572f48f 100755 --- a/src/fsharp/service/Reactor.fsi +++ b/src/fsharp/service/Reactor.fsi @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices open System.Threading -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Internal.Library /// Represents the capability to schedule work in the compiler service operations queue for the compilation thread type internal IReactorOperations = diff --git a/src/fsharp/service/ServiceAnalysis.fs b/src/fsharp/service/ServiceAnalysis.fs index 69049bc28fc..f66d372bc28 100644 --- a/src/fsharp/service/ServiceAnalysis.fs +++ b/src/fsharp/service/ServiceAnalysis.fs @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.PrettyNaming +open FSharp.Compiler +open FSharp.Compiler.Ast +open FSharp.Compiler.Range +open FSharp.Compiler.PrettyNaming open System.Collections.Generic open System.Runtime.CompilerServices -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Internal.Library module UnusedOpens = diff --git a/src/fsharp/service/ServiceAnalysis.fsi b/src/fsharp/service/ServiceAnalysis.fsi index cafaab2955b..8d976443890 100644 --- a/src/fsharp/service/ServiceAnalysis.fsi +++ b/src/fsharp/service/ServiceAnalysis.fsi @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.NameResolution -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.Ast +open FSharp.Compiler.NameResolution +open FSharp.Compiler.Range module public UnusedOpens = /// Get all unused open declarations in a file diff --git a/src/fsharp/service/ServiceAssemblyContent.fs b/src/fsharp/service/ServiceAssemblyContent.fs index 663ed82a941..9c131e4bd07 100644 --- a/src/fsharp/service/ServiceAssemblyContent.fs +++ b/src/fsharp/service/ServiceAssemblyContent.fs @@ -5,15 +5,15 @@ // type checking and intellisense-like environment-reporting. //-------------------------------------------------------------------------- -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices open System open System.Collections.Generic -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler +open FSharp.Compiler.Ast +open FSharp.Compiler.Range +open FSharp.Compiler.AbstractIL.Internal.Library type ShortIdent = string type Idents = ShortIdent[] @@ -491,8 +491,8 @@ type OpenStatementInsertionPoint = | Nearest module ParsedInput = - open Microsoft.FSharp.Compiler - open Microsoft.FSharp.Compiler.Ast + open FSharp.Compiler + open FSharp.Compiler.Ast /// An recursive pattern that collect all sequential expressions to avoid StackOverflowException let rec (|Sequentials|_|) = function diff --git a/src/fsharp/service/ServiceAssemblyContent.fsi b/src/fsharp/service/ServiceAssemblyContent.fsi index 10c9dc4baa3..0fe14c11444 100644 --- a/src/fsharp/service/ServiceAssemblyContent.fsi +++ b/src/fsharp/service/ServiceAssemblyContent.fsi @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices open System open System.Collections.Generic -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler +open FSharp.Compiler.Range /// Assembly content type. type public AssemblyContentType = diff --git a/src/fsharp/service/ServiceConstants.fs b/src/fsharp/service/ServiceConstants.fs index c2f298c4dbb..1628a277a35 100644 --- a/src/fsharp/service/ServiceConstants.fs +++ b/src/fsharp/service/ServiceConstants.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices [] type FSharpGlyph = diff --git a/src/fsharp/service/ServiceDeclarationLists.fs b/src/fsharp/service/ServiceDeclarationLists.fs index 22b851a5b88..a277384256d 100644 --- a/src/fsharp/service/ServiceDeclarationLists.fs +++ b/src/fsharp/service/ServiceDeclarationLists.fs @@ -5,24 +5,24 @@ // type checking and intellisense-like environment-reporting. //-------------------------------------------------------------------------- -namespace Microsoft.FSharp.Compiler.SourceCodeServices - -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.AccessibilityLogic -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Layout -open Microsoft.FSharp.Compiler.Layout.TaggedTextOps -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.PrettyNaming -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.NameResolution -open Microsoft.FSharp.Compiler.InfoReader +namespace FSharp.Compiler.SourceCodeServices + +open FSharp.Compiler +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.AccessibilityLogic +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Layout +open FSharp.Compiler.Layout.TaggedTextOps +open FSharp.Compiler.Lib +open FSharp.Compiler.PrettyNaming +open FSharp.Compiler.Range +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.Infos +open FSharp.Compiler.NameResolution +open FSharp.Compiler.InfoReader [] module EnvMisc3 = diff --git a/src/fsharp/service/ServiceDeclarationLists.fsi b/src/fsharp/service/ServiceDeclarationLists.fsi index 2beee7024f9..4dc7905251d 100644 --- a/src/fsharp/service/ServiceDeclarationLists.fsi +++ b/src/fsharp/service/ServiceDeclarationLists.fsi @@ -3,12 +3,12 @@ //---------------------------------------------------------------------------- // API for declaration lists and method overload lists -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.NameResolution -open Microsoft.FSharp.Compiler.InfoReader -open Microsoft.FSharp.Compiler.Tastops +open FSharp.Compiler.Range +open FSharp.Compiler.NameResolution +open FSharp.Compiler.InfoReader +open FSharp.Compiler.Tastops [] diff --git a/src/fsharp/service/ServiceInterfaceStubGenerator.fs b/src/fsharp/service/ServiceInterfaceStubGenerator.fs index 90a8ae4d7b3..d2ec593838a 100644 --- a/src/fsharp/service/ServiceInterfaceStubGenerator.fs +++ b/src/fsharp/service/ServiceInterfaceStubGenerator.fs @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices open System open System.Diagnostics open System.Collections.Generic -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler +open FSharp.Compiler.Ast +open FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.AbstractIL.Internal.Library #if !FX_NO_INDENTED_TEXT_WRITER [] diff --git a/src/fsharp/service/ServiceInterfaceStubGenerator.fsi b/src/fsharp/service/ServiceInterfaceStubGenerator.fsi index 428b73f830c..49a0da63d33 100644 --- a/src/fsharp/service/ServiceInterfaceStubGenerator.fsi +++ b/src/fsharp/service/ServiceInterfaceStubGenerator.fsi @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices open System open System.Diagnostics open System.Collections.Generic -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler +open FSharp.Compiler.Ast +open FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.AbstractIL.Internal.Library #if !FX_NO_INDENTED_TEXT_WRITER /// Capture information about an interface in ASTs diff --git a/src/fsharp/service/ServiceLexing.fs b/src/fsharp/service/ServiceLexing.fs index 5eda7cb31dc..a8c32ef19aa 100755 --- a/src/fsharp/service/ServiceLexing.fs +++ b/src/fsharp/service/ServiceLexing.fs @@ -4,19 +4,19 @@ // Open up the compiler as an incremental service for lexing. //-------------------------------------------------------------------------- -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices open System open System.Collections.Generic -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Parser -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Lexhelp -open Microsoft.FSharp.Compiler.Lib +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler +open FSharp.Compiler.Parser +open FSharp.Compiler.Range +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Lexhelp +open FSharp.Compiler.Lib type Position = int * int type Range = Position * Position @@ -772,7 +772,7 @@ type FSharpSourceTokenizer(defineConstants : string list, filename : string opti FSharpLineTokenizer(lexbuf, None, filename, lexArgsLightOn, lexArgsLightOff) module Keywords = - open Microsoft.FSharp.Compiler.Lexhelp.Keywords + open FSharp.Compiler.Lexhelp.Keywords let QuoteIdentifierIfNeeded s = QuoteIdentifierIfNeeded s let NormalizeIdentifierBackticks s = NormalizeIdentifierBackticks s diff --git a/src/fsharp/service/ServiceLexing.fsi b/src/fsharp/service/ServiceLexing.fsi index d354e452e1c..84fa2e571a7 100755 --- a/src/fsharp/service/ServiceLexing.fsi +++ b/src/fsharp/service/ServiceLexing.fsi @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler +open FSharp.Compiler type Position = int * int type Range = Position * Position diff --git a/src/fsharp/service/ServiceNavigation.fs b/src/fsharp/service/ServiceNavigation.fs index e0e1feb1b32..a8538051828 100755 --- a/src/fsharp/service/ServiceNavigation.fs +++ b/src/fsharp/service/ServiceNavigation.fs @@ -5,10 +5,10 @@ // type checking and intellisense-like environment-reporting. //-------------------------------------------------------------------------- -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Ast +open FSharp.Compiler.Range +open FSharp.Compiler.Ast /// Represents the different kinds of items that can appear in the navigation bar type FSharpNavigationDeclarationItemKind = diff --git a/src/fsharp/service/ServiceNavigation.fsi b/src/fsharp/service/ServiceNavigation.fsi index 2f7464ba215..be15736601e 100755 --- a/src/fsharp/service/ServiceNavigation.fsi +++ b/src/fsharp/service/ServiceNavigation.fsi @@ -5,9 +5,9 @@ // type checking and intellisense-like environment-reporting. //---------------------------------------------------------------------------- -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler +open FSharp.Compiler /// Indicates a kind of item to show in an F# navigation bar type public FSharpNavigationDeclarationItemKind = diff --git a/src/fsharp/service/ServiceParamInfoLocations.fs b/src/fsharp/service/ServiceParamInfoLocations.fs index e0e9affd2d5..f527e493ba9 100755 --- a/src/fsharp/service/ServiceParamInfoLocations.fs +++ b/src/fsharp/service/ServiceParamInfoLocations.fs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Ast +open FSharp.Compiler.Range +open FSharp.Compiler.Ast [] type FSharpNoteworthyParamInfoLocations(longId: string list, longIdRange: range, openParenLocation: pos, tupleEndLocations: pos list, isThereACloseParen: bool, namedParamNames: string option list) = diff --git a/src/fsharp/service/ServiceParamInfoLocations.fsi b/src/fsharp/service/ServiceParamInfoLocations.fsi index 6f9282c520f..6961c892b09 100755 --- a/src/fsharp/service/ServiceParamInfoLocations.fsi +++ b/src/fsharp/service/ServiceParamInfoLocations.fsi @@ -5,10 +5,10 @@ // type checking and intellisense-like environment-reporting. //---------------------------------------------------------------------------- -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler +open FSharp.Compiler.Range /// Represents the locations relevant to activating parameter info in an IDE [] diff --git a/src/fsharp/service/ServiceParseTreeWalk.fs b/src/fsharp/service/ServiceParseTreeWalk.fs index 14e08c9b2de..40e6580cc8e 100755 --- a/src/fsharp/service/ServiceParseTreeWalk.fs +++ b/src/fsharp/service/ServiceParseTreeWalk.fs @@ -5,10 +5,10 @@ // type checking and intellisense-like environment-reporting. //-------------------------------------------------------------------------- -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Ast +open FSharp.Compiler.Range +open FSharp.Compiler.Ast /// A range of utility functions to assist with traversing an AST diff --git a/src/fsharp/service/ServiceStructure.fs b/src/fsharp/service/ServiceStructure.fs index a89afd44c54..8c25bee2a11 100644 --- a/src/fsharp/service/ServiceStructure.fs +++ b/src/fsharp/service/ServiceStructure.fs @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.Ast +open FSharp.Compiler +open FSharp.Compiler.Range module Structure = /// Set of visitor utilities, designed for the express purpose of fetching ranges diff --git a/src/fsharp/service/ServiceStructure.fsi b/src/fsharp/service/ServiceStructure.fsi index a7a054a411f..ef90f4627ea 100644 --- a/src/fsharp/service/ServiceStructure.fsi +++ b/src/fsharp/service/ServiceStructure.fsi @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.Ast +open FSharp.Compiler.Range module public Structure = diff --git a/src/fsharp/service/ServiceUntypedParse.fs b/src/fsharp/service/ServiceUntypedParse.fs index 62c8892331f..42036bec582 100755 --- a/src/fsharp/service/ServiceUntypedParse.fs +++ b/src/fsharp/service/ServiceUntypedParse.fs @@ -5,20 +5,20 @@ // type checking and intellisense-like environment-reporting. //-------------------------------------------------------------------------- -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices open System open System.IO open System.Collections.Generic open System.Diagnostics -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.CompileOps -open Microsoft.FSharp.Compiler.Lib +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.CompileOps +open FSharp.Compiler.Lib /// Methods for dealing with F# sources files. module SourceFile = @@ -445,7 +445,7 @@ type EntityKind = module UntypedParseImpl = open System.Text.RegularExpressions - open Microsoft.FSharp.Compiler.PrettyNaming + open FSharp.Compiler.PrettyNaming let emptyStringSet = HashSet() @@ -791,7 +791,7 @@ module UntypedParseImpl = and walkType = function | SynType.LongIdent ident -> // we protect it with try..with because System.Exception : rangeOfLidwd may raise - // at Microsoft.FSharp.Compiler.Ast.LongIdentWithDots.get_Range() in D:\j\workspace\release_ci_pa---3f142ccc\src\fsharp\ast.fs:line 156 + // at FSharp.Compiler.Ast.LongIdentWithDots.get_Range() in D:\j\workspace\release_ci_pa---3f142ccc\src\fsharp\ast.fs:line 156 try ifPosInRange ident.Range (fun _ -> Some EntityKind.Type) with _ -> None | SynType.App(ty, _, types, _, _, _, _) -> walkType ty |> Option.orElse (List.tryPick walkType types) diff --git a/src/fsharp/service/ServiceUntypedParse.fsi b/src/fsharp/service/ServiceUntypedParse.fsi index 40339e85f96..8a88f766c86 100755 --- a/src/fsharp/service/ServiceUntypedParse.fsi +++ b/src/fsharp/service/ServiceUntypedParse.fsi @@ -5,13 +5,13 @@ // type checking and intellisense-like environment-reporting. //---------------------------------------------------------------------------- -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices open System.Collections.Generic -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.ErrorLogger +open FSharp.Compiler +open FSharp.Compiler.Ast +open FSharp.Compiler.Range +open FSharp.Compiler.ErrorLogger [] /// Represents the results of parsing an F# file diff --git a/src/fsharp/service/ServiceXmlDocParser.fs b/src/fsharp/service/ServiceXmlDocParser.fs index 0cfd5ec6b7b..7cf4f3fb317 100644 --- a/src/fsharp/service/ServiceXmlDocParser.fs +++ b/src/fsharp/service/ServiceXmlDocParser.fs @@ -1,16 +1,16 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Internal.Library /// Represent an Xml documentation block in source code type XmlDocable = | XmlDocable of line:int * indent:int * paramNames:string list module XmlDocParsing = - open Microsoft.FSharp.Compiler.Range - open Microsoft.FSharp.Compiler.Ast + open FSharp.Compiler.Range + open FSharp.Compiler.Ast let (|ConstructorPats|) = function | Pats ps -> ps diff --git a/src/fsharp/service/ServiceXmlDocParser.fsi b/src/fsharp/service/ServiceXmlDocParser.fsi index 7ba0ae6e7ba..128f351e290 100644 --- a/src/fsharp/service/ServiceXmlDocParser.fsi +++ b/src/fsharp/service/ServiceXmlDocParser.fsi @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Ast +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.Ast /// Represent an Xml documentation block in source code type public XmlDocable = diff --git a/src/fsharp/service/service.fs b/src/fsharp/service/service.fs index 7fbc49c1f39..3c624fd7d5d 100644 --- a/src/fsharp/service/service.fs +++ b/src/fsharp/service/service.fs @@ -3,7 +3,7 @@ // Open up the compiler as an incremental service for parsing, // type checking and intellisense-like environment-reporting. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices open System open System.Collections.Generic @@ -14,38 +14,38 @@ open System.Reflection open System.Text open Microsoft.FSharp.Core.Printf -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.ILBinaryReader -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library - -open Microsoft.FSharp.Compiler.AccessibilityLogic -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.CompileOps -open Microsoft.FSharp.Compiler.CompileOptions -open Microsoft.FSharp.Compiler.Driver -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.PrettyNaming -open Microsoft.FSharp.Compiler.Parser -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Lexhelp -open Microsoft.FSharp.Compiler.Layout -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.InfoReader -open Microsoft.FSharp.Compiler.NameResolution -open Microsoft.FSharp.Compiler.TypeChecker -open Microsoft.FSharp.Compiler.SourceCodeServices.SymbolHelpers +open FSharp.Compiler +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.ILBinaryReader +open FSharp.Compiler.AbstractIL.Diagnostics +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library + +open FSharp.Compiler.AccessibilityLogic +open FSharp.Compiler.Ast +open FSharp.Compiler.CompileOps +open FSharp.Compiler.CompileOptions +open FSharp.Compiler.Driver +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Lib +open FSharp.Compiler.PrettyNaming +open FSharp.Compiler.Parser +open FSharp.Compiler.Range +open FSharp.Compiler.Lexhelp +open FSharp.Compiler.Layout +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Infos +open FSharp.Compiler.InfoReader +open FSharp.Compiler.NameResolution +open FSharp.Compiler.TypeChecker +open FSharp.Compiler.SourceCodeServices.SymbolHelpers open Internal.Utilities open Internal.Utilities.Collections -open Microsoft.FSharp.Compiler.Layout.TaggedTextOps +open FSharp.Compiler.Layout.TaggedTextOps #if FX_RESHAPED_REFLECTION open Microsoft.FSharp.Core.ReflectionAdapters @@ -317,7 +317,7 @@ type TypeCheckInfo // check that type of value is the same or subtype of tcref // yes - allow access to protected members // no - strip ability to access protected members - if Microsoft.FSharp.Compiler.TypeRelations.TypeFeasiblySubsumesType 0 g amap m tcref Microsoft.FSharp.Compiler.TypeRelations.CanCoerce ty then + if FSharp.Compiler.TypeRelations.TypeFeasiblySubsumesType 0 g amap m tcref FSharp.Compiler.TypeRelations.CanCoerce ty then ad else AccessibleFrom(paths, None) @@ -3384,10 +3384,10 @@ module DebuggerEnvironment = System.Guid(0xAB4F38C9u, 0xB6E6us, 0x43baus, 0xBEuy, 0x3Buy, 0x58uy, 0x08uy, 0x0Buy, 0x2Cuy, 0xCCuy, 0xE3uy) module PrettyNaming = - let IsIdentifierPartCharacter x = Microsoft.FSharp.Compiler.PrettyNaming.IsIdentifierPartCharacter x - let IsLongIdentifierPartCharacter x = Microsoft.FSharp.Compiler.PrettyNaming.IsLongIdentifierPartCharacter x - let IsOperatorName x = Microsoft.FSharp.Compiler.PrettyNaming.IsOperatorName x - let GetLongNameFromString x = Microsoft.FSharp.Compiler.PrettyNaming.SplitNamesForILPath x + let IsIdentifierPartCharacter x = FSharp.Compiler.PrettyNaming.IsIdentifierPartCharacter x + let IsLongIdentifierPartCharacter x = FSharp.Compiler.PrettyNaming.IsLongIdentifierPartCharacter x + let IsOperatorName x = FSharp.Compiler.PrettyNaming.IsOperatorName x + let GetLongNameFromString x = FSharp.Compiler.PrettyNaming.SplitNamesForILPath x let FormatAndOtherOverloadsString remainingOverloads = FSComp.SR.typeInfoOtherOverloads(remainingOverloads) let QuoteIdentifierIfNeeded id = Lexhelp.Keywords.QuoteIdentifierIfNeeded id let KeywordNames = Lexhelp.Keywords.keywordNames diff --git a/src/fsharp/service/service.fsi b/src/fsharp/service/service.fsi index 2d07c235614..5952587d8ff 100755 --- a/src/fsharp/service/service.fsi +++ b/src/fsharp/service/service.fsi @@ -5,27 +5,27 @@ // type checking and intellisense-like environment-reporting. //---------------------------------------------------------------------------- -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices open System open System.IO open System.Collections.Generic -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.ILBinaryReader -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.Driver -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.NameResolution -open Microsoft.FSharp.Compiler.CompileOps -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.InfoReader -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.ILBinaryReader +open FSharp.Compiler +open FSharp.Compiler.Ast +open FSharp.Compiler.Driver +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Range +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.NameResolution +open FSharp.Compiler.CompileOps +open FSharp.Compiler.Infos +open FSharp.Compiler.InfoReader +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops /// Represents the reason why the GetDeclarationLocation operation failed. [] diff --git a/src/fsharp/sr.fs b/src/fsharp/sr.fs index 03e390c597d..7eab19223f8 100644 --- a/src/fsharp/sr.fs +++ b/src/fsharp/sr.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler +namespace FSharp.Compiler open Microsoft.FSharp.Core open Microsoft.FSharp.Core.Operators open Microsoft.FSharp.Collections diff --git a/src/fsharp/sr.fsi b/src/fsharp/sr.fsi index 00fed3bf253..72ead23feb4 100644 --- a/src/fsharp/sr.fsi +++ b/src/fsharp/sr.fsi @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler +namespace FSharp.Compiler module internal SR = val GetString : string -> string diff --git a/src/fsharp/symbols/Exprs.fs b/src/fsharp/symbols/Exprs.fs index 4da520daedd..400cf3ad8cd 100644 --- a/src/fsharp/symbols/Exprs.fs +++ b/src/fsharp/symbols/Exprs.fs @@ -1,17 +1,17 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices - -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.QuotationTranslator -open Microsoft.FSharp.Compiler.TypeRelations +namespace FSharp.Compiler.SourceCodeServices + +open FSharp.Compiler +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.Lib +open FSharp.Compiler.Infos +open FSharp.Compiler.Range +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.QuotationTranslator +open FSharp.Compiler.TypeRelations [] module ExprTranslationImpl = diff --git a/src/fsharp/symbols/Exprs.fsi b/src/fsharp/symbols/Exprs.fsi index c9049b33c1a..00214345628 100644 --- a/src/fsharp/symbols/Exprs.fsi +++ b/src/fsharp/symbols/Exprs.fsi @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.CompileOps +open FSharp.Compiler +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Tast +open FSharp.Compiler.Range +open FSharp.Compiler.CompileOps /// Represents the definitional contents of an assembly, as seen by the F# language diff --git a/src/fsharp/symbols/SymbolHelpers.fs b/src/fsharp/symbols/SymbolHelpers.fs index f4fb7c02383..525350152fd 100644 --- a/src/fsharp/symbols/SymbolHelpers.fs +++ b/src/fsharp/symbols/SymbolHelpers.fs @@ -5,32 +5,32 @@ // type checking and intellisense-like environment-reporting. //-------------------------------------------------------------------------- -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices open System open System.Collections.Generic open System.IO open Microsoft.FSharp.Core.Printf -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics - -open Microsoft.FSharp.Compiler.AccessibilityLogic -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Layout -open Microsoft.FSharp.Compiler.Layout.TaggedTextOps -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.PrettyNaming -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.NameResolution -open Microsoft.FSharp.Compiler.InfoReader -open Microsoft.FSharp.Compiler.CompileOps +open FSharp.Compiler +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Diagnostics + +open FSharp.Compiler.AccessibilityLogic +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Layout +open FSharp.Compiler.Layout.TaggedTextOps +open FSharp.Compiler.Lib +open FSharp.Compiler.PrettyNaming +open FSharp.Compiler.Range +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Infos +open FSharp.Compiler.NameResolution +open FSharp.Compiler.InfoReader +open FSharp.Compiler.CompileOps module EnvMisc2 = let maxMembers = GetEnvInteger "FCS_MaxMembersInQuickInfo" 10 diff --git a/src/fsharp/symbols/SymbolHelpers.fsi b/src/fsharp/symbols/SymbolHelpers.fsi index cbc351baf58..205d573961d 100755 --- a/src/fsharp/symbols/SymbolHelpers.fsi +++ b/src/fsharp/symbols/SymbolHelpers.fsi @@ -4,18 +4,18 @@ // Helpers for quick info and information about items //---------------------------------------------------------------------------- -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices open System -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.NameResolution -open Microsoft.FSharp.Compiler.InfoReader -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.Tastops -open Microsoft.FSharp.Compiler.ErrorLogger +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Infos +open FSharp.Compiler.NameResolution +open FSharp.Compiler.InfoReader +open FSharp.Compiler.Tast +open FSharp.Compiler.Tastops +open FSharp.Compiler.ErrorLogger //---------------------------------------------------------------------------- // Object model for diagnostics diff --git a/src/fsharp/symbols/SymbolPatterns.fs b/src/fsharp/symbols/SymbolPatterns.fs index eb12229f7c6..2265682692b 100644 --- a/src/fsharp/symbols/SymbolPatterns.fs +++ b/src/fsharp/symbols/SymbolPatterns.fs @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices /// Patterns over FSharpSymbol and derivatives. [] module Symbol = open System open System.Text.RegularExpressions - open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library + open FSharp.Compiler.AbstractIL.Internal.Library let isAttribute<'T> (attribute: FSharpAttribute) = // CompiledName throws exception on DataContractAttribute generated by SQLProvider diff --git a/src/fsharp/symbols/SymbolPatterns.fsi b/src/fsharp/symbols/SymbolPatterns.fsi index 9b86aa3a54c..c4c242270cd 100644 --- a/src/fsharp/symbols/SymbolPatterns.fsi +++ b/src/fsharp/symbols/SymbolPatterns.fsi @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices [] /// Patterns over FSharpSymbol and derivatives. diff --git a/src/fsharp/symbols/Symbols.fs b/src/fsharp/symbols/Symbols.fs index fa3fcccfc82..43622f44e5d 100644 --- a/src/fsharp/symbols/Symbols.fs +++ b/src/fsharp/symbols/Symbols.fs @@ -1,23 +1,23 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices open System.Collections.Generic -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.Infos -open Microsoft.FSharp.Compiler.AttributeChecking -open Microsoft.FSharp.Compiler.AccessibilityLogic -open Microsoft.FSharp.Compiler.InfoReader -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.CompileOps -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.NameResolution -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.Tastops +open FSharp.Compiler +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.Infos +open FSharp.Compiler.AttributeChecking +open FSharp.Compiler.AccessibilityLogic +open FSharp.Compiler.InfoReader +open FSharp.Compiler.Range +open FSharp.Compiler.Ast +open FSharp.Compiler.CompileOps +open FSharp.Compiler.Tast +open FSharp.Compiler.NameResolution +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.Lib +open FSharp.Compiler.Tastops open Internal.Utilities type FSharpAccessibility(a:Accessibility, ?isProtected) = diff --git a/src/fsharp/symbols/Symbols.fsi b/src/fsharp/symbols/Symbols.fsi index 3f3a3f0e0eb..bd5e0b188d5 100644 --- a/src/fsharp/symbols/Symbols.fsi +++ b/src/fsharp/symbols/Symbols.fsi @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler.SourceCodeServices +namespace FSharp.Compiler.SourceCodeServices open System.Collections.Generic -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.AccessibilityLogic -open Microsoft.FSharp.Compiler.CompileOps -open Microsoft.FSharp.Compiler.Import -open Microsoft.FSharp.Compiler.InfoReader -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.Tast -open Microsoft.FSharp.Compiler.TcGlobals -open Microsoft.FSharp.Compiler.NameResolution +open FSharp.Compiler +open FSharp.Compiler.AccessibilityLogic +open FSharp.Compiler.CompileOps +open FSharp.Compiler.Import +open FSharp.Compiler.InfoReader +open FSharp.Compiler.Range +open FSharp.Compiler.Ast +open FSharp.Compiler.Tast +open FSharp.Compiler.TcGlobals +open FSharp.Compiler.NameResolution // Implementation details used by other code in the compiler type internal SymbolEnv = diff --git a/src/fsharp/tainted.fs b/src/fsharp/tainted.fs index 5d43f463900..ebdc96c746a 100644 --- a/src/fsharp/tainted.fs +++ b/src/fsharp/tainted.fs @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler +namespace FSharp.Compiler #if !NO_EXTENSIONTYPING open System -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.Range open Microsoft.FSharp.Core.CompilerServices -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal.Library open System.Reflection open System.Collections.Generic open ErrorLogger @@ -17,7 +17,7 @@ type internal TypeProviderError ( errNum : int, tpDesignation : string, - m:Microsoft.FSharp.Compiler.Range.range, + m:FSharp.Compiler.Range.range, errors : string list, typeNameContext : string option, methodNameContext : string option diff --git a/src/fsharp/tainted.fsi b/src/fsharp/tainted.fsi index 228efbf606f..c5220feb6cf 100644 --- a/src/fsharp/tainted.fsi +++ b/src/fsharp/tainted.fsi @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -namespace Microsoft.FSharp.Compiler +namespace FSharp.Compiler #if !NO_EXTENSIONTYPING @@ -8,8 +8,8 @@ namespace Microsoft.FSharp.Compiler open System open System.Reflection open Microsoft.FSharp.Core.CompilerServices -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.Range +open FSharp.Compiler.AbstractIL.IL /// Stores and transports aggregated list of errors reported by the type provider type internal TypeProviderError = diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs index 4d645fa2541..720e621b3b8 100644 --- a/src/fsharp/tast.fs +++ b/src/fsharp/tast.fs @@ -4,31 +4,31 @@ // Defines the typed abstract syntax trees used throughout the F# compiler. //------------------------------------------------------------------------- -module internal Microsoft.FSharp.Compiler.Tast +module internal FSharp.Compiler.Tast open System open System.Collections.Generic open System.Diagnostics open System.Reflection open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.Types - -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.PrettyNaming -open Microsoft.FSharp.Compiler.QuotationPickler +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Extensions.ILX.Types + +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.Ast +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Lib +open FSharp.Compiler.PrettyNaming +open FSharp.Compiler.QuotationPickler open Microsoft.FSharp.Core.Printf -open Microsoft.FSharp.Compiler.Rational +open FSharp.Compiler.Rational #if !NO_EXTENSIONTYPING -open Microsoft.FSharp.Compiler.ExtensionTyping +open FSharp.Compiler.ExtensionTyping open Microsoft.FSharp.Core.CompilerServices #endif diff --git a/src/ilx/EraseClosures.fs b/src/ilx/EraseClosures.fs index 92476961fe9..2a94fb3240e 100644 --- a/src/ilx/EraseClosures.fs +++ b/src/ilx/EraseClosures.fs @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.EraseClosures +module internal FSharp.Compiler.AbstractIL.Extensions.ILX.EraseClosures open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.Types -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.IlxSettings -open Microsoft.FSharp.Compiler.AbstractIL.Morphs -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.PrettyNaming +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Extensions.ILX +open FSharp.Compiler.AbstractIL.Extensions.ILX.Types +open FSharp.Compiler.AbstractIL.Extensions.ILX.IlxSettings +open FSharp.Compiler.AbstractIL.Morphs +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.PrettyNaming open System.Reflection // -------------------------------------------------------------------- diff --git a/src/ilx/EraseClosures.fsi b/src/ilx/EraseClosures.fsi index 2c4156779a0..9a0d886ca53 100644 --- a/src/ilx/EraseClosures.fsi +++ b/src/ilx/EraseClosures.fsi @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Compiler use only. Erase closures -module internal Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.EraseClosures +module internal FSharp.Compiler.AbstractIL.Extensions.ILX.EraseClosures -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.Types +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Extensions.ILX +open FSharp.Compiler.AbstractIL.Extensions.ILX.Types type cenv val mkCallFunc : cenv -> allocLocal:(ILType -> uint16) -> numThisGenParams:int -> ILTailcall -> IlxClosureApps -> ILInstr list diff --git a/src/ilx/EraseUnions.fs b/src/ilx/EraseUnions.fs index b6fb95c4bdb..46756255018 100644 --- a/src/ilx/EraseUnions.fs +++ b/src/ilx/EraseUnions.fs @@ -5,15 +5,15 @@ // -------------------------------------------------------------------- -module internal Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.EraseUnions +module internal FSharp.Compiler.AbstractIL.Extensions.ILX.EraseUnions open System.Collections.Generic -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.Types +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Extensions.ILX +open FSharp.Compiler.AbstractIL.Extensions.ILX.Types open System.Reflection diff --git a/src/ilx/EraseUnions.fsi b/src/ilx/EraseUnions.fsi index 7044d2d9384..b263a9bf33c 100644 --- a/src/ilx/EraseUnions.fsi +++ b/src/ilx/EraseUnions.fsi @@ -4,10 +4,10 @@ // Compiler use only. Erase discriminated unions. // -------------------------------------------------------------------- -module internal Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.EraseUnions +module internal FSharp.Compiler.AbstractIL.Extensions.ILX.EraseUnions -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.Types +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Extensions.ILX.Types /// Make the instruction sequence for a "newdata" operation val mkNewData : ILGlobals -> IlxUnionSpec * int -> ILInstr list diff --git a/src/ilx/ilxsettings.fs b/src/ilx/ilxsettings.fs index 520da651c14..868a29d94e1 100644 --- a/src/ilx/ilxsettings.fs +++ b/src/ilx/ilxsettings.fs @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -module internal Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.IlxSettings +module internal FSharp.Compiler.AbstractIL.Extensions.ILX.IlxSettings open Internal.Utilities -open Microsoft.FSharp.Compiler.AbstractIL -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.AbstractIL.Internal -open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX +open FSharp.Compiler.AbstractIL +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.AbstractIL.Internal +open FSharp.Compiler.AbstractIL.Extensions.ILX type IlxCallImplementation = | VirtEntriesVirtCode diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx index df3c548cbc4..f5f9276c492 100644 --- a/src/scripts/scriptlib.fsx +++ b/src/scripts/scriptlib.fsx @@ -35,7 +35,7 @@ module Scripting = 0 #if INTERACTIVE - let argv = Microsoft.FSharp.Compiler.Interactive.Settings.fsi.CommandLineArgs |> Seq.skip 1 |> Seq.toArray + let argv = FSharp.Compiler.Interactive.Settings.fsi.CommandLineArgs |> Seq.skip 1 |> Seq.toArray let getCmdLineArgOptional (switchName: string) = argv |> Array.filter(fun t -> t.StartsWith(switchName)) |> Array.map(fun t -> t.Remove(0, switchName.Length).Trim()) |> Array.tryHead diff --git a/src/utils/filename.fs b/src/utils/filename.fs index 35d6d5a769a..9dd20134da1 100644 --- a/src/utils/filename.fs +++ b/src/utils/filename.fs @@ -3,7 +3,7 @@ module internal Internal.Utilities.Filename open System.IO -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.AbstractIL.Internal.Library exception IllegalFileNameChar of string * char diff --git a/src/utils/reshapedmsbuild.fs b/src/utils/reshapedmsbuild.fs index f84e8a5d319..571edd3ae4f 100644 --- a/src/utils/reshapedmsbuild.fs +++ b/src/utils/reshapedmsbuild.fs @@ -57,7 +57,7 @@ type TaskItem (itemSpec:string) = let m = buildUtilitiesTaskType.GetMethod("SetMetadata", [|typeof;typeof|]) (m.Invoke(instance,[|metadataName; metadataValue|])) |>ignore -namespace Microsoft.FSharp.Compiler +namespace FSharp.Compiler open System open System.Collections open System.Collections.Concurrent diff --git a/src/utils/sformat.fsi b/src/utils/sformat.fsi index afdd931f900..f7c053e51fc 100644 --- a/src/utils/sformat.fsi +++ b/src/utils/sformat.fsi @@ -285,7 +285,7 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl /// /// From F# Interactive the default settings can be adjusted using, for example, /// 
-    ///   open Microsoft.FSharp.Compiler.Interactive.Settings;;
+    ///   open FSharp.Compiler.Interactive.Settings;;
     ///   setPrintWidth 120;;
     ///
/// diff --git a/tests/FSharp.Build.UnitTests/WriteCodeFragmentTests.fs b/tests/FSharp.Build.UnitTests/WriteCodeFragmentTests.fs index 977c265be01..642541c7f90 100644 --- a/tests/FSharp.Build.UnitTests/WriteCodeFragmentTests.fs +++ b/tests/FSharp.Build.UnitTests/WriteCodeFragmentTests.fs @@ -4,7 +4,7 @@ namespace FSharp.Build.UnitTests open Microsoft.Build.Framework open Microsoft.Build.Utilities -open Microsoft.FSharp.Build +open FSharp.Build open NUnit.Framework [] diff --git a/tests/FSharp.Compiler.UnitTests/CompilerTestHelpers.fs b/tests/FSharp.Compiler.UnitTests/CompilerTestHelpers.fs index fc60eaa42a7..1ac573a84e2 100644 --- a/tests/FSharp.Compiler.UnitTests/CompilerTestHelpers.fs +++ b/tests/FSharp.Compiler.UnitTests/CompilerTestHelpers.fs @@ -5,6 +5,6 @@ module CompilerTestHelpers = let (|Warning|_|) (exn: System.Exception) = match exn with - | :? Microsoft.FSharp.Compiler.ErrorLogger.Error as e -> let n,d = e.Data0 in Some (n,d) - | :? Microsoft.FSharp.Compiler.ErrorLogger.NumberedError as e -> let n,d = e.Data0 in Some (n,d) + | :? FSharp.Compiler.ErrorLogger.Error as e -> let n,d = e.Data0 in Some (n,d) + | :? FSharp.Compiler.ErrorLogger.NumberedError as e -> let n,d = e.Data0 in Some (n,d) | _ -> None diff --git a/tests/FSharp.Compiler.UnitTests/EditDistance.fs b/tests/FSharp.Compiler.UnitTests/EditDistance.fs index 2e12544ebab..fa1f9a4293e 100644 --- a/tests/FSharp.Compiler.UnitTests/EditDistance.fs +++ b/tests/FSharp.Compiler.UnitTests/EditDistance.fs @@ -5,7 +5,7 @@ open System open System.Globalization open System.Text open NUnit.Framework -open Microsoft.FSharp.Compiler +open FSharp.Compiler [] module EditDistance = diff --git a/tests/FSharp.Compiler.UnitTests/HashIfExpression.fs b/tests/FSharp.Compiler.UnitTests/HashIfExpression.fs index 7e9139bc30f..8893ca68e70 100644 --- a/tests/FSharp.Compiler.UnitTests/HashIfExpression.fs +++ b/tests/FSharp.Compiler.UnitTests/HashIfExpression.fs @@ -8,12 +8,12 @@ open System.Text open NUnit.Framework open Internal.Utilities.Text.Lexing -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Lexer -open Microsoft.FSharp.Compiler.Lexhelp -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.ErrorLogger -open Microsoft.FSharp.Compiler.Ast +open FSharp.Compiler +open FSharp.Compiler.Lexer +open FSharp.Compiler.Lexhelp +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.ErrorLogger +open FSharp.Compiler.Ast [] type HashIfExpression() = diff --git a/tests/FSharp.Compiler.UnitTests/ILHelpers.fs b/tests/FSharp.Compiler.UnitTests/ILHelpers.fs index 372e11d0702..e86d8b4e436 100644 --- a/tests/FSharp.Compiler.UnitTests/ILHelpers.fs +++ b/tests/FSharp.Compiler.UnitTests/ILHelpers.fs @@ -8,7 +8,7 @@ open System.Diagnostics open NUnit.Framework -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices module ILChecker = diff --git a/tests/FSharp.Compiler.UnitTests/ManglingNameOfProvidedTypes.fs b/tests/FSharp.Compiler.UnitTests/ManglingNameOfProvidedTypes.fs index d56fd040e05..e422e5a499b 100644 --- a/tests/FSharp.Compiler.UnitTests/ManglingNameOfProvidedTypes.fs +++ b/tests/FSharp.Compiler.UnitTests/ManglingNameOfProvidedTypes.fs @@ -4,7 +4,7 @@ namespace FSharp.Compiler.UnitTests open System open System.Text open NUnit.Framework -open Microsoft.FSharp.Compiler +open FSharp.Compiler [] type ManglingNamesOfProvidedTypesWithSingleParameter() = diff --git a/tests/FSharp.Compiler.UnitTests/ProductVersion.fs b/tests/FSharp.Compiler.UnitTests/ProductVersion.fs index f0c6862a3f7..fe95e82a977 100644 --- a/tests/FSharp.Compiler.UnitTests/ProductVersion.fs +++ b/tests/FSharp.Compiler.UnitTests/ProductVersion.fs @@ -5,8 +5,8 @@ open System.IO open System.Text open NUnit.Framework -open Microsoft.FSharp.Compiler.AbstractIL.IL -open Microsoft.FSharp.Compiler.Driver.MainModuleBuilder +open FSharp.Compiler.AbstractIL.IL +open FSharp.Compiler.Driver.MainModuleBuilder #nowarn "3180" @@ -109,7 +109,7 @@ module TypeProviderDesignTimeComponentLoading = Path.Combine("typeproviders", "fsharp41", "netstandard2.0") Path.Combine("tools", "fsharp41", "netstandard2.0") ] - let actual = Microsoft.FSharp.Compiler.ExtensionTyping.toolingCompatiblePaths() + let actual = FSharp.Compiler.ExtensionTyping.toolingCompatiblePaths() printfn "actual = %A" actual printfn "expected = %A" expected Assert.True((expected=actual)) diff --git a/tests/fsharpqa/Source/Conformance/BasicGrammarElements/OperatorNames/Atat.fsx b/tests/fsharpqa/Source/Conformance/BasicGrammarElements/OperatorNames/Atat.fsx index 43c4649432f..30256aecd5a 100644 --- a/tests/fsharpqa/Source/Conformance/BasicGrammarElements/OperatorNames/Atat.fsx +++ b/tests/fsharpqa/Source/Conformance/BasicGrammarElements/OperatorNames/Atat.fsx @@ -1,6 +1,6 @@ // Regression test for DevDiv:20718 // The following code was triggering a Watson error -// Watson Clr20r3 across buckets with: Application fsc.exe from Dev10 RTM; Exception system.exception; UNKNOWN!Microsoft.FSharp.Compiler.Tastops.dest_fun_typ +// Watson Clr20r3 across buckets with: Application fsc.exe from Dev10 RTM; Exception system.exception; UNKNOWN!FSharp.Compiler.Tastops.dest_fun_typ let main() = let (@@) = id diff --git a/tests/fsharpqa/testenv/src/HostedCompilerServer/Program.fs b/tests/fsharpqa/testenv/src/HostedCompilerServer/Program.fs index a6f535d7499..440af1b7d75 100644 --- a/tests/fsharpqa/testenv/src/HostedCompilerServer/Program.fs +++ b/tests/fsharpqa/testenv/src/HostedCompilerServer/Program.fs @@ -7,7 +7,7 @@ open System.Net.Sockets open System.Text open System.Threading open System.Linq -open Microsoft.FSharp.Compiler +open FSharp.Compiler open Legacy.FSharp.Compiler.Hosted [] diff --git a/tests/service/AssemblyContentProviderTests.fs b/tests/service/AssemblyContentProviderTests.fs index 30f11f4cdd5..97c1f398008 100644 --- a/tests/service/AssemblyContentProviderTests.fs +++ b/tests/service/AssemblyContentProviderTests.fs @@ -11,7 +11,7 @@ open System open System.IO open System.Text open NUnit.Framework -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices let private filePath = "C:\\test.fs" diff --git a/tests/service/AssemblyReaderShim.fs b/tests/service/AssemblyReaderShim.fs index e7fd0a48ba3..d74a09efad2 100644 --- a/tests/service/AssemblyReaderShim.fs +++ b/tests/service/AssemblyReaderShim.fs @@ -9,7 +9,7 @@ module FSharp.Compiler.Service.Tests.AssemblyReaderShim open FSharp.Compiler.Service.Tests.Common open FsUnit -open Microsoft.FSharp.Compiler.AbstractIL.ILBinaryReader +open FSharp.Compiler.AbstractIL.ILBinaryReader open NUnit.Framework [] diff --git a/tests/service/CSharpProjectAnalysis.fs b/tests/service/CSharpProjectAnalysis.fs index 70d805b9e6b..d08d2405494 100644 --- a/tests/service/CSharpProjectAnalysis.fs +++ b/tests/service/CSharpProjectAnalysis.fs @@ -16,9 +16,9 @@ open System open System.IO open System.Collections.Generic -open Microsoft.FSharp.Compiler +open FSharp.Compiler open FSharp.Compiler.Service.Tests -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices open FSharp.Compiler.Service.Tests.Common diff --git a/tests/service/Common.fs b/tests/service/Common.fs index 6999e97a2b2..0fd2e93804f 100644 --- a/tests/service/Common.fs +++ b/tests/service/Common.fs @@ -3,8 +3,8 @@ module internal FSharp.Compiler.Service.Tests.Common open System open System.IO open System.Collections.Generic -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices #if FX_RESHAPED_REFLECTION open ReflectionAdapters @@ -86,7 +86,7 @@ let sysLib nm = module Helpers = open System type DummyType = A | B - let PathRelativeToTestAssembly p = Path.Combine(Path.GetDirectoryName(Uri(typeof.Assembly.CodeBase).LocalPath), p) + let PathRelativeToTestAssembly p = Path.Combine(Path.GetDirectoryName(Uri(typeof.Assembly.CodeBase).LocalPath), p) let fsCoreDefaultReference() = PathRelativeToTestAssembly "FSharp.Core.dll" diff --git a/tests/service/EditorTests.fs b/tests/service/EditorTests.fs index 49594f523ef..038ac331204 100644 --- a/tests/service/EditorTests.fs +++ b/tests/service/EditorTests.fs @@ -31,8 +31,8 @@ open NUnit.Framework open FsUnit open System open System.IO -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices open FSharp.Compiler.Service.Tests.Common let stringMethods = diff --git a/tests/service/ExprTests.fs b/tests/service/ExprTests.fs index 3e2df86ca5e..476e3de1b05 100644 --- a/tests/service/ExprTests.fs +++ b/tests/service/ExprTests.fs @@ -15,8 +15,8 @@ open FsUnit open System open System.IO open System.Collections.Generic -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices open FSharp.Compiler.Service open FSharp.Compiler.Service.Tests.Common diff --git a/tests/service/FileSystemTests.fs b/tests/service/FileSystemTests.fs index b9cf6cf888f..77bee71ab5a 100644 --- a/tests/service/FileSystemTests.fs +++ b/tests/service/FileSystemTests.fs @@ -14,9 +14,9 @@ open System open System.IO open System.Collections.Generic open System.Text -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.AbstractIL.Internal.Library open FSharp.Compiler.Service.Tests.Common let fileName1 = @"c:\mycode\test1.fs" // note, the path doesn' exist diff --git a/tests/service/FscTests.fs b/tests/service/FscTests.fs index 553f5e468b0..0d6e2103514 100644 --- a/tests/service/FscTests.fs +++ b/tests/service/FscTests.fs @@ -13,8 +13,8 @@ open System open System.Diagnostics open System.IO -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices open FSharp.Compiler.Service.Tests open FSharp.Compiler.Service.Tests.Common @@ -248,7 +248,7 @@ let ``5. Compile from AST with explicit assembly reference`` () = let code = """ module Bar - open Microsoft.FSharp.Compiler.SourceCodeServices + open FSharp.Compiler.SourceCodeServices let f x = (x,x) @@ -367,9 +367,9 @@ let x = 3 + 4 [] let ``Check read of mscorlib`` () = - let options = Microsoft.FSharp.Compiler.AbstractIL.ILBinaryReader.mkDefault Microsoft.FSharp.Compiler.AbstractIL.IL.EcmaILGlobals + let options = FSharp.Compiler.AbstractIL.ILBinaryReader.mkDefault FSharp.Compiler.AbstractIL.IL.EcmaILGlobals let options = { options with optimizeForMemory=true} - let reader = Microsoft.FSharp.Compiler.AbstractIL.ILBinaryReader.OpenILModuleReaderAfterReadingAllBytes "C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\mscorlib.dll" options + let reader = FSharp.Compiler.AbstractIL.ILBinaryReader.OpenILModuleReaderAfterReadingAllBytes "C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\mscorlib.dll" options let greg = reader.ILModuleDef.TypeDefs.FindByName "System.Globalization.GregorianCalendar" for attr in greg.CustomAttrs.AsList do printfn "%A" attr.Method diff --git a/tests/service/FsiTests.fs b/tests/service/FsiTests.fs index 23bf52b33e3..4e5f8705a13 100644 --- a/tests/service/FsiTests.fs +++ b/tests/service/FsiTests.fs @@ -8,9 +8,9 @@ module FSharp.Compiler.Service.Tests.FsiTests #endif -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Interactive.Shell -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.Interactive.Shell +open FSharp.Compiler.SourceCodeServices open NUnit.Framework open FsUnit @@ -79,7 +79,7 @@ let ``EvalExpression test 1 nothrow``() = [] // 'fsi' can be evaluated because we passed it in explicitly up above let ``EvalExpression fsi test``() = - evalExpression "fsi" |> shouldEqual "Microsoft.FSharp.Compiler.Interactive.InteractiveSession" + evalExpression "fsi" |> shouldEqual "FSharp.Compiler.Interactive.InteractiveSession" [] // 'fsi' can be evaluated because we passed it in explicitly up above diff --git a/tests/service/InteractiveCheckerTests.fs b/tests/service/InteractiveCheckerTests.fs index 136505b6dd2..25f77e12881 100644 --- a/tests/service/InteractiveCheckerTests.fs +++ b/tests/service/InteractiveCheckerTests.fs @@ -11,8 +11,8 @@ module FSharp.Compiler.Service.Tests.InteractiveChecker open NUnit.Framework open FsUnit open System -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices open FSharp.Compiler.Service.Tests.Common let internal longIdentToString (longIdent: Ast.LongIdent) = diff --git a/tests/service/MultiProjectAnalysisTests.fs b/tests/service/MultiProjectAnalysisTests.fs index 0e4d38a3321..cc96d32ae77 100644 --- a/tests/service/MultiProjectAnalysisTests.fs +++ b/tests/service/MultiProjectAnalysisTests.fs @@ -8,8 +8,8 @@ module Tests.Service.MultiProjectAnalysisTests #endif -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices open NUnit.Framework open FsUnit @@ -18,7 +18,7 @@ open System.IO open System open System.Collections.Generic -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices open FSharp.Compiler.Service.Tests.Common let numProjectsForStressTest = 100 diff --git a/tests/service/PerfTests.fs b/tests/service/PerfTests.fs index 662e00c5645..77ff0ab2816 100644 --- a/tests/service/PerfTests.fs +++ b/tests/service/PerfTests.fs @@ -14,8 +14,8 @@ open System open System.IO open System.Collections.Generic -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices open FSharp.Compiler.Service.Tests.Common @@ -47,6 +47,7 @@ let ``Test request for parse and check doesn't check whole project`` () = checker.FileChecked.Add (fun x -> incr backgroundCheckCount) checker.FileParsed.Add (fun x -> incr backgroundParseCount) + checker.ClearLanguageServiceRootCachesAndCollectAndFinalizeAllTransients() let pB, tB = FSharpChecker.GlobalForegroundParseCountStatistic, FSharpChecker.GlobalForegroundTypeCheckCountStatistic let parseResults1 = checker.ParseFile(Project1.fileNames.[5], Project1.fileSources2.[5], Project1.parsingOptions) |> Async.RunSynchronously let pC, tC = FSharpChecker.GlobalForegroundParseCountStatistic, FSharpChecker.GlobalForegroundTypeCheckCountStatistic diff --git a/tests/service/ProjectAnalysisTests.fs b/tests/service/ProjectAnalysisTests.fs index e67aa3373b7..ee3884bb59d 100644 --- a/tests/service/ProjectAnalysisTests.fs +++ b/tests/service/ProjectAnalysisTests.fs @@ -15,8 +15,8 @@ open System open System.IO open System.Collections.Generic -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices open FSharp.Compiler.Service.Tests.Common diff --git a/tests/service/ProjectOptionsTests.fs b/tests/service/ProjectOptionsTests.fs index b390f53e62b..06d2ddc2868 100644 --- a/tests/service/ProjectOptionsTests.fs +++ b/tests/service/ProjectOptionsTests.fs @@ -14,8 +14,8 @@ open System open System.IO open NUnit.Framework open FsUnit -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Ast +open FSharp.Compiler.SourceCodeServices open FSharp.Compiler.Service.Tests.Common diff --git a/tests/service/ServiceUntypedParseTests.fs b/tests/service/ServiceUntypedParseTests.fs index ccda4f5bac4..706cc694cc3 100644 --- a/tests/service/ServiceUntypedParseTests.fs +++ b/tests/service/ServiceUntypedParseTests.fs @@ -11,8 +11,8 @@ open System open System.IO open System.Text open NUnit.Framework -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices open FSharp.Compiler.Service.Tests.Common open Tests.Service diff --git a/tests/service/StructureTests.fs b/tests/service/StructureTests.fs index c98027c4ca0..5f2b8b9f203 100644 --- a/tests/service/StructureTests.fs +++ b/tests/service/StructureTests.fs @@ -9,9 +9,9 @@ module Tests.Service.StructureTests open System.IO open NUnit.Framework -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.SourceCodeServices.Structure +open FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices.Structure open FSharp.Compiler.Service.Tests.Common open System.Text diff --git a/tests/service/Symbols.fs b/tests/service/Symbols.fs index da2a7795577..cbfb061ec07 100644 --- a/tests/service/Symbols.fs +++ b/tests/service/Symbols.fs @@ -10,7 +10,7 @@ module Tests.Service.Symbols open FSharp.Compiler.Service.Tests.Common open FsUnit open NUnit.Framework -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices module ActivePatterns = diff --git a/tests/service/TokenizerTests.fs b/tests/service/TokenizerTests.fs index 84b95e5175e..f0dfde2c88a 100644 --- a/tests/service/TokenizerTests.fs +++ b/tests/service/TokenizerTests.fs @@ -8,9 +8,9 @@ module FSharp.Compiler.Service.Tests.TokenizerTests #endif -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Interactive.Shell -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.Interactive.Shell +open FSharp.Compiler.SourceCodeServices open NUnit.Framework open FsUnit diff --git a/tests/service/TreeVisitorTests.fs b/tests/service/TreeVisitorTests.fs index e81d140011e..2beb2a09bc3 100644 --- a/tests/service/TreeVisitorTests.fs +++ b/tests/service/TreeVisitorTests.fs @@ -1,8 +1,8 @@ module Tests.Service.TreeVisitorTests open FSharp.Compiler.Service.Tests.Common -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.SourceCodeServices.AstTraversal +open FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices.AstTraversal open NUnit.Framework [] diff --git a/vsintegration/Utils/LanguageServiceProfiling/Options.fs b/vsintegration/Utils/LanguageServiceProfiling/Options.fs index cf900181442..fe87ff09658 100644 --- a/vsintegration/Utils/LanguageServiceProfiling/Options.fs +++ b/vsintegration/Utils/LanguageServiceProfiling/Options.fs @@ -1,8 +1,8 @@ module internal LanguageServiceProfiling.Options -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices open System open System.IO diff --git a/vsintegration/Utils/LanguageServiceProfiling/Program.fs b/vsintegration/Utils/LanguageServiceProfiling/Program.fs index 5413e8b9094..cd68f885046 100644 --- a/vsintegration/Utils/LanguageServiceProfiling/Program.fs +++ b/vsintegration/Utils/LanguageServiceProfiling/Program.fs @@ -41,8 +41,8 @@ Results look like this: *) -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices open System open System.IO open LanguageServiceProfiling diff --git a/vsintegration/Utils/LanguageServiceProfiling/ProjectCracker.fs b/vsintegration/Utils/LanguageServiceProfiling/ProjectCracker.fs index 119fdc9317b..787527bbe95 100644 --- a/vsintegration/Utils/LanguageServiceProfiling/ProjectCracker.fs +++ b/vsintegration/Utils/LanguageServiceProfiling/ProjectCracker.fs @@ -1,2 +1,2 @@ -namespace Microsoft.FSharp.Compiler.SourceCodeServices.ProjectCrackerTool +namespace FSharp.Compiler.SourceCodeServices.ProjectCrackerTool diff --git a/vsintegration/src/FSharp.Editor/Classification/ClassificationDefinitions.fs b/vsintegration/src/FSharp.Editor/Classification/ClassificationDefinitions.fs index 806c54b0b35..749c3ceed7a 100644 --- a/vsintegration/src/FSharp.Editor/Classification/ClassificationDefinitions.fs +++ b/vsintegration/src/FSharp.Editor/Classification/ClassificationDefinitions.fs @@ -17,7 +17,7 @@ open Microsoft.VisualStudio.Text.Classification open Microsoft.VisualStudio.Utilities open Microsoft.CodeAnalysis.Classification -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices [] module internal FSharpClassificationTypes = diff --git a/vsintegration/src/FSharp.Editor/Classification/ClassificationService.fs b/vsintegration/src/FSharp.Editor/Classification/ClassificationService.fs index 9f9840d9b47..c8c764f2521 100644 --- a/vsintegration/src/FSharp.Editor/Classification/ClassificationService.fs +++ b/vsintegration/src/FSharp.Editor/Classification/ClassificationService.fs @@ -19,7 +19,7 @@ open Microsoft.CodeAnalysis.Text // IVT, we'll maintain the status quo. #nowarn "44" -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices [, FSharpConstants.FSharpLanguageName)>] type internal FSharpClassificationService diff --git a/vsintegration/src/FSharp.Editor/CodeFix/AddOpenCodeFixProvider.fs b/vsintegration/src/FSharp.Editor/CodeFix/AddOpenCodeFixProvider.fs index bd77ba7f1ea..f2b95ef1c1e 100644 --- a/vsintegration/src/FSharp.Editor/CodeFix/AddOpenCodeFixProvider.fs +++ b/vsintegration/src/FSharp.Editor/CodeFix/AddOpenCodeFixProvider.fs @@ -12,10 +12,10 @@ open Microsoft.CodeAnalysis.Text open Microsoft.CodeAnalysis.CodeFixes open Microsoft.CodeAnalysis.CodeActions -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.AbstractIL.Internal.Library [] type internal FSharpAddOpenCodeFixProvider diff --git a/vsintegration/src/FSharp.Editor/CodeFix/ImplementInterfaceCodeFixProvider.fs b/vsintegration/src/FSharp.Editor/CodeFix/ImplementInterfaceCodeFixProvider.fs index df6bd0b36a6..137285ea14f 100644 --- a/vsintegration/src/FSharp.Editor/CodeFix/ImplementInterfaceCodeFixProvider.fs +++ b/vsintegration/src/FSharp.Editor/CodeFix/ImplementInterfaceCodeFixProvider.fs @@ -13,9 +13,9 @@ open Microsoft.CodeAnalysis.Text open Microsoft.CodeAnalysis.CodeFixes open Microsoft.CodeAnalysis.CodeActions -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices [] type internal InterfaceState = diff --git a/vsintegration/src/FSharp.Editor/CodeFix/RemoveUnusedOpens.fs b/vsintegration/src/FSharp.Editor/CodeFix/RemoveUnusedOpens.fs index 5e97220d08c..e7d3372912e 100644 --- a/vsintegration/src/FSharp.Editor/CodeFix/RemoveUnusedOpens.fs +++ b/vsintegration/src/FSharp.Editor/CodeFix/RemoveUnusedOpens.fs @@ -12,7 +12,7 @@ open Microsoft.CodeAnalysis.Text open Microsoft.CodeAnalysis.CodeFixes open Microsoft.CodeAnalysis.CodeActions -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.Range [] type internal FSharpRemoveUnusedOpensCodeFixProvider diff --git a/vsintegration/src/FSharp.Editor/CodeFix/RenameParamToMatchSignature.fs b/vsintegration/src/FSharp.Editor/CodeFix/RenameParamToMatchSignature.fs index ea2ba70d2a3..7fca8aa4d43 100644 --- a/vsintegration/src/FSharp.Editor/CodeFix/RenameParamToMatchSignature.fs +++ b/vsintegration/src/FSharp.Editor/CodeFix/RenameParamToMatchSignature.fs @@ -11,10 +11,10 @@ open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.Text open Microsoft.CodeAnalysis.CodeFixes -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices open Microsoft.VisualStudio.FSharp.Editor.SymbolHelpers -open Microsoft.FSharp.Compiler.SourceCodeServices.Keywords +open FSharp.Compiler.SourceCodeServices.Keywords [] type internal FSharpRenameParamToMatchSignature diff --git a/vsintegration/src/FSharp.Editor/CodeFix/RenameUnusedValue.fs b/vsintegration/src/FSharp.Editor/CodeFix/RenameUnusedValue.fs index 34e84cf1a95..d6a5b0eb415 100644 --- a/vsintegration/src/FSharp.Editor/CodeFix/RenameUnusedValue.fs +++ b/vsintegration/src/FSharp.Editor/CodeFix/RenameUnusedValue.fs @@ -12,8 +12,8 @@ open Microsoft.CodeAnalysis.Text open Microsoft.CodeAnalysis.CodeFixes open Microsoft.CodeAnalysis.CodeActions -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices [] type internal FSharpRenameUnusedValueCodeFixProvider diff --git a/vsintegration/src/FSharp.Editor/CodeFix/ReplaceWithSuggestion.fs b/vsintegration/src/FSharp.Editor/CodeFix/ReplaceWithSuggestion.fs index 7a8ed66f332..1f586d6195a 100644 --- a/vsintegration/src/FSharp.Editor/CodeFix/ReplaceWithSuggestion.fs +++ b/vsintegration/src/FSharp.Editor/CodeFix/ReplaceWithSuggestion.fs @@ -11,7 +11,7 @@ open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.Text open Microsoft.CodeAnalysis.CodeFixes open SymbolHelpers -open Microsoft.FSharp.Compiler.SourceCodeServices.Keywords +open FSharp.Compiler.SourceCodeServices.Keywords [] type internal FSharpReplaceWithSuggestionCodeFixProvider() = diff --git a/vsintegration/src/FSharp.Editor/CodeLens/FSharpCodeLensService.fs b/vsintegration/src/FSharp.Editor/CodeLens/FSharpCodeLensService.fs index 902de15332a..1feaad48354 100644 --- a/vsintegration/src/FSharp.Editor/CodeLens/FSharpCodeLensService.fs +++ b/vsintegration/src/FSharp.Editor/CodeLens/FSharpCodeLensService.fs @@ -16,10 +16,10 @@ open Microsoft.CodeAnalysis.Editor.Shared.Extensions open Microsoft.CodeAnalysis.Editor.Shared.Utilities open Microsoft.CodeAnalysis.Classification -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler +open FSharp.Compiler.Ast +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Range open Microsoft.VisualStudio.FSharp.Editor.Logging diff --git a/vsintegration/src/FSharp.Editor/Commands/HelpContextService.fs b/vsintegration/src/FSharp.Editor/Commands/HelpContextService.fs index d2cf393cd77..9c60982210e 100644 --- a/vsintegration/src/FSharp.Editor/Commands/HelpContextService.fs +++ b/vsintegration/src/FSharp.Editor/Commands/HelpContextService.fs @@ -9,9 +9,9 @@ open Microsoft.CodeAnalysis.Text open Microsoft.CodeAnalysis.Classification open Microsoft.VisualStudio.LanguageServices.Implementation.F1Help open Microsoft.CodeAnalysis.Host.Mef -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices [] [, FSharpConstants.FSharpLanguageName)>] diff --git a/vsintegration/src/FSharp.Editor/Commands/XmlDocCommandService.fs b/vsintegration/src/FSharp.Editor/Commands/XmlDocCommandService.fs index db9bf16ae2f..cd6e0879bc5 100644 --- a/vsintegration/src/FSharp.Editor/Commands/XmlDocCommandService.fs +++ b/vsintegration/src/FSharp.Editor/Commands/XmlDocCommandService.fs @@ -14,7 +14,7 @@ open Microsoft.VisualStudio.Text.Editor open Microsoft.VisualStudio.TextManager.Interop open Microsoft.VisualStudio.Utilities open Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices type internal XmlDocCommandFilter ( diff --git a/vsintegration/src/FSharp.Editor/Common/CodeAnalysisExtensions.fs b/vsintegration/src/FSharp.Editor/Common/CodeAnalysisExtensions.fs index f75bb4020c9..fb69b161093 100644 --- a/vsintegration/src/FSharp.Editor/Common/CodeAnalysisExtensions.fs +++ b/vsintegration/src/FSharp.Editor/Common/CodeAnalysisExtensions.fs @@ -2,7 +2,7 @@ module internal Microsoft.VisualStudio.FSharp.Editor.CodeAnalysisExtensions open Microsoft.CodeAnalysis -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.Range open System.IO type Project with diff --git a/vsintegration/src/FSharp.Editor/Common/Extensions.fs b/vsintegration/src/FSharp.Editor/Common/Extensions.fs index d1de7e83508..ef56215cf41 100644 --- a/vsintegration/src/FSharp.Editor/Common/Extensions.fs +++ b/vsintegration/src/FSharp.Editor/Common/Extensions.fs @@ -7,8 +7,8 @@ open System open System.IO open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.Host -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Ast +open FSharp.Compiler.SourceCodeServices type Path with diff --git a/vsintegration/src/FSharp.Editor/Common/RoslynHelpers.fs b/vsintegration/src/FSharp.Editor/Common/RoslynHelpers.fs index a3d499da0c8..38d1214267d 100644 --- a/vsintegration/src/FSharp.Editor/Common/RoslynHelpers.fs +++ b/vsintegration/src/FSharp.Editor/Common/RoslynHelpers.fs @@ -10,10 +10,10 @@ open System.Threading.Tasks open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.Text open Microsoft.CodeAnalysis.Diagnostics -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Layout -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler +open FSharp.Compiler.Layout +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Range open Microsoft.VisualStudio.FSharp.Editor.Logging [] diff --git a/vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs b/vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs index d24df1fd819..8980084f5c3 100644 --- a/vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs +++ b/vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs @@ -17,9 +17,9 @@ open Microsoft.CodeAnalysis.Text open Microsoft.VisualStudio.Shell open Microsoft.VisualStudio.Shell.Interop -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices open System.Runtime.Caching open System.Collections.Concurrent diff --git a/vsintegration/src/FSharp.Editor/Completion/CompletionUtils.fs b/vsintegration/src/FSharp.Editor/Completion/CompletionUtils.fs index 705128a3e19..6691640c4fd 100644 --- a/vsintegration/src/FSharp.Editor/Completion/CompletionUtils.fs +++ b/vsintegration/src/FSharp.Editor/Completion/CompletionUtils.fs @@ -9,7 +9,7 @@ open Microsoft.CodeAnalysis.Classification open Microsoft.CodeAnalysis.Text open Microsoft.CodeAnalysis.Completion open System.Globalization -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices module internal CompletionUtils = diff --git a/vsintegration/src/FSharp.Editor/Completion/SignatureHelp.fs b/vsintegration/src/FSharp.Editor/Completion/SignatureHelp.fs index e60da6de129..8dd6b4c5a02 100644 --- a/vsintegration/src/FSharp.Editor/Completion/SignatureHelp.fs +++ b/vsintegration/src/FSharp.Editor/Completion/SignatureHelp.fs @@ -14,9 +14,9 @@ open Microsoft.VisualStudio.Text open Microsoft.VisualStudio.Shell open Microsoft.VisualStudio.Shell.Interop -open Microsoft.FSharp.Compiler.Layout -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Layout +open FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices [] [] diff --git a/vsintegration/src/FSharp.Editor/Debugging/BreakpointResolutionService.fs b/vsintegration/src/FSharp.Editor/Debugging/BreakpointResolutionService.fs index 97bf920d70a..424a3c1904a 100644 --- a/vsintegration/src/FSharp.Editor/Debugging/BreakpointResolutionService.fs +++ b/vsintegration/src/FSharp.Editor/Debugging/BreakpointResolutionService.fs @@ -14,8 +14,8 @@ open Microsoft.CodeAnalysis.Editor.Implementation.Debugging open Microsoft.CodeAnalysis.Host.Mef open Microsoft.CodeAnalysis.Text -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Range [] [, FSharpConstants.FSharpLanguageName)>] diff --git a/vsintegration/src/FSharp.Editor/Debugging/LanguageDebugInfoService.fs b/vsintegration/src/FSharp.Editor/Debugging/LanguageDebugInfoService.fs index a6347732631..62ee7cac945 100644 --- a/vsintegration/src/FSharp.Editor/Debugging/LanguageDebugInfoService.fs +++ b/vsintegration/src/FSharp.Editor/Debugging/LanguageDebugInfoService.fs @@ -14,7 +14,7 @@ open Microsoft.CodeAnalysis.Editor.Implementation.Debugging open Microsoft.CodeAnalysis.Host.Mef open Microsoft.CodeAnalysis.Text -open Microsoft.FSharp.Compiler +open FSharp.Compiler [] [, FSharpConstants.FSharpLanguageName)>] diff --git a/vsintegration/src/FSharp.Editor/Diagnostics/DocumentDiagnosticAnalyzer.fs b/vsintegration/src/FSharp.Editor/Diagnostics/DocumentDiagnosticAnalyzer.fs index a9448760200..2de46831c9c 100644 --- a/vsintegration/src/FSharp.Editor/Diagnostics/DocumentDiagnosticAnalyzer.fs +++ b/vsintegration/src/FSharp.Editor/Diagnostics/DocumentDiagnosticAnalyzer.fs @@ -12,8 +12,8 @@ open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.Diagnostics open Microsoft.CodeAnalysis.Text -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices [] diff --git a/vsintegration/src/FSharp.Editor/Diagnostics/ProjectDiagnosticAnalyzer.fs b/vsintegration/src/FSharp.Editor/Diagnostics/ProjectDiagnosticAnalyzer.fs index 7861df8e562..9b67e11819f 100644 --- a/vsintegration/src/FSharp.Editor/Diagnostics/ProjectDiagnosticAnalyzer.fs +++ b/vsintegration/src/FSharp.Editor/Diagnostics/ProjectDiagnosticAnalyzer.fs @@ -15,9 +15,9 @@ open Microsoft.CodeAnalysis.Host.Mef open Microsoft.CodeAnalysis.Text open Microsoft.CodeAnalysis.SolutionCrawler -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Range #if PROJECT_ANALYSIS // Project-wide error analysis. We don't enable this because ParseAndCheckProject checks projects against the versions of the files diff --git a/vsintegration/src/FSharp.Editor/Diagnostics/SimplifyNameDiagnosticAnalyzer.fs b/vsintegration/src/FSharp.Editor/Diagnostics/SimplifyNameDiagnosticAnalyzer.fs index 7e3f8e39ce0..72f9f190b68 100644 --- a/vsintegration/src/FSharp.Editor/Diagnostics/SimplifyNameDiagnosticAnalyzer.fs +++ b/vsintegration/src/FSharp.Editor/Diagnostics/SimplifyNameDiagnosticAnalyzer.fs @@ -11,9 +11,9 @@ open System.Runtime.CompilerServices open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.Diagnostics -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices open System.Runtime.Caching type private TextVersionHash = int diff --git a/vsintegration/src/FSharp.Editor/Diagnostics/UnusedDeclarationsAnalyzer.fs b/vsintegration/src/FSharp.Editor/Diagnostics/UnusedDeclarationsAnalyzer.fs index 355cb0606e6..9e85469a804 100644 --- a/vsintegration/src/FSharp.Editor/Diagnostics/UnusedDeclarationsAnalyzer.fs +++ b/vsintegration/src/FSharp.Editor/Diagnostics/UnusedDeclarationsAnalyzer.fs @@ -10,7 +10,7 @@ open System.Threading.Tasks open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.Diagnostics -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices [] type internal UnusedDeclarationsAnalyzer() = @@ -70,7 +70,7 @@ type internal UnusedDeclarationsAnalyzer() = |> Array.map (fun (m, _) -> m) //#if DEBUG - //let formatRange (x: Microsoft.FSharp.Compiler.Range.range) = sprintf "(%d, %d) - (%d, %d)" x.StartLine x.StartColumn x.EndLine x.EndColumn + //let formatRange (x: FSharp.Compiler.Range.range) = sprintf "(%d, %d) - (%d, %d)" x.StartLine x.StartColumn x.EndLine x.EndColumn //symbolsUses //|> Array.map (fun su -> sprintf "%s, %s, is definition = %b, Symbol (def range = %A)" diff --git a/vsintegration/src/FSharp.Editor/Diagnostics/UnusedOpensDiagnosticAnalyzer.fs b/vsintegration/src/FSharp.Editor/Diagnostics/UnusedOpensDiagnosticAnalyzer.fs index f39b6bb3662..0262ec9b0b0 100644 --- a/vsintegration/src/FSharp.Editor/Diagnostics/UnusedOpensDiagnosticAnalyzer.fs +++ b/vsintegration/src/FSharp.Editor/Diagnostics/UnusedOpensDiagnosticAnalyzer.fs @@ -11,10 +11,10 @@ open System.Threading.Tasks open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.Text open Microsoft.CodeAnalysis.Diagnostics -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.Ast +open FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices open Microsoft.VisualStudio.FSharp.Editor.Symbols [] diff --git a/vsintegration/src/FSharp.Editor/DocComments/XMLDocumentation.fs b/vsintegration/src/FSharp.Editor/DocComments/XMLDocumentation.fs index e3ccc17f674..d675803a4d4 100644 --- a/vsintegration/src/FSharp.Editor/DocComments/XMLDocumentation.fs +++ b/vsintegration/src/FSharp.Editor/DocComments/XMLDocumentation.fs @@ -9,9 +9,9 @@ open System.Text.RegularExpressions open Internal.Utilities.Collections open Microsoft.VisualStudio.Shell open Microsoft.VisualStudio.Shell.Interop -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Layout -open Microsoft.FSharp.Compiler.Layout.TaggedTextOps +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Layout +open FSharp.Compiler.Layout.TaggedTextOps type internal ITaggedTextCollector = abstract Add: text: TaggedText -> unit diff --git a/vsintegration/src/FSharp.Editor/DocumentHighlights/DocumentHighlightsService.fs b/vsintegration/src/FSharp.Editor/DocumentHighlights/DocumentHighlightsService.fs index 1e53c218d9c..d1ca526e6d2 100644 --- a/vsintegration/src/FSharp.Editor/DocumentHighlights/DocumentHighlightsService.fs +++ b/vsintegration/src/FSharp.Editor/DocumentHighlights/DocumentHighlightsService.fs @@ -12,8 +12,8 @@ open Microsoft.CodeAnalysis.DocumentHighlighting open Microsoft.CodeAnalysis.Host.Mef open Microsoft.CodeAnalysis.Text -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Range type internal FSharpHighlightSpan = { IsDefinition: bool diff --git a/vsintegration/src/FSharp.Editor/Formatting/BraceMatchingService.fs b/vsintegration/src/FSharp.Editor/Formatting/BraceMatchingService.fs index 511988985a0..10e2b0e76c6 100644 --- a/vsintegration/src/FSharp.Editor/Formatting/BraceMatchingService.fs +++ b/vsintegration/src/FSharp.Editor/Formatting/BraceMatchingService.fs @@ -4,7 +4,7 @@ namespace Microsoft.VisualStudio.FSharp.Editor open System.ComponentModel.Composition open Microsoft.CodeAnalysis.Editor -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices open System.Runtime.InteropServices [] diff --git a/vsintegration/src/FSharp.Editor/Formatting/EditorFormattingService.fs b/vsintegration/src/FSharp.Editor/Formatting/EditorFormattingService.fs index 5fff337649b..07d28efd076 100644 --- a/vsintegration/src/FSharp.Editor/Formatting/EditorFormattingService.fs +++ b/vsintegration/src/FSharp.Editor/Formatting/EditorFormattingService.fs @@ -11,7 +11,7 @@ open Microsoft.CodeAnalysis.Formatting open Microsoft.CodeAnalysis.Host.Mef open Microsoft.CodeAnalysis.Text -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices open System.Threading open System.Windows.Forms diff --git a/vsintegration/src/FSharp.Editor/Formatting/IndentationService.fs b/vsintegration/src/FSharp.Editor/Formatting/IndentationService.fs index 20acd00c462..1ae841ac049 100644 --- a/vsintegration/src/FSharp.Editor/Formatting/IndentationService.fs +++ b/vsintegration/src/FSharp.Editor/Formatting/IndentationService.fs @@ -12,7 +12,7 @@ open Microsoft.CodeAnalysis.Formatting open Microsoft.CodeAnalysis.Host.Mef open Microsoft.CodeAnalysis.Text -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices [] [, FSharpConstants.FSharpLanguageName)>] diff --git a/vsintegration/src/FSharp.Editor/InlineRename/InlineRenameService.fs b/vsintegration/src/FSharp.Editor/InlineRename/InlineRenameService.fs index 17e06aa144f..ebee12decd3 100644 --- a/vsintegration/src/FSharp.Editor/InlineRename/InlineRenameService.fs +++ b/vsintegration/src/FSharp.Editor/InlineRename/InlineRenameService.fs @@ -13,9 +13,9 @@ open Microsoft.CodeAnalysis.Editor open Microsoft.CodeAnalysis.Host.Mef open Microsoft.CodeAnalysis.Text -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices open Symbols type internal FailureInlineRenameInfo private () = diff --git a/vsintegration/src/FSharp.Editor/LanguageService/AssemblyContentProvider.fs b/vsintegration/src/FSharp.Editor/LanguageService/AssemblyContentProvider.fs index efe07a7f01a..d6777df4720 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/AssemblyContentProvider.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/AssemblyContentProvider.fs @@ -5,7 +5,7 @@ namespace Microsoft.VisualStudio.FSharp.Editor open System open System.ComponentModel.Composition -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices [); Composition.Shared>] type internal AssemblyContentProvider () = diff --git a/vsintegration/src/FSharp.Editor/LanguageService/FSharpCheckerExtensions.fs b/vsintegration/src/FSharp.Editor/LanguageService/FSharpCheckerExtensions.fs index c191dee6fb9..cae5473fb35 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/FSharpCheckerExtensions.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/FSharpCheckerExtensions.fs @@ -5,9 +5,9 @@ open System open System.Threading.Tasks open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.Text -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.Ast +open FSharp.Compiler.SourceCodeServices type FSharpChecker with member checker.ParseDocument(document: Document, parsingOptions: FSharpParsingOptions, sourceText: string, userOpName: string) = diff --git a/vsintegration/src/FSharp.Editor/LanguageService/FSharpCheckerProvider.fs b/vsintegration/src/FSharp.Editor/LanguageService/FSharpCheckerProvider.fs index f8ffa8dae32..b0af16b99f7 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/FSharpCheckerProvider.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/FSharpCheckerProvider.fs @@ -7,7 +7,7 @@ open System.ComponentModel.Composition open System.Diagnostics open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.Diagnostics -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices open Microsoft.VisualStudio open Microsoft.VisualStudio.FSharp.Editor open Microsoft.VisualStudio.LanguageServices @@ -42,7 +42,7 @@ type internal FSharpCheckerProvider let objToHold = box md // We don't expect any ilread WeakByteFile to be created when working in Visual Studio - Debug.Assert((Microsoft.FSharp.Compiler.AbstractIL.ILBinaryReader.GetStatistics().weakByteFileCount = 0), "Expected weakByteFileCount to be zero when using F# in Visual Studio. Was there a problem reading a .NET binary?") + Debug.Assert((FSharp.Compiler.AbstractIL.ILBinaryReader.GetStatistics().weakByteFileCount = 0), "Expected weakByteFileCount to be zero when using F# in Visual Studio. Was there a problem reading a .NET binary?") Some (objToHold, NativePtr.toNativeInt mmr.MetadataPointer, mmr.MetadataLength) with ex -> @@ -59,7 +59,7 @@ type internal FSharpCheckerProvider keepAllBackgroundResolutions = false, // Enabling this would mean that if devenv.exe goes above 2.3GB we do a one-off downsize of the F# Compiler Service caches (* , MaxMemory = 2300 *) - legacyReferenceResolver=Microsoft.FSharp.Compiler.MSBuildReferenceResolver.Resolver, + legacyReferenceResolver=FSharp.Compiler.MSBuildReferenceResolver.Resolver, tryGetMetadataSnapshot = tryGetMetadataSnapshot) // This is one half of the bridge between the F# background builder and the Roslyn analysis engine. diff --git a/vsintegration/src/FSharp.Editor/LanguageService/FSharpProjectOptionsManager.fs b/vsintegration/src/FSharp.Editor/LanguageService/FSharpProjectOptionsManager.fs index 007ca3fbe18..99b9b79601d 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/FSharpProjectOptionsManager.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/FSharpProjectOptionsManager.fs @@ -9,8 +9,8 @@ open System.ComponentModel.Composition open System.IO open System.Linq open Microsoft.CodeAnalysis -open Microsoft.FSharp.Compiler.CompileOps -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.CompileOps +open FSharp.Compiler.SourceCodeServices open Microsoft.VisualStudio open Microsoft.VisualStudio.FSharp.Editor open Microsoft.VisualStudio.FSharp.Editor.SiteProvider diff --git a/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs b/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs index 0621b0fd9b4..257469ca375 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs @@ -20,8 +20,8 @@ open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.Diagnostics open Microsoft.CodeAnalysis.Completion open Microsoft.CodeAnalysis.Options -open Microsoft.FSharp.Compiler.CompileOps -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.CompileOps +open FSharp.Compiler.SourceCodeServices open Microsoft.VisualStudio open Microsoft.VisualStudio.Editor open Microsoft.VisualStudio.FSharp.Editor diff --git a/vsintegration/src/FSharp.Editor/LanguageService/ProjectSitesAndFiles.fs b/vsintegration/src/FSharp.Editor/LanguageService/ProjectSitesAndFiles.fs index e9ce1769584..da362b7d6ae 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/ProjectSitesAndFiles.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/ProjectSitesAndFiles.fs @@ -7,7 +7,7 @@ open System.IO open System.Collections.Concurrent open System.Diagnostics -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices open Microsoft.CodeAnalysis open Microsoft.VisualStudio open Microsoft.VisualStudio.LanguageServices diff --git a/vsintegration/src/FSharp.Editor/LanguageService/SymbolHelpers.fs b/vsintegration/src/FSharp.Editor/LanguageService/SymbolHelpers.fs index 5bddff6417f..a186cec7024 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/SymbolHelpers.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/SymbolHelpers.fs @@ -11,8 +11,8 @@ open System.Threading.Tasks open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.Text -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices open Microsoft.VisualStudio.FSharp.Editor.Symbols diff --git a/vsintegration/src/FSharp.Editor/LanguageService/Symbols.fs b/vsintegration/src/FSharp.Editor/LanguageService/Symbols.fs index 7ece4c858c3..a3d9b784526 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/Symbols.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/Symbols.fs @@ -11,9 +11,9 @@ open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.Classification open Microsoft.CodeAnalysis.Text -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.Ast +open FSharp.Compiler.SourceCodeServices open System.IO diff --git a/vsintegration/src/FSharp.Editor/LanguageService/Tokenizer.fs b/vsintegration/src/FSharp.Editor/LanguageService/Tokenizer.fs index c131374ece0..66a3a22a63c 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/Tokenizer.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/Tokenizer.fs @@ -13,9 +13,9 @@ open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.Classification open Microsoft.CodeAnalysis.Text -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Ast -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.Ast +open FSharp.Compiler.SourceCodeServices open Microsoft.VisualStudio.Core.Imaging open Microsoft.VisualStudio.Imaging diff --git a/vsintegration/src/FSharp.Editor/Navigation/FindUsagesService.fs b/vsintegration/src/FSharp.Editor/Navigation/FindUsagesService.fs index df0bff060c5..aed008a26bf 100644 --- a/vsintegration/src/FSharp.Editor/Navigation/FindUsagesService.fs +++ b/vsintegration/src/FSharp.Editor/Navigation/FindUsagesService.fs @@ -12,8 +12,8 @@ open Microsoft.CodeAnalysis.Host.Mef open Microsoft.CodeAnalysis.Editor.FindUsages open Microsoft.CodeAnalysis.FindUsages -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices [, FSharpConstants.FSharpLanguageName); Shared>] type internal FSharpFindUsagesService diff --git a/vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs b/vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs index 7cd0152c3dc..0c652420bbc 100644 --- a/vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs +++ b/vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs @@ -17,8 +17,8 @@ open Microsoft.CodeAnalysis.Navigation open Microsoft.VisualStudio.Shell.Interop -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices module private Symbol = let fullName (root: ISymbol) : string = diff --git a/vsintegration/src/FSharp.Editor/Navigation/NavigateToSearchService.fs b/vsintegration/src/FSharp.Editor/Navigation/NavigateToSearchService.fs index ad3f894b730..eabf6677b93 100644 --- a/vsintegration/src/FSharp.Editor/Navigation/NavigateToSearchService.fs +++ b/vsintegration/src/FSharp.Editor/Navigation/NavigateToSearchService.fs @@ -20,8 +20,8 @@ open Microsoft.CodeAnalysis.NavigateTo open Microsoft.CodeAnalysis.Navigation open Microsoft.CodeAnalysis.PatternMatching -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices type internal NavigableItem(document: Document, sourceSpan: TextSpan, glyph: Glyph, name: string, kind: string, additionalInfo: string) = interface INavigableItem with diff --git a/vsintegration/src/FSharp.Editor/Navigation/NavigationBarItemService.fs b/vsintegration/src/FSharp.Editor/Navigation/NavigationBarItemService.fs index 34fad074bac..c8c3aff6b0b 100644 --- a/vsintegration/src/FSharp.Editor/Navigation/NavigationBarItemService.fs +++ b/vsintegration/src/FSharp.Editor/Navigation/NavigationBarItemService.fs @@ -13,7 +13,7 @@ open Microsoft.CodeAnalysis.Host.Mef open Microsoft.CodeAnalysis.Text open Microsoft.CodeAnalysis.Notification -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices type internal NavigationBarSymbolItem(text, glyph, spans, childItems) = inherit NavigationBarItem(text, glyph, spans, childItems) diff --git a/vsintegration/src/FSharp.Editor/QuickInfo/Navigation.fs b/vsintegration/src/FSharp.Editor/QuickInfo/Navigation.fs index 09e5d305501..63a5041f3ea 100644 --- a/vsintegration/src/FSharp.Editor/QuickInfo/Navigation.fs +++ b/vsintegration/src/FSharp.Editor/QuickInfo/Navigation.fs @@ -6,9 +6,9 @@ open System open Microsoft.CodeAnalysis -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.Range open Microsoft.VisualStudio.Shell.Interop type internal QuickInfoNavigation diff --git a/vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs b/vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs index d612ecc7432..5712af54fb8 100644 --- a/vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs +++ b/vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs @@ -17,9 +17,9 @@ open Microsoft.VisualStudio.Shell.Interop open Microsoft.VisualStudio.Text open Microsoft.VisualStudio.Utilities -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Range +open FSharp.Compiler open Internal.Utilities.StructuredFormat diff --git a/vsintegration/src/FSharp.Editor/QuickInfo/Views.fs b/vsintegration/src/FSharp.Editor/QuickInfo/Views.fs index b611ddb88c4..124008420fb 100644 --- a/vsintegration/src/FSharp.Editor/QuickInfo/Views.fs +++ b/vsintegration/src/FSharp.Editor/QuickInfo/Views.fs @@ -5,7 +5,7 @@ namespace Microsoft.VisualStudio.FSharp.Editor open System.Collections.Generic open Internal.Utilities.StructuredFormat open Microsoft.CodeAnalysis.Classification -open Microsoft.FSharp.Compiler +open FSharp.Compiler open Microsoft.VisualStudio.Core.Imaging open Microsoft.VisualStudio.Language.StandardClassification open Microsoft.VisualStudio.Text.Adornments diff --git a/vsintegration/src/FSharp.Editor/Structure/BlockStructureService.fs b/vsintegration/src/FSharp.Editor/Structure/BlockStructureService.fs index af3341351a6..c8ff1c83e01 100644 --- a/vsintegration/src/FSharp.Editor/Structure/BlockStructureService.fs +++ b/vsintegration/src/FSharp.Editor/Structure/BlockStructureService.fs @@ -11,9 +11,9 @@ open Microsoft.CodeAnalysis.Host.Mef open Microsoft.CodeAnalysis.Text open Microsoft.CodeAnalysis.Structure -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.SourceCodeServices.Structure +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices.Structure module internal BlockStructure = let scopeToBlockType = function diff --git a/vsintegration/src/FSharp.LanguageService/BackgroundRequests.fs b/vsintegration/src/FSharp.LanguageService/BackgroundRequests.fs index 42c673d90b7..d507b58b143 100644 --- a/vsintegration/src/FSharp.LanguageService/BackgroundRequests.fs +++ b/vsintegration/src/FSharp.LanguageService/BackgroundRequests.fs @@ -9,7 +9,7 @@ namespace Microsoft.VisualStudio.FSharp.LanguageService open System open Microsoft.VisualStudio.TextManager.Interop open Microsoft.VisualStudio.Text -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices open Microsoft.VisualStudio.FSharp.LanguageService.SiteProvider diff --git a/vsintegration/src/FSharp.LanguageService/Colorize.fs b/vsintegration/src/FSharp.LanguageService/Colorize.fs index 1f292c7c92a..65fe7bbd5a4 100644 --- a/vsintegration/src/FSharp.LanguageService/Colorize.fs +++ b/vsintegration/src/FSharp.LanguageService/Colorize.fs @@ -13,9 +13,9 @@ open Microsoft.VisualStudio.FSharp.LanguageService open Microsoft.VisualStudio.TextManager.Interop open Microsoft.VisualStudio open Microsoft.VisualStudio.Text -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices #nowarn "45" // This method will be made public in the underlying IL because it may implement an interface or override a method diff --git a/vsintegration/src/FSharp.LanguageService/FSharpSource.fs b/vsintegration/src/FSharp.LanguageService/FSharpSource.fs index 3146f5d0ba1..d5313b1ac31 100644 --- a/vsintegration/src/FSharp.LanguageService/FSharpSource.fs +++ b/vsintegration/src/FSharp.LanguageService/FSharpSource.fs @@ -20,8 +20,8 @@ open Microsoft.VisualStudio.Text.Editor open Microsoft.VisualStudio.Text.Formatting open Microsoft.VisualStudio.TextManager.Interop open Microsoft.VisualStudio.OLE.Interop -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices #nowarn "45" // This method will be made public in the underlying IL because it may implement an interface or override a method @@ -445,7 +445,7 @@ type internal FSharpSource_DEPRECATED(service:LanguageService_DEPRECATED, textLi if reason = BackgroundRequestReason.CompleteWord then let upi = source.GetParseTree() let isBetweenDotAndIdent = - match Microsoft.FSharp.Compiler.SourceCodeServices.UntypedParseImpl.TryFindExpressionASTLeftOfDotLeftOfCursor(Range.Pos.fromZ !line !idx, upi.ParseTree) with + match FSharp.Compiler.SourceCodeServices.UntypedParseImpl.TryFindExpressionASTLeftOfDotLeftOfCursor(Range.Pos.fromZ !line !idx, upi.ParseTree) with | Some(_,isBetweenDotAndIdent) -> isBetweenDotAndIdent | None -> false if isBetweenDotAndIdent then diff --git a/vsintegration/src/FSharp.LanguageService/GotoDefinition.fs b/vsintegration/src/FSharp.LanguageService/GotoDefinition.fs index c92721ea1c4..ca720f0927f 100644 --- a/vsintegration/src/FSharp.LanguageService/GotoDefinition.fs +++ b/vsintegration/src/FSharp.LanguageService/GotoDefinition.fs @@ -12,16 +12,16 @@ open Microsoft.VisualStudio open Microsoft.VisualStudio.Shell open Microsoft.VisualStudio.Shell.Interop open Microsoft.VisualStudio.TextManager.Interop -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Lib -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.Lib +open FSharp.Compiler.SourceCodeServices module internal OperatorToken = let asIdentifier_DEPRECATED (token : TokenInfo) = // Typechecker reports information about all values in the same fashion no matter whether it is named value (let binding) or operator // here we piggyback on this fact and just pretend that we need data time for identifier - let tagOfIdentToken = Microsoft.FSharp.Compiler.Parser.tagOfToken(Microsoft.FSharp.Compiler.Parser.IDENT "") + let tagOfIdentToken = FSharp.Compiler.Parser.tagOfToken(FSharp.Compiler.Parser.IDENT "") let endCol = token.EndIndex + 1 // EndIndex from GetTokenInfoAt points to the last operator char, but here it should point to column 'after' the last char tagOfIdentToken, token.StartIndex, endCol diff --git a/vsintegration/src/FSharp.LanguageService/Intellisense.fs b/vsintegration/src/FSharp.LanguageService/Intellisense.fs index 2a5fa9e6ebf..b380bf13e20 100644 --- a/vsintegration/src/FSharp.LanguageService/Intellisense.fs +++ b/vsintegration/src/FSharp.LanguageService/Intellisense.fs @@ -13,9 +13,9 @@ open Microsoft.VisualStudio.Shell.Interop open Microsoft.VisualStudio.TextManager.Interop open Microsoft.VisualStudio.Text open Microsoft.VisualStudio.OLE.Interop -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.Range -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices module internal TaggedText = @@ -224,7 +224,7 @@ type internal FSharpDeclarations_DEPRECATED(documentationBuilder, declarations: // We intercept this call only to get the initial extent // of what was committed to the source buffer. let result = decl.GetName(filterText, index) - Microsoft.FSharp.Compiler.Lexhelp.Keywords.QuoteIdentifierIfNeeded result + FSharp.Compiler.Lexhelp.Keywords.QuoteIdentifierIfNeeded result override decl.IsCommitChar(commitCharacter) = // Usual language identifier rules... diff --git a/vsintegration/src/FSharp.LanguageService/ProjectSitesAndFiles.fs b/vsintegration/src/FSharp.LanguageService/ProjectSitesAndFiles.fs index bf82290b2ec..9909aaefa57 100644 --- a/vsintegration/src/FSharp.LanguageService/ProjectSitesAndFiles.fs +++ b/vsintegration/src/FSharp.LanguageService/ProjectSitesAndFiles.fs @@ -40,7 +40,7 @@ open System.Diagnostics open Microsoft.VisualStudio open Microsoft.VisualStudio.TextManager.Interop open Microsoft.VisualStudio.Shell.Interop -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices open Microsoft.CodeAnalysis open Microsoft.VisualStudio.LanguageServices diff --git a/vsintegration/src/FSharp.LanguageService/SourceFile.fs b/vsintegration/src/FSharp.LanguageService/SourceFile.fs index cd7b534e7fc..bca65a2fe04 100644 --- a/vsintegration/src/FSharp.LanguageService/SourceFile.fs +++ b/vsintegration/src/FSharp.LanguageService/SourceFile.fs @@ -4,10 +4,10 @@ //------- DEPRECATED CODE ONLY ACTIVE IN UNIT TESTING VIA "UNROSLYNIZED" UNIT TESTS --------------- -namespace Microsoft.FSharp.Compiler.VsLanguageService +namespace FSharp.Compiler.VsLanguageService open System open System.IO -open Microsoft.FSharp.Compiler +open FSharp.Compiler /// Methods for dealing with F# sources files. module (*internal*) SourceFile = diff --git a/vsintegration/src/FSharp.LanguageService/Vs.fs b/vsintegration/src/FSharp.LanguageService/Vs.fs index 27a8c559f0d..5ce30d677bd 100644 --- a/vsintegration/src/FSharp.LanguageService/Vs.fs +++ b/vsintegration/src/FSharp.LanguageService/Vs.fs @@ -14,7 +14,7 @@ open Microsoft.VisualStudio.Shell.Interop open Microsoft.VisualStudio.Text open Microsoft.VisualStudio.TextManager.Interop open Microsoft.VisualStudio.OLE.Interop -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.Range open System.Runtime.InteropServices /// Helper methods for interoperating with COM diff --git a/vsintegration/src/FSharp.LanguageService/XmlDocumentation.fs b/vsintegration/src/FSharp.LanguageService/XmlDocumentation.fs index 0eea1b2a813..9ecbd65e9fa 100644 --- a/vsintegration/src/FSharp.LanguageService/XmlDocumentation.fs +++ b/vsintegration/src/FSharp.LanguageService/XmlDocumentation.fs @@ -7,9 +7,9 @@ namespace Microsoft.VisualStudio.FSharp.LanguageService open System open System.Text.RegularExpressions -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Layout -open Microsoft.FSharp.Compiler.Layout.TaggedTextOps +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Layout +open FSharp.Compiler.Layout.TaggedTextOps type internal ITaggedTextCollector_DEPRECATED = abstract Add: text: TaggedText -> unit @@ -148,7 +148,7 @@ module internal XmlDocumentation = addSeparatorIfNecessary add if showText then let AppendOverload (item :FSharpToolTipElementData<_>) = - if not(Microsoft.FSharp.Compiler.Layout.isEmptyL item.MainDescription) then + if not(FSharp.Compiler.Layout.isEmptyL item.MainDescription) then if not textCollector.IsEmpty then textCollector.Add Literals.lineBreak renderL (taggedTextListR textCollector.Add) item.MainDescription |> ignore diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/FileNode.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/FileNode.cs index 3162d48cc91..97f9616ee88 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/FileNode.cs +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/FileNode.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -using FSLib = Microsoft.FSharp.Compiler.AbstractIL.Internal.Library; +using FSLib = FSharp.Compiler.AbstractIL.Internal.Library; using System; using System.Runtime.InteropServices; using System.Collections; diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/FolderNode.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/FolderNode.cs index b11a77912e4..f62c2530bfa 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/FolderNode.cs +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/FolderNode.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -using FSLib = Microsoft.FSharp.Compiler.AbstractIL.Internal.Library; +using FSLib = FSharp.Compiler.AbstractIL.Internal.Library; using System; using System.Runtime.InteropServices; using System.Collections; diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/HierarchyNode.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/HierarchyNode.cs index f26be0429f0..b17a2cdfc00 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/HierarchyNode.cs +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/HierarchyNode.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -using FSLib = Microsoft.FSharp.Compiler.AbstractIL.Internal.Library; +using FSLib = FSharp.Compiler.AbstractIL.Internal.Library; using Microsoft.VisualStudio.Shell.Interop; using System; using System.Collections.Generic; diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/IDEBuildLogger.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/IDEBuildLogger.cs index edb1883ff8e..70b6cf6efaa 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/IDEBuildLogger.cs +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/IDEBuildLogger.cs @@ -310,7 +310,7 @@ private void AddToErrorList( } // Add error to task list - var taskText = Microsoft.FSharp.Compiler.ErrorLogger.NewlineifyErrorString(errorEvent.Message); + var taskText = global::FSharp.Compiler.ErrorLogger.NewlineifyErrorString(errorEvent.Message); if (errorReporter != null) { diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectNode.CopyPaste.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectNode.CopyPaste.cs index 902497162bd..238c2a715ca 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectNode.CopyPaste.cs +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectNode.CopyPaste.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -using FSLib = Microsoft.FSharp.Compiler.AbstractIL.Internal.Library; +using FSLib = FSharp.Compiler.AbstractIL.Internal.Library; using System; using System.Collections; using System.Collections.Generic; diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectNode.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectNode.cs index bd4bca01be8..79091e1fe6a 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectNode.cs +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectNode.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -using FSLib = Microsoft.FSharp.Compiler.AbstractIL.Internal.Library; +using FSLib = FSharp.Compiler.AbstractIL.Internal.Library; using System; using System.CodeDom.Compiler; using System.Collections; diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectReferenceNode.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectReferenceNode.cs index e843985a16b..eddc77f41c8 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectReferenceNode.cs +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectReferenceNode.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -using FSLib = Microsoft.FSharp.Compiler.AbstractIL.Internal.Library; +using FSLib = FSharp.Compiler.AbstractIL.Internal.Library; using System; using System.Runtime.InteropServices; using System.Collections.Generic; diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ReferenceNode.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ReferenceNode.cs index 2604897ec30..bf284ad98d5 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ReferenceNode.cs +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ReferenceNode.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -using FSLib = Microsoft.FSharp.Compiler.AbstractIL.Internal.Library; +using FSLib = FSharp.Compiler.AbstractIL.Internal.Library; using System; using System.Runtime.InteropServices; using System.Collections; diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/Project.fs b/vsintegration/src/FSharp.ProjectSystem.FSharp/Project.fs index d33ea17447b..f9c77b745c9 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/Project.fs +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/Project.fs @@ -799,7 +799,7 @@ namespace rec Microsoft.VisualStudio.FSharp.ProjectSystem /// Full path to template file /// Full path to destination file override x.AddFileFromTemplate(source:string, target:string ) = - if not (Microsoft.FSharp.Compiler.AbstractIL.Internal.Library.Shim.FileSystem.SafeExists(source)) then + if not (FSharp.Compiler.AbstractIL.Internal.Library.Shim.FileSystem.SafeExists(source)) then raise <| new FileNotFoundException(String.Format(FSharpSR.TemplateNotFound(), source)) // We assume that there is no token inside the file because the only diff --git a/vsintegration/src/FSharp.VS.FSI/sessions.fs b/vsintegration/src/FSharp.VS.FSI/sessions.fs index 35744a899e9..fb662d38d98 100644 --- a/vsintegration/src/FSharp.VS.FSI/sessions.fs +++ b/vsintegration/src/FSharp.VS.FSI/sessions.fs @@ -2,7 +2,7 @@ module internal Microsoft.VisualStudio.FSharp.Interactive.Session -open Microsoft.FSharp.Compiler +open FSharp.Compiler open System open System.IO open System.Text @@ -139,7 +139,7 @@ let determineFsiRelativePath1 () = // This path is relative to the location of "FSharp.Compiler.Interactive.Settings.dll" let determineFsiRelativePath2 () = - let thisAssembly : System.Reflection.Assembly = typeof.Assembly + let thisAssembly : System.Reflection.Assembly = typeof.Assembly let thisAssemblyDirectory = thisAssembly.Location |> Path.GetDirectoryName // Use the quick-development path if available Path.Combine(thisAssemblyDirectory,fsiExeName() ) @@ -286,7 +286,7 @@ type FsiSession() = do cmdProcess.EnableRaisingEvents <- true let client = - try Microsoft.FSharp.Compiler.Server.Shared.FSharpInteractiveServer.StartClient(channelName) + try FSharp.Compiler.Server.Shared.FSharpInteractiveServer.StartClient(channelName) with e -> raise (SessionError (VFSIstrings.SR.exceptionRaisedWhenCreatingRemotingClient(e.ToString()))) /// interrupt timeout in miliseconds diff --git a/vsintegration/tests/Salsa/FSharpLanguageServiceTestable.fs b/vsintegration/tests/Salsa/FSharpLanguageServiceTestable.fs index ee82ab0807f..b9fbf322c04 100644 --- a/vsintegration/tests/Salsa/FSharpLanguageServiceTestable.fs +++ b/vsintegration/tests/Salsa/FSharpLanguageServiceTestable.fs @@ -14,8 +14,8 @@ open Microsoft.VisualStudio.Shell.Interop open Microsoft.VisualStudio.TextManager.Interop open Microsoft.VisualStudio.Text open Microsoft.VisualStudio.OLE.Interop -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices open Microsoft.VisualStudio.FSharp.LanguageService open Microsoft.VisualStudio.FSharp.LanguageService.SiteProvider @@ -68,7 +68,7 @@ type internal FSharpLanguageServiceTestable() as this = member this.Initialize (sp, dp, prefs, sourceFact) = if this.Unhooked then raise Error.UseOfUnhookedLanguageServiceState artifacts <- Some (ProjectSitesAndFiles()) - let checker = FSharpChecker.Create(legacyReferenceResolver=Microsoft.FSharp.Compiler.MSBuildReferenceResolver.Resolver) + let checker = FSharpChecker.Create(legacyReferenceResolver=FSharp.Compiler.MSBuildReferenceResolver.Resolver) checker.BeforeBackgroundFileCheck.Add (fun (filename,_) -> UIThread.Run(fun () -> this.NotifyFileTypeCheckStateIsDirty(filename))) checkerContainerOpt <- Some (checker) serviceProvider <- Some sp diff --git a/vsintegration/tests/Salsa/SalsaUtils.fs b/vsintegration/tests/Salsa/SalsaUtils.fs index d9de85bcad1..a4c42200ce3 100644 --- a/vsintegration/tests/Salsa/SalsaUtils.fs +++ b/vsintegration/tests/Salsa/SalsaUtils.fs @@ -7,7 +7,7 @@ open System.IO open Microsoft.VisualStudio.FSharp.ProjectSystem open Microsoft.VisualStudio.FSharp.LanguageService open Microsoft.VisualStudio.TextManager.Interop -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices open NUnit.Framework open Salsa.Salsa diff --git a/vsintegration/tests/Salsa/SalsaUtils.fsi b/vsintegration/tests/Salsa/SalsaUtils.fsi index a0f41c6a759..8cf76ee03e6 100644 --- a/vsintegration/tests/Salsa/SalsaUtils.fsi +++ b/vsintegration/tests/Salsa/SalsaUtils.fsi @@ -7,7 +7,7 @@ open Microsoft.VisualStudio.Shell.Interop open Microsoft.VisualStudio.FSharp.ProjectSystem open Microsoft.VisualStudio.FSharp.LanguageService open Microsoft.VisualStudio.TextManager.Interop -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices open Microsoft.Build.Framework open Salsa diff --git a/vsintegration/tests/Salsa/salsa.fs b/vsintegration/tests/Salsa/salsa.fs index 9314dbf3662..0725d117ece 100644 --- a/vsintegration/tests/Salsa/salsa.fs +++ b/vsintegration/tests/Salsa/salsa.fs @@ -25,8 +25,8 @@ open Microsoft.VisualStudio.FSharp.LanguageService open Microsoft.VisualStudio.TextManager.Interop open UnitTests.TestLib.Utils.FilesystemHelpers open Microsoft.Build.Framework -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices open Microsoft.Build.Evaluation @@ -1443,16 +1443,16 @@ module internal Salsa = let documentationProvider = { new IDocumentationBuilder_DEPRECATED with override doc.AppendDocumentationFromProcessedXML(appendTo,processedXml:string,showExceptions, showReturns, paramName) = - appendTo.Add(Microsoft.FSharp.Compiler.Layout.TaggedTextOps.tagText processedXml) - appendTo.Add(Microsoft.FSharp.Compiler.Layout.TaggedTextOps.Literals.lineBreak) + appendTo.Add(FSharp.Compiler.Layout.TaggedTextOps.tagText processedXml) + appendTo.Add(FSharp.Compiler.Layout.TaggedTextOps.Literals.lineBreak) override doc.AppendDocumentation(appendTo,filename:string,signature:string, showExceptions, showReturns, paramName) = - appendTo.Add(Microsoft.FSharp.Compiler.Layout.TaggedTextOps.tagText (sprintf "[Filename:%s]" filename)) - appendTo.Add(Microsoft.FSharp.Compiler.Layout.TaggedTextOps.Literals.lineBreak) - appendTo.Add(Microsoft.FSharp.Compiler.Layout.TaggedTextOps.tagText (sprintf "[Signature:%s]" signature)) - appendTo.Add(Microsoft.FSharp.Compiler.Layout.TaggedTextOps.Literals.lineBreak) + appendTo.Add(FSharp.Compiler.Layout.TaggedTextOps.tagText (sprintf "[Filename:%s]" filename)) + appendTo.Add(FSharp.Compiler.Layout.TaggedTextOps.Literals.lineBreak) + appendTo.Add(FSharp.Compiler.Layout.TaggedTextOps.tagText (sprintf "[Signature:%s]" signature)) + appendTo.Add(FSharp.Compiler.Layout.TaggedTextOps.Literals.lineBreak) if paramName.IsSome then - appendTo.Add(Microsoft.FSharp.Compiler.Layout.TaggedTextOps.tagText (sprintf "[ParamName: %s]" paramName.Value)) - appendTo.Add(Microsoft.FSharp.Compiler.Layout.TaggedTextOps.Literals.lineBreak) + appendTo.Add(FSharp.Compiler.Layout.TaggedTextOps.tagText (sprintf "[ParamName: %s]" paramName.Value)) + appendTo.Add(FSharp.Compiler.Layout.TaggedTextOps.Literals.lineBreak) } let sp2 = diff --git a/vsintegration/tests/UnitTests/BraceMatchingServiceTests.fs b/vsintegration/tests/UnitTests/BraceMatchingServiceTests.fs index e323cc8db20..0e71493d22b 100644 --- a/vsintegration/tests/UnitTests/BraceMatchingServiceTests.fs +++ b/vsintegration/tests/UnitTests/BraceMatchingServiceTests.fs @@ -9,7 +9,7 @@ open NUnit.Framework open Microsoft.CodeAnalysis.Classification open Microsoft.CodeAnalysis.Editor open Microsoft.CodeAnalysis.Text -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices open Microsoft.VisualStudio.FSharp.Editor open Microsoft.VisualStudio.FSharp.LanguageService open UnitTests.TestLib.LanguageService diff --git a/vsintegration/tests/UnitTests/BreakpointResolutionService.fs b/vsintegration/tests/UnitTests/BreakpointResolutionService.fs index 655fc02986a..8ccf2c69441 100644 --- a/vsintegration/tests/UnitTests/BreakpointResolutionService.fs +++ b/vsintegration/tests/UnitTests/BreakpointResolutionService.fs @@ -13,8 +13,8 @@ open Microsoft.CodeAnalysis.Text open Microsoft.VisualStudio.FSharp.Editor open Microsoft.VisualStudio.FSharp.LanguageService -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Range open UnitTests.TestLib.LanguageService diff --git a/vsintegration/tests/UnitTests/CompletionProviderTests.fs b/vsintegration/tests/UnitTests/CompletionProviderTests.fs index 4f90bee81c2..91339ffde4a 100644 --- a/vsintegration/tests/UnitTests/CompletionProviderTests.fs +++ b/vsintegration/tests/UnitTests/CompletionProviderTests.fs @@ -31,7 +31,7 @@ open Microsoft.CodeAnalysis.Completion open Microsoft.CodeAnalysis.Text open Microsoft.VisualStudio.FSharp.Editor -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices open UnitTests.TestLib.LanguageService let filePath = "C:\\test.fs" diff --git a/vsintegration/tests/UnitTests/DocumentDiagnosticAnalyzerTests.fs b/vsintegration/tests/UnitTests/DocumentDiagnosticAnalyzerTests.fs index 99f0380abbc..6fb3909079a 100644 --- a/vsintegration/tests/UnitTests/DocumentDiagnosticAnalyzerTests.fs +++ b/vsintegration/tests/UnitTests/DocumentDiagnosticAnalyzerTests.fs @@ -14,8 +14,8 @@ open Microsoft.CodeAnalysis.Text open Microsoft.VisualStudio.FSharp.Editor open Microsoft.VisualStudio.FSharp.LanguageService -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Range open UnitTests.TestLib.LanguageService diff --git a/vsintegration/tests/UnitTests/DocumentHighlightsServiceTests.fs b/vsintegration/tests/UnitTests/DocumentHighlightsServiceTests.fs index 2b39f4749d5..07d4eed0756 100644 --- a/vsintegration/tests/UnitTests/DocumentHighlightsServiceTests.fs +++ b/vsintegration/tests/UnitTests/DocumentHighlightsServiceTests.fs @@ -31,8 +31,8 @@ open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.Text open Microsoft.VisualStudio.FSharp.Editor -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices open UnitTests.TestLib.LanguageService let filePath = "C:\\test.fs" diff --git a/vsintegration/tests/UnitTests/EditorFormattingServiceTests.fs b/vsintegration/tests/UnitTests/EditorFormattingServiceTests.fs index c1d043377d5..fbcfc1125af 100644 --- a/vsintegration/tests/UnitTests/EditorFormattingServiceTests.fs +++ b/vsintegration/tests/UnitTests/EditorFormattingServiceTests.fs @@ -8,7 +8,7 @@ open NUnit.Framework open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.Text open Microsoft.VisualStudio.FSharp.Editor -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices open Microsoft.CodeAnalysis.Formatting [] diff --git a/vsintegration/tests/UnitTests/GoToDefinitionServiceTests.fs b/vsintegration/tests/UnitTests/GoToDefinitionServiceTests.fs index a2650c519e4..35a7251e002 100644 --- a/vsintegration/tests/UnitTests/GoToDefinitionServiceTests.fs +++ b/vsintegration/tests/UnitTests/GoToDefinitionServiceTests.fs @@ -28,8 +28,8 @@ open NUnit.Framework open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.Text open Microsoft.VisualStudio.FSharp.Editor -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Range open UnitTests.TestLib.LanguageService [][] diff --git a/vsintegration/tests/UnitTests/HelpContextServiceTests.fs b/vsintegration/tests/UnitTests/HelpContextServiceTests.fs index 76b918d0fad..b1ea19c2ad7 100644 --- a/vsintegration/tests/UnitTests/HelpContextServiceTests.fs +++ b/vsintegration/tests/UnitTests/HelpContextServiceTests.fs @@ -10,7 +10,7 @@ open Microsoft.CodeAnalysis.Classification open Microsoft.CodeAnalysis.Editor open Microsoft.CodeAnalysis.Text open Microsoft.CodeAnalysis -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices open Microsoft.VisualStudio.FSharp.Editor open Microsoft.VisualStudio.FSharp.LanguageService open UnitTests.TestLib.Utils diff --git a/vsintegration/tests/UnitTests/IndentationServiceTests.fs b/vsintegration/tests/UnitTests/IndentationServiceTests.fs index 5139e313a48..7c1689119e6 100644 --- a/vsintegration/tests/UnitTests/IndentationServiceTests.fs +++ b/vsintegration/tests/UnitTests/IndentationServiceTests.fs @@ -11,7 +11,7 @@ open Microsoft.CodeAnalysis.Classification open Microsoft.CodeAnalysis.Editor open Microsoft.CodeAnalysis.Text open Microsoft.VisualStudio.FSharp.Editor -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices open Microsoft.CodeAnalysis.Formatting open UnitTests.TestLib.LanguageService diff --git a/vsintegration/tests/UnitTests/LanguageDebugInfoServiceTests.fs b/vsintegration/tests/UnitTests/LanguageDebugInfoServiceTests.fs index 7578f34bb9f..e62a9e44f7c 100644 --- a/vsintegration/tests/UnitTests/LanguageDebugInfoServiceTests.fs +++ b/vsintegration/tests/UnitTests/LanguageDebugInfoServiceTests.fs @@ -14,8 +14,8 @@ open Microsoft.CodeAnalysis open Microsoft.VisualStudio.FSharp.Editor open Microsoft.VisualStudio.FSharp.LanguageService -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Range [][] type LanguageDebugInfoServiceTests() = diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.General.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.General.fs index ee05cc3bb0c..47e8e3b1134 100644 --- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.General.fs +++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.General.fs @@ -7,8 +7,8 @@ open System open System.IO open System.Reflection open System.Runtime.InteropServices -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler +open FSharp.Compiler.SourceCodeServices open Microsoft.VisualStudio.FSharp.LanguageService open Salsa.Salsa open Salsa @@ -109,7 +109,7 @@ type UsingMSBuild() = let ls = publicTypesInAsm @"FSharp.LanguageService.dll" Assert.AreEqual(0, ls) let compis = publicTypesInAsm @"FSharp.Compiler.Interactive.Settings.dll" - Assert.AreEqual(4, compis) + Assert.AreEqual(5, compis) let compserver = publicTypesInAsm @"FSharp.Compiler.Server.Shared.dll" Assert.AreEqual(0, compserver) let lsbase = publicTypesInAsm @"FSharp.LanguageService.Base.dll" diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.GotoDefinition.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.GotoDefinition.fs index ff5af668d1b..95b52add9ea 100644 --- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.GotoDefinition.fs +++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.GotoDefinition.fs @@ -1343,7 +1343,7 @@ type UsingMSBuild() = member this.GetCompleteIdTest tolerate (s : string)(exp : string option) : unit = let n = s.IndexOf '$' let s = s.Remove (n, 1) - match (Microsoft.FSharp.Compiler.QuickParse.GetCompleteIdentifierIsland tolerate s n, exp) with + match (FSharp.Compiler.QuickParse.GetCompleteIdentifierIsland tolerate s n, exp) with | (Some (s1, _, _), Some s2) -> printfn "%s" "Received result, as expected." Assert.AreEqual (s1, s2) diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.IncrementalBuild.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.IncrementalBuild.fs index fc233280388..715d7435ac0 100644 --- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.IncrementalBuild.fs +++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.IncrementalBuild.fs @@ -13,11 +13,11 @@ open NUnit.Framework.Constraints #endif open Salsa.Salsa open Salsa.VsOpsUtils -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.CompileOps -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.IncrementalBuild -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler +open FSharp.Compiler.CompileOps +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.IncrementalBuild +open FSharp.Compiler.AbstractIL.Internal.Library // Useful methods that someday might go into IncrementalBuild module internal Vector = diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.QuickParse.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.QuickParse.fs index 1798a9f05fe..36fe51370d0 100644 --- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.QuickParse.fs +++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.QuickParse.fs @@ -4,7 +4,7 @@ namespace Tests.LanguageService open System open NUnit.Framework -open Microsoft.FSharp.Compiler +open FSharp.Compiler [] [] diff --git a/vsintegration/tests/UnitTests/ProjectDiagnosticAnalyzerTests.fs b/vsintegration/tests/UnitTests/ProjectDiagnosticAnalyzerTests.fs index b1287706f91..6491c77b5c0 100644 --- a/vsintegration/tests/UnitTests/ProjectDiagnosticAnalyzerTests.fs +++ b/vsintegration/tests/UnitTests/ProjectDiagnosticAnalyzerTests.fs @@ -17,8 +17,8 @@ open Microsoft.CodeAnalysis.Text open Microsoft.VisualStudio.FSharp.Editor open Microsoft.VisualStudio.FSharp.LanguageService -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Range [][] type ProjectDiagnosticAnalyzerTests() = diff --git a/vsintegration/tests/UnitTests/QuickInfoProviderTests.fs b/vsintegration/tests/UnitTests/QuickInfoProviderTests.fs index d14747fffa6..e412029cf26 100644 --- a/vsintegration/tests/UnitTests/QuickInfoProviderTests.fs +++ b/vsintegration/tests/UnitTests/QuickInfoProviderTests.fs @@ -42,7 +42,7 @@ module QuickInfoProviderTests = open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.Text open Microsoft.VisualStudio.FSharp.Editor -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices open UnitTests.TestLib.LanguageService let filePath = "C:\\test.fs" diff --git a/vsintegration/tests/UnitTests/SemanticColorizationServiceTests.fs b/vsintegration/tests/UnitTests/SemanticColorizationServiceTests.fs index 3c5b8f40147..07e549422ea 100644 --- a/vsintegration/tests/UnitTests/SemanticColorizationServiceTests.fs +++ b/vsintegration/tests/UnitTests/SemanticColorizationServiceTests.fs @@ -4,8 +4,8 @@ namespace Microsoft.VisualStudio.FSharp.Editor.Tests.Roslyn open System open NUnit.Framework open Microsoft.VisualStudio.FSharp.Editor -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler open Microsoft.CodeAnalysis.Text [] diff --git a/vsintegration/tests/UnitTests/SignatureHelpProviderTests.fs b/vsintegration/tests/UnitTests/SignatureHelpProviderTests.fs index b26f786fabb..f61517bf4da 100644 --- a/vsintegration/tests/UnitTests/SignatureHelpProviderTests.fs +++ b/vsintegration/tests/UnitTests/SignatureHelpProviderTests.fs @@ -27,7 +27,7 @@ open System.Text open NUnit.Framework open Microsoft.CodeAnalysis.Text open Microsoft.VisualStudio.FSharp.Editor -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices open UnitTests.TestLib.LanguageService let filePath = "C:\\test.fs" diff --git a/vsintegration/tests/UnitTests/TestLib.LanguageService.fs b/vsintegration/tests/UnitTests/TestLib.LanguageService.fs index 002d47aad57..95b1d74925d 100644 --- a/vsintegration/tests/UnitTests/TestLib.LanguageService.fs +++ b/vsintegration/tests/UnitTests/TestLib.LanguageService.fs @@ -12,16 +12,16 @@ open Salsa.VsOpsUtils open Salsa.VsMocks open UnitTests.TestLib.Salsa open UnitTests.TestLib.Utils -open Microsoft.FSharp.Compiler +open FSharp.Compiler open System.Text.RegularExpressions -open Microsoft.FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.SourceCodeServices open Microsoft.VisualStudio.FSharp #nowarn "52" // The value has been copied to ensure the original is not mutated [] module internal Globals = - let checker = FSharpChecker.Create(legacyReferenceResolver=Microsoft.FSharp.Compiler.MSBuildReferenceResolver.Resolver) + let checker = FSharpChecker.Create(legacyReferenceResolver=FSharp.Compiler.MSBuildReferenceResolver.Resolver) //open Internal.Utilities diff --git a/vsintegration/tests/UnitTests/Tests.Build.fs b/vsintegration/tests/UnitTests/Tests.Build.fs index b1b7228a16f..c48173fc34b 100644 --- a/vsintegration/tests/UnitTests/Tests.Build.fs +++ b/vsintegration/tests/UnitTests/Tests.Build.fs @@ -6,7 +6,7 @@ open NUnit.Framework open System open System.IO open System.Diagnostics -open Microsoft.FSharp.Build +open FSharp.Build open Microsoft.Build.Framework open Microsoft.Build.Utilities open UnitTests.TestLib.Utils.FilesystemHelpers @@ -71,7 +71,7 @@ type Build() = [] member public this.MissingToolPathError() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.ToolPath <- "" try let p = tool.InternalGenerateFullPathToTool() @@ -81,7 +81,7 @@ type Build() = [] member public this.TestCodePage() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() printfn "By the way, the registry or app.config tool path is %s" tool.ToolPath tool.CodePage <- "65001" AssertEqual "65001" tool.CodePage @@ -98,7 +98,7 @@ type Build() = [] member public this.TestDebugSymbols() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.DebugSymbols <- true AssertEqual true tool.DebugSymbols let cmd = tool.InternalGenerateResponseFileCommands() @@ -114,7 +114,7 @@ type Build() = [] member public this.TestDebugType() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.DebugType <- "pdbONly" AssertEqual "pdbONly" tool.DebugType let cmd = tool.InternalGenerateResponseFileCommands() @@ -130,7 +130,7 @@ type Build() = [] member public this.TestDefineConstants() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.DefineConstants <- [| MakeTaskItem "FOO=3" MakeTaskItem "BAR=4" |] AssertEqual 2 tool.DefineConstants.Length @@ -148,7 +148,7 @@ type Build() = [] member public this.TestDisabledWarnings1() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.DisabledWarnings <- "52;109" AssertEqual "52;109" tool.DisabledWarnings let cmd = tool.InternalGenerateResponseFileCommands() @@ -164,7 +164,7 @@ type Build() = [] member public this.TestDisabledWarnings2() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.DisabledWarnings <- ";" // e.g. someone may have $(NoWarn);$(SomeOtherVar) and both vars are empty AssertEqual ";" tool.DisabledWarnings let cmd = tool.InternalGenerateResponseFileCommands() @@ -179,7 +179,7 @@ type Build() = [] member public this.TestWarningsNotAsErrors() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.WarningsNotAsErrors <- "52;109" AssertEqual "52;109" tool.WarningsNotAsErrors let cmd = tool.InternalGenerateResponseFileCommands() @@ -195,7 +195,7 @@ type Build() = [] member public this.TestVersionFile() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.VersionFile <- "src/version" AssertEqual "src/version" tool.VersionFile let cmd = tool.InternalGenerateResponseFileCommands() @@ -211,7 +211,7 @@ type Build() = [] member public this.TestDocumentationFile() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.DocumentationFile <- "foo.xml" AssertEqual "foo.xml" tool.DocumentationFile let cmd = tool.InternalGenerateResponseFileCommands() @@ -227,7 +227,7 @@ type Build() = [] member public this.TestGenerateInterfaceFile() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.GenerateInterfaceFile <- "foo.fsi" AssertEqual "foo.fsi" tool.GenerateInterfaceFile let cmd = tool.InternalGenerateResponseFileCommands() @@ -243,7 +243,7 @@ type Build() = [] member public this.TestKeyFile() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.KeyFile <- "key.txt" AssertEqual "key.txt" tool.KeyFile let cmd = tool.InternalGenerateResponseFileCommands() @@ -259,7 +259,7 @@ type Build() = [] member public this.TestNoFramework() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.NoFramework <- true AssertEqual true tool.NoFramework let cmd = tool.InternalGenerateResponseFileCommands() @@ -275,7 +275,7 @@ type Build() = [] member public this.TestOptimize() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.Optimize <- false AssertEqual false tool.Optimize let cmd = tool.InternalGenerateResponseFileCommands() @@ -290,7 +290,7 @@ type Build() = [] member public this.TestTailcalls() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.Tailcalls <- true AssertEqual true tool.Tailcalls let cmd = tool.InternalGenerateResponseFileCommands() @@ -306,7 +306,7 @@ type Build() = [] member public this.TestOtherFlags() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.OtherFlags <- "--yadda yadda" AssertEqual "--yadda yadda" tool.OtherFlags let cmd = tool.InternalGenerateResponseFileCommands() @@ -323,7 +323,7 @@ type Build() = [] member public this.TestOutputAssembly() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.OutputAssembly <- "oUt.dll" AssertEqual "oUt.dll" tool.OutputAssembly let cmd = tool.InternalGenerateResponseFileCommands() @@ -339,7 +339,7 @@ type Build() = [] member public this.TestPdbFile() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.PdbFile <- "out.pdb" AssertEqual "out.pdb" tool.PdbFile let cmd = tool.InternalGenerateResponseFileCommands() @@ -355,7 +355,7 @@ type Build() = [] member public this.TestPlatform1() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.Platform <- "x64" AssertEqual "x64" tool.Platform let cmd = tool.InternalGenerateResponseFileCommands() @@ -371,7 +371,7 @@ type Build() = [] member public this.TestPlatform3() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.Platform <- "x86" AssertEqual "x86" tool.Platform let cmd = tool.InternalGenerateResponseFileCommands() @@ -387,7 +387,7 @@ type Build() = [] member public this.TestReferences() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() let dll = "c:\\sd\\staging\\tools\\nunit\\nunit.framework.dll" tool.References <- [| MakeTaskItem dll |] AssertEqual 1 tool.References.Length @@ -404,7 +404,7 @@ type Build() = [] member public this.TestReferencePath() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() let path = "c:\\sd\\staging\\tools\\nunit\\;c:\\Foo" tool.ReferencePath <- path AssertEqual path tool.ReferencePath @@ -420,7 +420,7 @@ type Build() = [] member public this.TestReferencePathWithSpaces() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() let path = "c:\\program files;c:\\sd\\staging\\tools\\nunit;c:\\Foo" tool.ReferencePath <- path AssertEqual path tool.ReferencePath @@ -437,7 +437,7 @@ type Build() = [] member public this.TestResources() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.Resources <- [| MakeTaskItem "Foo.resources" |] AssertEqual 1 tool.Resources.Length let cmd = tool.InternalGenerateResponseFileCommands() @@ -453,7 +453,7 @@ type Build() = [] member public this.TestSources() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() let src = "foo.fs" let iti = MakeTaskItem src tool.Sources <- [| iti; iti |] @@ -473,7 +473,7 @@ type Build() = [] member public this.TestTargetType1() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.TargetType <- "Library" AssertEqual "Library" tool.TargetType let cmd = tool.InternalGenerateResponseFileCommands() @@ -489,7 +489,7 @@ type Build() = [] member public this.TestTargetType2() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.TargetType <- "Winexe" AssertEqual "Winexe" tool.TargetType let cmd = tool.InternalGenerateResponseFileCommands() @@ -505,7 +505,7 @@ type Build() = [] member public this.TestTargetType3() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.TargetType <- "Module" AssertEqual "Module" tool.TargetType let cmd = tool.InternalGenerateResponseFileCommands() @@ -521,7 +521,7 @@ type Build() = [] member public this.TestUtf8Output() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.Utf8Output <- true let cmd = tool.InternalGenerateResponseFileCommands() printfn "cmd=\"%s\"" cmd @@ -536,7 +536,7 @@ type Build() = [] member public this.TestWin32Res() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.Win32ResourceFile <- "foo.res" let cmd = tool.InternalGenerateResponseFileCommands() printfn "cmd=\"%s\"" cmd @@ -551,7 +551,7 @@ type Build() = [] member public this.TestWin32Manifest() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.Win32ManifestFile <- "foo.manifest" let cmd = tool.InternalGenerateResponseFileCommands() printfn "cmd=\"%s\"" cmd @@ -566,7 +566,7 @@ type Build() = [] member public this.TestHighEntropyVA() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.HighEntropyVA <- true let cmd = tool.InternalGenerateResponseFileCommands() printfn "cmd=\"%s\"" cmd @@ -580,7 +580,7 @@ type Build() = [] member public this.TestSubsystemVersion() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.SubsystemVersion <- "6.02" let cmd = tool.InternalGenerateResponseFileCommands() printfn "cmd=\"%s\"" cmd @@ -595,7 +595,7 @@ type Build() = [] member public this.TestAllCombo() = - let tool = new Microsoft.FSharp.Build.Fsc() + let tool = new FSharp.Build.Fsc() tool.CodePage <- "65001" tool.DebugSymbols <- true tool.DebugType <- "full" diff --git a/vsintegration/tests/UnitTests/Tests.Powerpack.fs b/vsintegration/tests/UnitTests/Tests.Powerpack.fs index e90610f5529..7ea87328bc4 100644 --- a/vsintegration/tests/UnitTests/Tests.Powerpack.fs +++ b/vsintegration/tests/UnitTests/Tests.Powerpack.fs @@ -6,7 +6,7 @@ open NUnit.Framework open System open System.IO open System.Diagnostics -open Microsoft.FSharp.Build +open FSharp.Build open Microsoft.Build.Framework open Microsoft.Build.Utilities open UnitTests.TestLib.Utils.FilesystemHelpers @@ -22,28 +22,28 @@ type FsLexTests() = [] member public this.TestCodePage() = - let tool = new Microsoft.FSharp.Build.FsLex() + let tool = new FSharp.Build.FsLex() tool.CodePage <- "65001" let cmd = tool.InternalGenerateCommandLineCommands() Assert.AreEqual("--codepage 65001 ", cmd) [] member public this.TestOutputFile() = - let tool = new Microsoft.FSharp.Build.FsLex() + let tool = new FSharp.Build.FsLex() tool.OutputFile <- "result.fs" let cmd = tool.InternalGenerateCommandLineCommands() Assert.AreEqual("-o result.fs ", cmd) [] member public this.TestUnicode() = - let tool = new Microsoft.FSharp.Build.FsLex() + let tool = new FSharp.Build.FsLex() tool.Unicode <- true let cmd = tool.InternalGenerateCommandLineCommands() Assert.AreEqual("--unicode ", cmd) [] member public this.TestUnicodeNegCase() = - let tool = new Microsoft.FSharp.Build.FsLex() + let tool = new FSharp.Build.FsLex() tool.Unicode <- false let cmd = tool.InternalGenerateCommandLineCommands() // Verify Unicode flag not specified @@ -60,28 +60,28 @@ type FsYaccTests() = [] member public this.TestCodePage() = - let tool = new Microsoft.FSharp.Build.FsYacc() + let tool = new FSharp.Build.FsYacc() tool.CodePage <- "65001" let cmd = tool.InternalGenerateCommandLineCommands() Assert.AreEqual("--codepage 65001", cmd) [] member public this.TestOutputFile() = - let tool = new Microsoft.FSharp.Build.FsYacc() + let tool = new FSharp.Build.FsYacc() tool.OutputFile <- "result.fs" let cmd = tool.InternalGenerateCommandLineCommands() Assert.AreEqual("-o result.fs", cmd) [] member public this.TestMLCompatibility() = - let tool = new Microsoft.FSharp.Build.FsYacc() + let tool = new FSharp.Build.FsYacc() tool.MLCompatibility <- true let cmd = tool.InternalGenerateCommandLineCommands() Assert.AreEqual("--ml-compatibility", cmd) [] member public this.TestMLCompatibilityFalse() = - let tool = new Microsoft.FSharp.Build.FsYacc() + let tool = new FSharp.Build.FsYacc() tool.MLCompatibility <- false let cmd = tool.InternalGenerateCommandLineCommands() Assert.AreEqual("", cmd) \ No newline at end of file diff --git a/vsintegration/tests/UnitTests/Tests.TaskReporter.fs b/vsintegration/tests/UnitTests/Tests.TaskReporter.fs index 876890d95c5..670fea46d2f 100644 --- a/vsintegration/tests/UnitTests/Tests.TaskReporter.fs +++ b/vsintegration/tests/UnitTests/Tests.TaskReporter.fs @@ -6,7 +6,7 @@ open NUnit.Framework open System open System.IO open System.Diagnostics -open Microsoft.FSharp.Build +open FSharp.Build open Microsoft.Build.Framework open Microsoft.Build.Utilities open UnitTests.TestLib.Utils diff --git a/vsintegration/tests/UnitTests/Tests.Watson.fs b/vsintegration/tests/UnitTests/Tests.Watson.fs index 1e660ac359b..491a4bf37da 100644 --- a/vsintegration/tests/UnitTests/Tests.Watson.fs +++ b/vsintegration/tests/UnitTests/Tests.Watson.fs @@ -4,10 +4,10 @@ namespace Tests.Compiler.Watson #nowarn "52" // The value has been copied to ensure the original is not mutated -open Microsoft.FSharp.Compiler.AbstractIL.ILBinaryReader -open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library -open Microsoft.FSharp.Compiler.CompileOps -open Microsoft.FSharp.Compiler.Driver +open FSharp.Compiler.AbstractIL.ILBinaryReader +open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.CompileOps +open FSharp.Compiler.Driver open NUnit.Framework open System open System.Text.RegularExpressions @@ -21,7 +21,7 @@ type Check = try try #if DEBUG - Microsoft.FSharp.Compiler.CompileOps.CompilerService.showAssertForUnexpectedException := false + FSharp.Compiler.CompileOps.CompilerService.showAssertForUnexpectedException := false #endif if (File.Exists("watson-test.fs")) then File.Delete("watson-test.fs") @@ -29,7 +29,7 @@ type Check = let argv = [| "--simulateException:"+simulationCode; "watson-test.fs"|] let ctok = AssumeCompilationThreadWithoutEvidence () - let _code = mainCompile (ctok, argv, Microsoft.FSharp.Compiler.MSBuildReferenceResolver.Resolver, false, ReduceMemoryFlag.No, CopyFSharpCoreFlag.No, Microsoft.FSharp.Compiler.ErrorLogger.QuitProcessExiter, ConsoleLoggerProvider(), None, None) + let _code = mainCompile (ctok, argv, FSharp.Compiler.MSBuildReferenceResolver.Resolver, false, ReduceMemoryFlag.No, CopyFSharpCoreFlag.No, FSharp.Compiler.ErrorLogger.QuitProcessExiter, ConsoleLoggerProvider(), None, None) () with | :? 'TException as e -> @@ -38,13 +38,13 @@ type Check = else printfn "%s" msg Assert.Fail("The correct callstack was not reported to watson.") - | (Microsoft.FSharp.Compiler.ErrorLogger.ReportedError (Some (Microsoft.FSharp.Compiler.ErrorLogger.InternalError (msg, range) as e))) - | (Microsoft.FSharp.Compiler.ErrorLogger.InternalError (msg, range) as e) -> + | (FSharp.Compiler.ErrorLogger.ReportedError (Some (FSharp.Compiler.ErrorLogger.InternalError (msg, range) as e))) + | (FSharp.Compiler.ErrorLogger.InternalError (msg, range) as e) -> printfn "InternalError Exception: %s, range = %A, stack = %s" msg range (e.ToString()) Assert.Fail("An InternalError exception occurred.") finally #if DEBUG - Microsoft.FSharp.Compiler.CompileOps.CompilerService.showAssertForUnexpectedException := true + FSharp.Compiler.CompileOps.CompilerService.showAssertForUnexpectedException := true #endif File.Delete("watson-test.fs") diff --git a/vsintegration/tests/UnitTests/UnusedOpensTests.fs b/vsintegration/tests/UnitTests/UnusedOpensTests.fs index d23f5ed4e18..81d9ff1c348 100644 --- a/vsintegration/tests/UnitTests/UnusedOpensTests.fs +++ b/vsintegration/tests/UnitTests/UnusedOpensTests.fs @@ -4,8 +4,8 @@ module Tests.ServiceAnalysis.UnusedOpens open System open NUnit.Framework -open Microsoft.FSharp.Compiler.SourceCodeServices -open Microsoft.FSharp.Compiler.Range +open FSharp.Compiler.SourceCodeServices +open FSharp.Compiler.Range open FsUnit let private filePath = "C:\\test.fs"