From f36b7f3c070f7e3552ac728579ae64feb7b617ab Mon Sep 17 00:00:00 2001
From: Abel Braaksma <abel.online@xs4all.nl>
Date: Tue, 11 Aug 2020 12:41:44 +0200
Subject: [PATCH 1/4] Fix showing pars.fs, lex.fs, pppars.fs and pplex.fs in
 sln

---
 .../FSharp.Compiler.Private.fsproj                     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
index 492c6f0f2d2..ce8b93d9bb3 100644
--- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
+++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
@@ -351,10 +351,10 @@
       <Link>ParserAndUntypedAST\ParseHelpers.fs</Link>
     </Compile>
     <Compile Include="$(FsYaccOutputFolder)pppars.fs">
-      <Link>$(FsYaccOutputFolder)ParserAndUntypedAST\pppars.fs</Link>
+      <Link>ParserAndUntypedAST\pppars.fs</Link>
     </Compile>
     <Compile Include="$(FsYaccOutputFolder)pars.fs">
-      <Link>$(FsYaccOutputFolder)ParserAndUntypedAST\pars.fs</Link>
+      <Link>ParserAndUntypedAST\pars.fs</Link>
     </Compile>
     <Compile Include="..\lexhelp.fsi">
       <Link>ParserAndUntypedAST\lexhelp.fsi</Link>
@@ -363,10 +363,10 @@
       <Link>ParserAndUntypedAST\lexhelp.fs</Link>
     </Compile>
     <Compile Include="$(FsYaccOutputFolder)pplex.fs">
-      <Link>$(FsYaccOutputFolder)ParserAndUntypedAST\pplex.fs</Link>
+      <Link>ParserAndUntypedAST\pplex.fs</Link>
     </Compile>
-    <Compile Include="$(FsYaccOutputFolder)lex.fs">
-      <Link>$(FsYaccOutputFolder)ParserAndUntypedAST\lex.fs</Link>
+    <Compile Include="$(FsYaccOutputFolder)\lex.fs">
+      <Link>ParserAndUntypedAST\lex.fs</Link>
     </Compile>
     <Compile Include="..\LexFilter.fs">
       <Link>ParserAndUntypedAST\LexFilter.fs</Link>

From dd6f42c29e3a9fcf882654848fc65a9ae0dee55a Mon Sep 17 00:00:00 2001
From: Abel Braaksma <abel.online@xs4all.nl>
Date: Tue, 11 Aug 2020 12:51:41 +0200
Subject: [PATCH 2/4] Also fix showing ilpars.fs and illex.fs

---
 .../FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
index ce8b93d9bb3..5a2ee0b0af0 100644
--- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
+++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
@@ -242,10 +242,10 @@
       <Link>AbsIL\ilsupp.fs</Link>
     </Compile>
     <Compile Include="$(FsYaccOutputFolder)ilpars.fs">
-      <Link>$(FsYaccOutputFolder)AbsIL\ilpars.fs</Link>
+      <Link>AbsIL\ilpars.fs</Link>
     </Compile>
     <Compile Include="$(FsLexOutputFolder)illex.fs">
-      <Link>$(FsLexOutputFolder)AbsIL\illex.fs</Link>
+      <Link>AbsIL\illex.fs</Link>
     </Compile>
     <Compile Include="..\..\absil\ilbinary.fsi">
       <Link>AbsIL\ilbinary.fsi</Link>

From cd0e9b3a70f881effc13157e7ee75df617682a29 Mon Sep 17 00:00:00 2001
From: Abel Braaksma <abel.online@xs4all.nl>
Date: Tue, 11 Aug 2020 14:09:54 +0200
Subject: [PATCH 3/4] Fix automatic run of fslex/fsyacc when file is dirty

---
 .../FSharp.Compiler.Private.fsproj            | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
index 5a2ee0b0af0..ede38e0f762 100644
--- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
+++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
@@ -192,10 +192,16 @@
       <OtherFlags>--unicode --lexlib Internal.Utilities.Text.Lexing</OtherFlags>
       <Link>AbsIL\illex.fsl</Link>
     </FsLex>
+    <None Include="..\..\absil\illex.fsl">
+      <Link>AbsIL\FsLex\illex.fsl</Link>
+    </None>
     <FsYacc Include="..\..\absil\ilpars.fsy">
       <OtherFlags>--module FSharp.Compiler.AbstractIL.Internal.AsciiParser --open FSharp.Compiler.AbstractIL --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing</OtherFlags>
       <Link>AbsIL\ilpars.fsy</Link>
     </FsYacc>
+    <None Include="..\..\absil\ilpars.fsy">
+      <Link>AbsIL\FsYacc\ilpars.fsy</Link>
+    </None>
     <Compile Include="..\..\absil\il.fsi">
       <Link>AbsIL\il.fsi</Link>
     </Compile>
@@ -326,6 +332,18 @@
       <OtherFlags>--module FSharp.Compiler.Parser --open FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing</OtherFlags>
       <Link>ParserAndUntypedAST\pars.fsy</Link>
     </FsYacc>
