Merge pull request #815 from dsyme/i14

integrate preserving commit history

Author: dsyme

README.md

@@ -51,7 +51,6 @@ All AppVeyor builds are available using the NuGet feed: https://ci.appveyor.com/
 
 If using Paket, add the source at the top of `paket.dependencies`.
 
-
 License
 -----------
 

fcs/.paket/Paket.Restore.targets

@@ -60,9 +60,9 @@ which does things like:
 Yu can push the packages if you have permissions, either automatically using ``build Release`` or manually
 
     set APIKEY=...
-    .nuget\nuget.exe push Release\FSharp.Compiler.Service.15.0.1.nupkg %APIKEY% -Source https://nuget.org 
-    .nuget\nuget.exe push Release\FSharp.Compiler.Service.MSBuild.v12.15.0.1.nupkg %APIKEY%  -Source https://nuget.org
-    .nuget\nuget.exe push Release\FSharp.Compiler.Service.ProjectCracker.15.0.1.nupkg %APIKEY%  -Source https://nuget.org
+    .nuget\nuget.exe push Release\FSharp.Compiler.Service.16.0.1.nupkg %APIKEY% -Source https://nuget.org 
+    .nuget\nuget.exe push Release\FSharp.Compiler.Service.MSBuild.v12.16.0.1.nupkg %APIKEY%  -Source https://nuget.org
+    .nuget\nuget.exe push Release\FSharp.Compiler.Service.ProjectCracker.16.0.1.nupkg %APIKEY%  -Source https://nuget.org
 
 
 ### Use of Paket and FAKE

fcs/README.md

@@ -1,8 +1,10 @@
+#### 16.0.1
+  * FSharpChecker provides non-reactor ParseFile instead of ParseFileInProject
+  * Add FSharpParsingOptions, GetParsingOptionsFromProjectOptions, GetParsingOptionsFromCommandLine
+
 #### 15.0.1
   * Integrate latest changes from visualfsharp
   * Add implementation file contents to CheckFileResults
-
-#### 15.0.1
   * Fix non-public API in .NET Standard 1.6 version
 
 #### 14.0.1

fcs/RELEASE_NOTES.md

@@ -21,19 +21,14 @@ Each FSharpChecker object maintains a set of caches.  These are
 
 * ``braceMatchCache`` - an MRU cache of size ``braceMatchCacheSize`` (default = 5) keeping the results of calls to MatchBraces, keyed by filename, source and project options.
 
-* ``parseFileInProjectCache`` - an MRU cache of size ``parseFileInProjectCacheSize`` (default = 2) keeping the results of ParseFileInProject, 
+* ``parseFileCache`` - an MRU cache of size ``parseFileCacheSize`` (default = 2) keeping the results of ParseFile, 
   keyed by filename, source and project options.
 
-* ``parseAndCheckFileInProjectCache`` - an MRU cache of size ``incrementalTypeCheckCacheSize`` (default = 5) keeping the results of 
+* ``checkFileInProjectCache`` - an MRU cache of size ``incrementalTypeCheckCacheSize`` (default = 5) keeping the results of 
   ParseAndCheckFileInProject, CheckFileInProject and/or CheckFileInProjectIfReady. This is keyed by filename, file source 
   and project options.  The results held in this cache are only returned if they would reflect an accurate parse and check of the
   file.
 
-* ``parseAndCheckFileInProjectCachePossiblyStale`` - a somewhat peculiar MRU cache of size ``incrementalTypeCheckCacheSize`` (default = 5) 
-  keeping the results of ParseAndCheckFileInProject, CheckFileInProject and CheckFileInProjectIfReady, 
-  keyed by filename and project options. This cache is accessed by TryGetRecentTypeCheckResultsForFile. Because the results
-  are accessed regardless of the content of the file, the checking results returned may be "stale".
-
 * ``getToolTipTextCache`` - an aged lookup cache of strong size ``getToolTipTextSize`` (default = 5) computing the results of GetToolTipText.
 
 * ``ilModuleReaderCache`` - an aged lookup of weak references to "readers" for references .NET binaries. Because these

fcs/docsrc/content/caches.fsx

@@ -56,16 +56,19 @@ let projOptions =
     checker.GetProjectOptionsFromScript(file, input)
     |> Async.RunSynchronously
 
