Merge branch 'master' of https://github.com/fsharp/FSharp.Compiler.Service into dsyme-patch-1

Author: dsyme

docs/caches.html

@@ -53,21 +53,15 @@ <h1><a name="Compiler-Services-Notes-on-the-FSharpChecker-caches" class="anchor"
 </li>
 <li><p><code>braceMatchCache</code> - an MRU cache of size <code>braceMatchCacheSize</code> (default = 5) keeping the results of calls to MatchBraces, keyed by filename, source and project options.</p></li>
 <li>
-<p><code>parseFileInProjectCache</code> - an MRU cache of size <code>parseFileInProjectCacheSize</code> (default = 2) keeping the results of ParseFileInProject,
+<p><code>parseFileCache</code> - an MRU cache of size <code>parseFileCacheSize</code> (default = 2) keeping the results of ParseFile,
 keyed by filename, source and project options.</p>
 </li>
 <li>
-<p><code>parseAndCheckFileInProjectCache</code> - an MRU cache of size <code>incrementalTypeCheckCacheSize</code> (default = 5) keeping the results of
+<p><code>checkFileInProjectCache</code> - an MRU cache of size <code>incrementalTypeCheckCacheSize</code> (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.</p>
 </li>
-<li>
-<p><code>parseAndCheckFileInProjectCachePossiblyStale</code> - a somewhat peculiar MRU cache of size <code>incrementalTypeCheckCacheSize</code> (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".</p>
-</li>
 <li><p><code>getToolTipTextCache</code> - an aged lookup cache of strong size <code>getToolTipTextSize</code> (default = 5) computing the results of GetToolTipText.</p></li>
 <li>
 <p><code>ilModuleReaderCache</code> - an aged lookup of weak references to "readers" for references .NET binaries. Because these

docs/corelib.html

@@ -43,11 +43,12 @@ <h2><a name="Shipping-an-FSharp-Core-with-your-application" class="anchor" href=
 <p>If doing dynamic compilation and execution you may also need to include
 an FSharp.Core.optdata and FSharp.Core.sigdata, see below for guidance.</p>
 <h2><a name="Binding-redirects-for-your-application" class="anchor" href="#Binding-redirects-for-your-application">Binding redirects for your application</a></h2>
-<p>The FSharp.Compiler.Service.dll component depends on FSharp.Core 4.3.0.0.  Normally your application will target
+<p>The FSharp.Compiler.Service.dll component depends on FSharp.Core 4.4.0.0.  Normally your application will target
 a later version of FSharp.Core, and you will need a <a href="http://msdn.microsoft.com/en-us/library/7wd6ex19(v=vs.110).aspx">binding redirect</a> to ensure
-that FSharp.Core 4.3.0.0 forwards to which the final version of FSharp.Core.dll your application uses.
+that other versions of FSharp.Core forward to the final version of FSharp.Core.dll your application uses.
 Binding redirect files are normally generated automatically by build tools. If not, you can use one like this
 (if your tool is called <code>HostedCompiler.exe</code>, the binding redirect file is called <code>HostedCompiler.exe.config</code>)</p>
+<p>Some other dependencies may also need to be reconciled and forwarded.</p>
 <table class="pre"><tr><td class="lines"><pre class="fssnip"><span class="l"> 1: </span>
 <span class="l"> 2: </span>
 <span class="l"> 3: </span>
@@ -59,14 +60,22 @@ <h2><a name="Binding-redirects-for-your-application" class="anchor" href="#Bindi
 <span class="l"> 9: </span>
 <span class="l">10: </span>
 <span class="l">11: </span>
+<span class="l">12: </span>
+<span class="l">13: </span>
+<span class="l">14: </span>
+<span class="l">15: </span>
 </pre></td>
 <td class="snippet"><pre class="fssnip highlighted"><code lang="fsharp"><span class="o">&lt;?</span><span class="i">xml</span> <span class="i">version</span><span class="o">=</span><span class="s">&quot;1.0&quot;</span> <span class="i">encoding</span><span class="o">=</span><span class="s">&quot;utf-8&quot;</span> <span class="o">?&gt;</span>
 <span class="o">&lt;</span><span class="i">configuration</span><span class="o">&gt;</span>
     <span class="o">&lt;</span><span class="i">runtime</span><span class="o">&gt;</span>
       <span class="o">&lt;</span><span class="i">assemblyBinding</span> <span class="i">xmlns</span><span class="o">=</span><span class="s">&quot;urn:schemas-microsoft-com:asm.v1&quot;</span><span class="o">&gt;</span>
         <span class="o">&lt;</span><span class="i">dependentAssembly</span><span class="o">&gt;</span>
           <span class="o">&lt;</span><span class="i">assemblyIdentity</span> <span class="i">name</span><span class="o">=</span><span class="s">&quot;FSharp.Core&quot;</span> <span class="i">publicKeyToken</span><span class="o">=</span><span class="s">&quot;b03f5f7f11d50a3a&quot;</span> <span class="i">culture</span><span class="o">=</span><span class="s">&quot;neutral&quot;</span><span class="o">/&gt;</span>
-          <span class="o">&lt;</span><span class="i">bindingRedirect</span> <span class="i">oldVersion</span><span class="o">=</span><span class="s">&quot;2.0.0.0-4.3.0.0&quot;</span> <span class="i">newVersion</span><span class="o">=</span><span class="s">&quot;4.3.1.0&quot;</span><span class="o">/&gt;</span>
+          <span class="o">&lt;</span><span class="i">bindingRedirect</span> <span class="i">oldVersion</span><span class="o">=</span><span class="s">&quot;2.0.0.0-4.4.0.0&quot;</span> <span class="i">newVersion</span><span class="o">=</span><span class="s">&quot;4.4.1.0&quot;</span><span class="o">/&gt;</span>
+        <span class="o">&lt;/</span><span class="i">dependentAssembly</span><span class="o">&gt;</span>
+        <span class="o">&lt;</span><span class="i">dependentAssembly</span><span class="o">&gt;</span>
+          <span class="o">&lt;</span><span class="i">assemblyIdentity</span> <span class="i">name</span><span class="o">=</span><span class="s">&quot;System.Collections.Immutable&quot;</span> <span class="i">publicKeyToken</span><span class="o">=</span><span class="s">&quot;b03f5f7f11d50a3a&quot;</span> <span class="i">culture</span><span class="o">=</span><span class="s">&quot;neutral&quot;</span> <span class="o">/&gt;</span>
+          <span class="o">&lt;</span><span class="i">bindingRedirect</span> <span class="i">oldVersion</span><span class="o">=</span><span class="s">&quot;1.0.0.0-1.2.0.0&quot;</span> <span class="i">newVersion</span><span class="o">=</span><span class="s">&quot;1.2.1.0&quot;</span> <span class="o">/&gt;</span>
         <span class="o">&lt;/</span><span class="i">dependentAssembly</span><span class="o">&gt;</span>
       <span class="o">&lt;/</span><span class="i">assemblyBinding</span><span class="o">&gt;</span>
     <span class="o">&lt;/</span><span class="i">runtime</span><span class="o">&gt;</span>	

docs/editor.html

@@ -88,6 +88,8 @@ <h2><a name="Type-checking-sample-source-code" class="anchor" href="#Type-checki
 <span class="l">15: </span>
 <span class="l">16: </span>
 <span class="l">17: </span>
+<span class="l">18: </span>
+<span class="l">19: </span>
 </pre></td>
 <td class="snippet"><pre class="fssnip highlighted"><code lang="fsharp"><span class="c">// Sample input as a multi-line string</span>
 <span class="k">let</span> <span class="i">input</span> <span class="o">=</span> 
@@ -106,22 +108,26 @@ <h2><a name="Type-checking-sample-source-code" class="anchor" href="#Type-checki
 <span class="k">let</span> <span class="i">projOptions</span> <span class="o">=</span> 
     <span class="i">checker</span><span class="o">.</span><span class="i">GetProjectOptionsFromScript</span>(<span class="i">file</span>, <span class="i">input</span>)
     <span class="o">|&gt;</span> <span class="i">Async</span><span class="o">.</span><span class="i">RunSynchronously</span>
+
+<span class="k">let</span> <span class="i">parsingOptions</span>, <span class="i">_errors</span> <span class="o">=</span> <span class="i">checker</span><span class="o">.</span><span class="i">GetParsingOptionsFromProjectOptions</span>(<span class="i">projOptions</span>)
 </code></pre></td>
 </tr>
 </table>
 <p>To perform type checking, we first need to parse the input using
-<code>ParseFileInProject</code>, which gives us access to the <a href="untypedtree.html">untyped AST</a>. However,
+<code>ParseFile</code>, which gives us access to the <a href="untypedtree.html">untyped AST</a>. However,
 then we need to call <code>CheckFileInProject</code> to perform the full type checking. This function
 also requires the result of <code>ParseFileInProject</code>, so the two functions are often called
 together.</p>
 <table class="pre"><tr><td class="lines"><pre class="fssnip"><span class="l">1: </span>
 <span class="l">2: </span>
 <span class="l">3: </span>
 <span class="l">4: </span>
+<span class="l">5: </span>
 </pre></td>
 <td class="snippet"><pre class="fssnip highlighted"><code lang="fsharp"><span class="c">// Perform parsing  </span>
+
 <span class="k">let</span> <span class="i">parseFileResults</span> <span class="o">=</span> 
-    <span class="i">checker</span><span class="o">.</span><span class="i">ParseFileInProject</span>(<span class="i">file</span>, <span class="i">input</span>, <span class="i">projOptions</span>) 
+    <span class="i">checker</span><span class="o">.</span><span class="i">ParseFile</span>(<span class="i">file</span>, <span class="i">input</span>, <span class="i">parsingOptions</span>) 
     <span class="o">|&gt;</span> <span class="i">Async</span><span class="o">.</span><span class="i">RunSynchronously</span>
 </code></pre></td>
 </tr>

docs/fsharp-readme.html

@@ -41,7 +41,7 @@ <h1><a name="F-Compiler-README" class="anchor" href="#F-Compiler-README">F# Comp
 source, with several minor changes that expose certain services. The readme is included
 here for reference.</p>
 </blockquote>
-<p>This is the F# compiler, core library and core tools (open source edition). It uses the Apache 2.0 license.
+<p>This is the F# compiler, core library and core tools (open source edition).
 The <code>master</code> branch is for the latest version of F# (currently F# 3.0).
 To bootstrap the compiler, binaries built from an earlier version of this project are used.</p>
 <h2><a name="Requirements" class="anchor" href="#Requirements">Requirements</a></h2>

docs/index.html

@@ -119,8 +119,7 @@ <h2><a name="Contributing-and-copyright" class="anchor" href="#Contributing-and-
 modified to expose additional internals useful for creating editors and F# tools and also for
 embedding F# interactive.</p>
 <p>The F# source code is copyright by Microsoft Corporation and contributors, the extensions have been
-implemented by Dave Thomas, Anh-Dung Phan, Tomas Petricek and other contributors. The source code
-is available under the <a href="https://github.com/fsharp/FSharp.Compiler.Service/blob/master/LICENSE">Apache 2.0 license</a>.</p>
+implemented by Dave Thomas, Anh-Dung Phan, Tomas Petricek and other contributors.</p>
 
 
         </div>

docs/ja/compiler.html

@@ -13,9 +13,9 @@
     <script src="https://netdna.bootstrapcdn.com/twitter-bootstrap/2.2.1/js/bootstrap.min.js"></script>
     <link href="https://netdna.bootstrapcdn.com/twitter-bootstrap/2.2.1/css/bootstrap-combined.min.css" rel="stylesheet">
 
-    <link type="text/css" rel="stylesheet" href="/FSharp.Compiler.Service/ja/../content/style.ja.css" />
-	<link type="text/css" rel="stylesheet" href="/FSharp.Compiler.Service/ja/../content/fcs.css" />
-    <script type="text/javascript" src="/FSharp.Compiler.Service/ja/../content/tips.js"></script>
+    <link type="text/css" rel="stylesheet" href="./../content/style.ja.css" />
+	<link type="text/css" rel="stylesheet" href="./../content/fcs.css" />
+    <script type="text/javascript" src="./../content/tips.js"></script>
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
       <script src="https://html5shim.googlecode.com/svn/trunk/html5.js"></script>
@@ -150,38 +150,38 @@ <h1><a name="動的アセンブリへのコンパイル" class="anchor" href="#
         </div>
         <div class="span3">
            <a href="https://nuget.org/packages/FSharp.Compiler.Service">
-            <img src="/FSharp.Compiler.Service/ja/../images/logo.png" style="width:140px;height:140px;margin:10px 0px 0px 35px;border-style:none;" />
+            <img src="./../images/logo.png" style="width:140px;height:140px;margin:10px 0px 0px 35px;border-style:none;" />
           </a>
           <ul class="nav nav-list" id="menu">
             <li class="nav-header">
-			<a href="/FSharp.Compiler.Service/ja/../ja/index.html" class="nflag"><img src="/FSharp.Compiler.Service/ja/../images/ja.png" /></a>
-            <a href="/FSharp.Compiler.Service/ja/../index.html" class="nflag nflag2"><img src="/FSharp.Compiler.Service/ja/../images/en.png" /></a>
+			<a href="./../ja/index.html" class="nflag"><img src="./../images/ja.png" /></a>
+            <a href="./../index.html" class="nflag nflag2"><img src="./../images/en.png" /></a>
 			F# Compiler Services
 			</li>
-            <li><a href="/FSharp.Compiler.Service/ja/index.html">ホームページ</a></li>
+            <li><a href="./index.html">ホームページ</a></li>
             <li class="divider"></li>
             <li><a href="https://www.nuget.org/packages/FSharp.Compiler.Service">NuGet経由でライブラリを取得</a></li>
             <li><a href="http://github.com/fsharp/FSharp.Compiler.Service">GitHub上のソースコード</a></li>
             <li><a href="http://github.com/fsharp/FSharp.Compiler.Service/blob/master/LICENSE">ライセンス</a></li>
             <li><a href="http://github.com/fsharp/FSharp.Compiler.Service/blob/master/RELEASE_NOTES.md">リリースノート</a></li>
 
             <li class="nav-header">はじめに</li>
-            <li><a href="/FSharp.Compiler.Service/ja/index.html">ホームページ</a></li>
-            <li><a href="/FSharp.Compiler.Service/ja/devnotes.html">開発者用メモ</a></li>
-            <li><a href="/FSharp.Compiler.Service/ja/fsharp-readme.html">F#コンパイラのreadme</a></li>
+            <li><a href="./index.html">ホームページ</a></li>
+            <li><a href="./devnotes.html">開発者用メモ</a></li>
+            <li><a href="./fsharp-readme.html">F#コンパイラのreadme</a></li>
 
             <li class="nav-header">利用可能なサービス</li>
-            <li><a href="/FSharp.Compiler.Service/ja/tokenizer.html">F#言語トークナイザ</a></li>
-            <li><a href="/FSharp.Compiler.Service/ja/untypedtree.html">型無しASTの処理</a></li>
-            <li><a href="/FSharp.Compiler.Service/ja/editor.html">エディタ(IDE)のサービスを使用する</a></li>
-            <li><a href="/FSharp.Compiler.Service/ja/symbols.html">解決済みのシンボルを使用する</a></li>
-            <li><a href="/FSharp.Compiler.Service/ja/project.html">プロジェクト全体の分析</a></li>
-            <li><a href="/FSharp.Compiler.Service/ja/interactive.html">F# Interactiveの組み込み</a></li>
-            <li><a href="/FSharp.Compiler.Service/ja/compiler.html">F#コンパイラの組み込み</a></li>
-            <li><a href="/FSharp.Compiler.Service/ja/filesystem.html">ファイルシステムの仮想化</a></li>
+            <li><a href="./tokenizer.html">F#言語トークナイザ</a></li>
+            <li><a href="./untypedtree.html">型無しASTの処理</a></li>
+            <li><a href="./editor.html">エディタ(IDE)のサービスを使用する</a></li>
+            <li><a href="./symbols.html">解決済みのシンボルを使用する</a></li>
+            <li><a href="./project.html">プロジェクト全体の分析</a></li>
+            <li><a href="./interactive.html">F# Interactiveの組み込み</a></li>
+            <li><a href="./compiler.html">F#コンパイラの組み込み</a></li>
+            <li><a href="./filesystem.html">ファイルシステムの仮想化</a></li>
 
             <li class="nav-header">リファレンス</li>
-            <li><a href="/FSharp.Compiler.Service/ja/../reference/index.html">API リファレンス</a></li>
+            <li><a href="./../reference/index.html">API リファレンス</a></li>
           </ul>
         </div>
       </div>