+    <None Include="..\pplex.fsl">
+      <Link>ParserAndUntypedAST\FsLex\pplex.fsl</Link>
+    </None>
+    <None Include="..\lex.fsl">
+      <Link>ParserAndUntypedAST\FsLex\lex.fsl</Link>
+    </None>
+    <None Include="..\pppars.fsy">
+      <Link>ParserAndUntypedAST\FsYacc\pppars.fsy</Link>
+    </None>
+    <None Include="..\pars.fsy">
+      <Link>ParserAndUntypedAST\FsYacc\pars.fsy</Link>
+    </None>
     <Compile Include="..\UnicodeLexing.fsi">
       <Link>ParserAndUntypedAST\UnicodeLexing.fsi</Link>
     </Compile>
@@ -351,10 +369,10 @@
       <Link>ParserAndUntypedAST\ParseHelpers.fs</Link>
     </Compile>
     <Compile Include="$(FsYaccOutputFolder)pppars.fs">
-      <Link>ParserAndUntypedAST\pppars.fs</Link>
+      <Link>ParserAndUntypedAST\FsYaccOut\pppars.fs</Link>
     </Compile>
     <Compile Include="$(FsYaccOutputFolder)pars.fs">
-      <Link>ParserAndUntypedAST\pars.fs</Link>
+      <Link>ParserAndUntypedAST\FsYaccOut\pars.fs</Link>
     </Compile>
     <Compile Include="..\lexhelp.fsi">
       <Link>ParserAndUntypedAST\lexhelp.fsi</Link>
@@ -363,10 +381,10 @@
       <Link>ParserAndUntypedAST\lexhelp.fs</Link>
     </Compile>
     <Compile Include="$(FsYaccOutputFolder)pplex.fs">
-      <Link>ParserAndUntypedAST\pplex.fs</Link>
+      <Link>ParserAndUntypedAST\FsLexOut\pplex.fs</Link>
     </Compile>
     <Compile Include="$(FsYaccOutputFolder)\lex.fs">
-      <Link>ParserAndUntypedAST\lex.fs</Link>
+      <Link>ParserAndUntypedAST\FsLexOut\lex.fs</Link>
     </Compile>
     <Compile Include="..\LexFilter.fs">
       <Link>ParserAndUntypedAST\LexFilter.fs</Link>

From c7ad1ddda310fcd47c4771d4062b023258cbe70b Mon Sep 17 00:00:00 2001
From: Abel Braaksma <abel.online@xs4all.nl>
Date: Tue, 11 Aug 2020 15:58:09 +0200
Subject: [PATCH 4/4] Same for AbsIL lex/yacc output, fix order in sln expl

---
 .../FSharp.Compiler.Private.fsproj            | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
index ede38e0f762..579915eb046 100644
--- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
+++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
@@ -220,6 +220,12 @@
     <Compile Include="..\..\absil\ilascii.fs">
       <Link>AbsIL\ilascii.fs</Link>
     </Compile>
+    <Compile Include="$(FsYaccOutputFolder)ilpars.fs">
+      <Link>AbsIL\FsYaccOut\ilpars.fs</Link>
+    </Compile>
+    <Compile Include="$(FsLexOutputFolder)illex.fs">
+      <Link>AbsIL\FsLexOut\illex.fs</Link>
+    </Compile>
     <Compile Include="..\..\absil\ilprint.fsi">
       <Link>AbsIL\ilprint.fsi</Link>
     </Compile>
@@ -247,12 +253,6 @@
     <Compile Include="..\..\absil\ilsupp.fs">
       <Link>AbsIL\ilsupp.fs</Link>
     </Compile>
-    <Compile Include="$(FsYaccOutputFolder)ilpars.fs">
-      <Link>AbsIL\ilpars.fs</Link>
-    </Compile>
-    <Compile Include="$(FsLexOutputFolder)illex.fs">
-      <Link>AbsIL\illex.fs</Link>
-    </Compile>
     <Compile Include="..\..\absil\ilbinary.fsi">
       <Link>AbsIL\ilbinary.fsi</Link>
     </Compile>
@@ -369,10 +369,10 @@
       <Link>ParserAndUntypedAST\ParseHelpers.fs</Link>
     </Compile>
     <Compile Include="$(FsYaccOutputFolder)pppars.fs">
-      <Link>ParserAndUntypedAST\FsYaccOut\pppars.fs</Link>
+      <Link>ParserAndUntypedAST\FsYaccOutput\pppars.fs</Link>
     </Compile>
     <Compile Include="$(FsYaccOutputFolder)pars.fs">
-      <Link>ParserAndUntypedAST\FsYaccOut\pars.fs</Link>
+      <Link>ParserAndUntypedAST\FsYaccOutput\pars.fs</Link>
     </Compile>
     <Compile Include="..\lexhelp.fsi">
       <Link>ParserAndUntypedAST\lexhelp.fsi</Link>
@@ -381,10 +381,10 @@
       <Link>ParserAndUntypedAST\lexhelp.fs</Link>
     </Compile>
     <Compile Include="$(FsYaccOutputFolder)pplex.fs">
-      <Link>ParserAndUntypedAST\FsLexOut\pplex.fs</Link>
+      <Link>ParserAndUntypedAST\FsLexOutput\pplex.fs</Link>
     </Compile>
     <Compile Include="$(FsYaccOutputFolder)\lex.fs">
-      <Link>ParserAndUntypedAST\FsLexOut\lex.fs</Link>
+      <Link>ParserAndUntypedAST\FsLexOutput\lex.fs</Link>
     </Compile>
     <Compile Include="..\LexFilter.fs">
       <Link>ParserAndUntypedAST\LexFilter.fs</Link>