+let parsingOptions, _errors = checker.GetParsingOptionsFromProjectOptions(projOptions)
+
 (**
 To perform type checking, we first need to parse the input using 
-`ParseFileInProject`, which gives us access to the [untyped AST](untypedtree.html). However,
+`ParseFile`, which gives us access to the [untyped AST](untypedtree.html). However,
 then we need to call `CheckFileInProject` to perform the full type checking. This function
 also requires the result of `ParseFileInProject`, so the two functions are often called 
 together. 
 *)
 // Perform parsing  
+
 let parseFileResults = 
-    checker.ParseFileInProject(file, input, projOptions) 
+    checker.ParseFile(file, input, parsingOptions) 
     |> Async.RunSynchronously
 (**
 Before we look at the interesting operations provided by `TypeCheckResults`, we 

fcs/docsrc/content/editor.fsx

@@ -58,20 +58,22 @@ let file = "/home/user/Test.fsx"
 
 let projOptions = checker.GetProjectOptionsFromScript(file, input) |> Async.RunSynchronously
 
+let parsingOptions, _errors = checker.GetParsingOptionsFromProjectOptions(projOptions)
+
 (**
 
-型チェックを実行するには、まず `ParseFileInProject` を使って
+型チェックを実行するには、まず `ParseFile` を使って
 入力値をパースする必要があります。
 このメソッドを使うと [型無しAST](untypedtree.html) にアクセスできるようになります。
 しかし今回は完全な型チェックを実行するため、続けて `CheckFileInProject`
 を呼び出す必要があります。
-このメソッドは `ParseFileInProject` の結果も必要とするため、
+このメソッドは `ParseFile` の結果も必要とするため、
 たいていの場合にはこれら2つのメソッドをセットで呼び出すことになります。
 
 *)
 // パースを実行
 let parseFileResults =
-    checker.ParseFileInProject(file, input, projOptions)
+    checker.ParseFile(file, input, parsingOptions)
     |> Async.RunSynchronously
 (**
 `TypeCheckResults` に備えられた興味深い機能の紹介に入る前に、

fcs/docsrc/content/ja/editor.fsx

@@ -73,9 +73,11 @@ let getUntypedTree (file, input) =
       checker.GetProjectOptionsFromScript(file, input) 
       |> Async.RunSynchronously
 
+  let parsingOptions, _errors = checker.GetParsingOptionsFromProjectOptions(projOptions)
+
   // コンパイラの第1フェーズを実行する
   let untypedRes = 
-      checker.ParseFileInProject(file, input, projectOptions) 
+      checker.ParseFile(file, input, parsingOptions) 
       |> Async.RunSynchronously
 
   match untypedRes.ParseTree with

fcs/docsrc/content/ja/untypedtree.fsx

@@ -49,7 +49,7 @@ To get the AST, we define a function that takes file name and the source code
 (the file is only used for location information and does not have to exist).
 We first need to get "interactive checker options" which represents the context.
 For simple tasks, you can use `GetProjectOptionsFromScriptRoot` which infers
-the context for a script file. Then we use the `ParseFileInProject` method and
+the context for a script file. Then we use the `ParseFile` method and
 return the `ParseTree` property:
 
 *)
@@ -60,9 +60,11 @@ let getUntypedTree (file, input) =
       checker.GetProjectOptionsFromScript(file, input)
       |> Async.RunSynchronously
 
+  let parsingOptions, _errors = checker.GetParsingOptionsFromProjectOptions(projOptions)
+
   // Run the first phase (untyped parsing) of the compiler
   let parseFileResults = 
-      checker.ParseFileInProject(file, input, projOptions) 
+      checker.ParseFile(file, input, parsingOptions) 
       |> Async.RunSynchronously
 
   match parseFileResults.ParseTree with

fcs/docsrc/content/untypedtree.fsx

@@ -3,7 +3,7 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
 
-    <VersionPrefix>15.0.1</VersionPrefix>
+    <VersionPrefix>16.0.1</VersionPrefix>
     <!-- FSharp.Compiler.Tools is currently only used to get a working FSI.EXE to execute some scripts during the build -->
     <!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful -->
     <FsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools</FsiToolPath>