diff --git a/CHANGELOG.md b/CHANGELOG.md index f470d52d18..ce9f0a218c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [Unreleased] + +### Changed +* Update FCS to 'Prototype signature files for lex files', commit 5b74995780a0e9d24a5db025e68b31e6d910f71f + ## [6.0.3] - 2023-05-14 ### Fixed diff --git a/Directory.Build.props b/Directory.Build.props index eb91c9c62f..fca503b1ae 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -39,7 +39,7 @@ Some common use cases include: - e267bb9f8d590feed1b94b469d78cfce61afecad + 5b74995780a0e9d24a5db025e68b31e6d910f71f 2.8.28 6.0.1 diff --git a/src/Fantomas.FCS/Fantomas.FCS.fsproj b/src/Fantomas.FCS/Fantomas.FCS.fsproj index 4005c8a660..75131bca54 100644 --- a/src/Fantomas.FCS/Fantomas.FCS.fsproj +++ b/src/Fantomas.FCS/Fantomas.FCS.fsproj @@ -174,7 +174,7 @@ Facilities\prim-parsing.fs - --unicode --lexlib Internal.Utilities.Text.Lexing + --module FSharp.Compiler.AbstractIL.AsciiLexer --internal --open Internal.Utilities.Text.Lexing --open FSharp.Compiler.AbstractIL.AsciiParser --unicode --lexlib Internal.Utilities.Text.Lexing AbstractIL\illex.fsl @@ -211,6 +211,9 @@ AbstractIL\FsYaccOut\ilpars.fs + + AbstractIL\FsLexOut\illex.fsi + AbstractIL\FsLexOut\illex.fs @@ -221,7 +224,7 @@ SyntaxTree\PrettyNaming.fs - --unicode --lexlib Internal.Utilities.Text.Lexing + --module FSharp.Compiler.PPLexer --internal --open FSharp.Compiler.Lexhelp --open Internal.Utilities.Text.Lexing --open FSharp.Compiler.PPParser --unicode --lexlib Internal.Utilities.Text.Lexing SyntaxTree\pplex.fsl @@ -229,7 +232,7 @@ SyntaxTree\pppars.fsy - --unicode --lexlib Internal.Utilities.Text.Lexing + --module FSharp.Compiler.Lexer --open FSharp.Compiler.Lexhelp --open Internal.Utilities.Text.Lexing --open FSharp.Compiler.Parser --open FSharp.Compiler.Text --open FSharp.Compiler.ParseHelpers --internal --unicode --lexlib Internal.Utilities.Text.Lexing SyntaxTree\lex.fsl @@ -302,9 +305,15 @@ SyntaxTree\LexHelpers.fs + + SyntaxTree\FsLexOutput\pplex.fsi + SyntaxTree\FsLexOutput\pplex.fs + + SyntaxTree\FsLexOutput\lex.fsi + SyntaxTree\FsLexOutput\lex.fs @@ -322,7 +331,7 @@ - + diff --git a/src/Fantomas.FCS/packages.lock.json b/src/Fantomas.FCS/packages.lock.json index 9b730c85df..26e990f7a2 100644 --- a/src/Fantomas.FCS/packages.lock.json +++ b/src/Fantomas.FCS/packages.lock.json @@ -22,12 +22,12 @@ }, "FsLexYacc": { "type": "Direct", - "requested": "[11.1.0, )", - "resolved": "11.1.0", - "contentHash": "JoGbIVZVuJs4CsCED0Wi7Winhf6isw0qrblm4hNAdpaZX3Sp5EmPZa07Nhv6SVmoDNPP/HfjCBVtFbaxyzOD2w==", + "requested": "[11.2.0, )", + "resolved": "11.2.0", + "contentHash": "YfCWpEr1z34mtfBLINYLndmsUTLgADnwY1j1WibS1EbuGVVX9r6pkdqmN8/vWqBi5qvY/s7pBjdq51Ks1Dk5MQ==", "dependencies": { "FSharp.Core": "4.6.2", - "FsLexYacc.Runtime": "11.1.0" + "FsLexYacc.Runtime": "11.2.0" } }, "Ionide.KeepAChangelog.Tasks": { @@ -78,8 +78,8 @@ }, "FsLexYacc.Runtime": { "type": "Transitive", - "resolved": "11.1.0", - "contentHash": "NtCnm45VhoJKyz2Ie8OzSSUgrUYQ0TKp2LbgEBeEOr7j6+/0om3lf7NmmoDZDjuNx/KRXb95ZMDjGZRZD92ZfA==", + "resolved": "11.2.0", + "contentHash": "psv1xPIm2NOEdd1RfaBSnN7y6M7XRS69QYB2kP2hD8LKaepGIGM5qAC7xHNpqO1v7QfyMFmuZ5/KqyWhfAfKJg==", "dependencies": { "FSharp.Core": "4.6.2" }