Skip to content

Commit cb6d1e4

Browse files
nojafnojaf
committed
Update FCS to 'Correct SynAttribute range' (#2557)
* Update FCS to 'Add SynArgPatsNamePatPairsTrivia to SynArgPats.NamePatPairs'. * Ignore test for now. * Update FCS to 'Correct SynAttribute range'. * Add regression test for 2525.
1 parent ed8ea48 commit cb6d1e4

File tree

10 files changed

+295
-233
lines changed

10 files changed

+295
-233
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## [Unreleased]
4+
5+
### Changed
6+
* Update FCS to 'Correct SynAttribute range', commit e389d7744b7ddf81fd62cf01ce870cf92f6dcabd
7+
38
## [5.1.0-alpha-003] - 2022-10-02
49

510
### Changed

‎paket.dependencies‎

Lines changed: 90 additions & 90 deletions
Large diffs are not rendered by default.

‎paket.lock‎

Lines changed: 90 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -172,96 +172,96 @@ GITHUB
172172
remote: fsprojects/fantomas
173173
src/Fantomas/CodePrinter.fs (829faa6ba834f99afed9b4434b3a1680536474b2)
174174
remote: dotnet/fsharp
175-
src/Compiler/AbstractIL/il.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
176-
src/Compiler/AbstractIL/il.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
177-
src/Compiler/AbstractIL/ilascii.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
178-
src/Compiler/AbstractIL/ilascii.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
179-
src/Compiler/AbstractIL/illex.fsl (51635bbebf36e39a86d06d96730e13cfc40a095f)
180-
src/Compiler/AbstractIL/illex.fsl (51635bbebf36e39a86d06d96730e13cfc40a095f)
181-
src/Compiler/AbstractIL/ilpars.fsy (51635bbebf36e39a86d06d96730e13cfc40a095f)
182-
src/Compiler/AbstractIL/ilpars.fsy (51635bbebf36e39a86d06d96730e13cfc40a095f)
183-
src/Compiler/AbstractIL/ilx.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
184-
src/Compiler/AbstractIL/ilx.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
185-
src/Compiler/Checking/CheckDeclarations.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
186-
src/Compiler/Facilities/DiagnosticOptions.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
187-
src/Compiler/Facilities/DiagnosticOptions.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
188-
src/Compiler/Facilities/DiagnosticsLogger.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
189-
src/Compiler/Facilities/DiagnosticsLogger.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
190-
src/Compiler/Facilities/LanguageFeatures.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
191-
src/Compiler/Facilities/LanguageFeatures.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
192-
src/Compiler/Facilities/Logger.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
193-
src/Compiler/Facilities/Logger.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
194-
src/Compiler/Facilities/prim-lexing.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
195-
src/Compiler/Facilities/prim-lexing.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
196-
src/Compiler/Facilities/prim-parsing.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
197-
src/Compiler/Facilities/prim-parsing.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
198-
src/Compiler/Facilities/TextLayoutRender.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
199-
src/Compiler/Facilities/TextLayoutRender.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
200-
src/Compiler/Facilities/UtilsStrings.txt (51635bbebf36e39a86d06d96730e13cfc40a095f)
201-
src/Compiler/FSComp.txt (51635bbebf36e39a86d06d96730e13cfc40a095f)
202-
src/Compiler/FSStrings.resx (51635bbebf36e39a86d06d96730e13cfc40a095f)
203-
src/Compiler/Interactive/FSIstrings.txt (51635bbebf36e39a86d06d96730e13cfc40a095f)
204-
src/Compiler/lex.fsl (51635bbebf36e39a86d06d96730e13cfc40a095f)
205-
src/Compiler/lex.fsl (51635bbebf36e39a86d06d96730e13cfc40a095f)
206-
src/Compiler/pars.fsy (51635bbebf36e39a86d06d96730e13cfc40a095f)
207-
src/Compiler/pars.fsy (51635bbebf36e39a86d06d96730e13cfc40a095f)
208-
src/Compiler/pplex.fsl (51635bbebf36e39a86d06d96730e13cfc40a095f)
209-
src/Compiler/pplex.fsl (51635bbebf36e39a86d06d96730e13cfc40a095f)
210-
src/Compiler/pppars.fsy (51635bbebf36e39a86d06d96730e13cfc40a095f)
211-
src/Compiler/pppars.fsy (51635bbebf36e39a86d06d96730e13cfc40a095f)
212-
src/Compiler/SyntaxTree/LexFilter.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
213-
src/Compiler/SyntaxTree/LexFilter.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
214-
src/Compiler/SyntaxTree/LexHelpers.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
215-
src/Compiler/SyntaxTree/LexHelpers.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
216-
src/Compiler/SyntaxTree/ParseHelpers.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
217-
src/Compiler/SyntaxTree/ParseHelpers.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
218-
src/Compiler/SyntaxTree/PrettyNaming.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
219-
src/Compiler/SyntaxTree/PrettyNaming.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
220-
src/Compiler/SyntaxTree/SyntaxTree.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
221-
src/Compiler/SyntaxTree/SyntaxTree.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
222-
src/Compiler/SyntaxTree/SyntaxTreeOps.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
223-
src/Compiler/SyntaxTree/SyntaxTreeOps.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
224-
src/Compiler/SyntaxTree/SyntaxTrivia.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
225-
src/Compiler/SyntaxTree/SyntaxTrivia.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
226-
src/Compiler/SyntaxTree/UnicodeLexing.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
227-
src/Compiler/SyntaxTree/UnicodeLexing.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
228-
src/Compiler/SyntaxTree/XmlDoc.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
229-
src/Compiler/SyntaxTree/XmlDoc.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
230-
src/Compiler/Utilities/FileSystem.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
231-
src/Compiler/Utilities/FileSystem.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
232-
src/Compiler/Utilities/HashMultiMap.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
233-
src/Compiler/Utilities/HashMultiMap.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
234-
src/Compiler/Utilities/ildiag.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
235-
src/Compiler/Utilities/ildiag.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
236-
src/Compiler/Utilities/illib.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
237-
src/Compiler/Utilities/illib.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
238-
src/Compiler/Utilities/InternalCollections.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
239-
src/Compiler/Utilities/InternalCollections.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
240-
src/Compiler/Utilities/lib.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
241-
src/Compiler/Utilities/lib.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
242-
src/Compiler/Utilities/PathMap.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
243-
src/Compiler/Utilities/PathMap.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
244-
src/Compiler/Utilities/QueueList.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
245-
src/Compiler/Utilities/QueueList.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
246-
src/Compiler/Utilities/range.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
247-
src/Compiler/Utilities/range.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
248-
src/Compiler/Utilities/rational.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
249-
src/Compiler/Utilities/rational.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
250-
src/Compiler/Utilities/ResizeArray.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
251-
src/Compiler/Utilities/ResizeArray.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
252-
src/Compiler/Utilities/RidHelpers.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
253-
src/Compiler/Utilities/sformat.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
254-
src/Compiler/Utilities/sformat.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
255-
src/Compiler/Utilities/sr.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
256-
src/Compiler/Utilities/sr.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
257-
src/Compiler/Utilities/TaggedCollections.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
258-
src/Compiler/Utilities/TaggedCollections.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
259-
src/Compiler/Utilities/XmlAdapters.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
260-
src/Compiler/Utilities/XmlAdapters.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
261-
src/Compiler/Utilities/zmap.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
262-
src/Compiler/Utilities/zmap.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
263-
src/Compiler/Utilities/zset.fs (51635bbebf36e39a86d06d96730e13cfc40a095f)
264-
src/Compiler/Utilities/zset.fsi (51635bbebf36e39a86d06d96730e13cfc40a095f)
175+
src/Compiler/AbstractIL/il.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
176+
src/Compiler/AbstractIL/il.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
177+
src/Compiler/AbstractIL/ilascii.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
178+
src/Compiler/AbstractIL/ilascii.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
179+
src/Compiler/AbstractIL/illex.fsl (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
180+
src/Compiler/AbstractIL/illex.fsl (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
181+
src/Compiler/AbstractIL/ilpars.fsy (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
182+
src/Compiler/AbstractIL/ilpars.fsy (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
183+
src/Compiler/AbstractIL/ilx.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
184+
src/Compiler/AbstractIL/ilx.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
185+
src/Compiler/Checking/CheckDeclarations.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
186+
src/Compiler/Facilities/DiagnosticOptions.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
187+
src/Compiler/Facilities/DiagnosticOptions.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
188+
src/Compiler/Facilities/DiagnosticsLogger.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
189+
src/Compiler/Facilities/DiagnosticsLogger.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
190+
src/Compiler/Facilities/LanguageFeatures.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
191+
src/Compiler/Facilities/LanguageFeatures.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
192+
src/Compiler/Facilities/Logger.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
193+
src/Compiler/Facilities/Logger.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
194+
src/Compiler/Facilities/prim-lexing.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
195+
src/Compiler/Facilities/prim-lexing.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
196+
src/Compiler/Facilities/prim-parsing.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
197+
src/Compiler/Facilities/prim-parsing.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
198+
src/Compiler/Facilities/TextLayoutRender.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
199+
src/Compiler/Facilities/TextLayoutRender.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
200+
src/Compiler/Facilities/UtilsStrings.txt (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
201+
src/Compiler/FSComp.txt (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
202+
src/Compiler/FSStrings.resx (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
203+
src/Compiler/Interactive/FSIstrings.txt (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
204+
src/Compiler/lex.fsl (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
205+
src/Compiler/lex.fsl (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
206+
src/Compiler/pars.fsy (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
207+
src/Compiler/pars.fsy (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
208+
src/Compiler/pplex.fsl (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
209+
src/Compiler/pplex.fsl (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
210+
src/Compiler/pppars.fsy (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
211+
src/Compiler/pppars.fsy (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
212+
src/Compiler/SyntaxTree/LexFilter.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
213+
src/Compiler/SyntaxTree/LexFilter.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
214+
src/Compiler/SyntaxTree/LexHelpers.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
215+
src/Compiler/SyntaxTree/LexHelpers.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
216+
src/Compiler/SyntaxTree/ParseHelpers.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
217+
src/Compiler/SyntaxTree/ParseHelpers.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
218+
src/Compiler/SyntaxTree/PrettyNaming.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
219+
src/Compiler/SyntaxTree/PrettyNaming.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
220+
src/Compiler/SyntaxTree/SyntaxTree.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
221+
src/Compiler/SyntaxTree/SyntaxTree.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
222+
src/Compiler/SyntaxTree/SyntaxTreeOps.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
223+
src/Compiler/SyntaxTree/SyntaxTreeOps.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
224+
src/Compiler/SyntaxTree/SyntaxTrivia.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
225+
src/Compiler/SyntaxTree/SyntaxTrivia.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
226+
src/Compiler/SyntaxTree/UnicodeLexing.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
227+
src/Compiler/SyntaxTree/UnicodeLexing.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
228+
src/Compiler/SyntaxTree/XmlDoc.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
229+
src/Compiler/SyntaxTree/XmlDoc.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
230+
src/Compiler/Utilities/FileSystem.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
231+
src/Compiler/Utilities/FileSystem.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
232+
src/Compiler/Utilities/HashMultiMap.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
233+
src/Compiler/Utilities/HashMultiMap.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
234+
src/Compiler/Utilities/ildiag.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
235+
src/Compiler/Utilities/ildiag.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
236+
src/Compiler/Utilities/illib.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
237+
src/Compiler/Utilities/illib.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
238+
src/Compiler/Utilities/InternalCollections.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
239+
src/Compiler/Utilities/InternalCollections.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
240+
src/Compiler/Utilities/lib.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
241+
src/Compiler/Utilities/lib.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
242+
src/Compiler/Utilities/PathMap.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
243+
src/Compiler/Utilities/PathMap.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
244+
src/Compiler/Utilities/QueueList.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
245+
src/Compiler/Utilities/QueueList.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
246+
src/Compiler/Utilities/range.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
247+
src/Compiler/Utilities/range.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
248+
src/Compiler/Utilities/rational.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
249+
src/Compiler/Utilities/rational.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
250+
src/Compiler/Utilities/ResizeArray.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
251+
src/Compiler/Utilities/ResizeArray.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
252+
src/Compiler/Utilities/RidHelpers.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
253+
src/Compiler/Utilities/sformat.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
254+
src/Compiler/Utilities/sformat.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
255+
src/Compiler/Utilities/sr.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
256+
src/Compiler/Utilities/sr.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
257+
src/Compiler/Utilities/TaggedCollections.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
258+
src/Compiler/Utilities/TaggedCollections.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
259+
src/Compiler/Utilities/XmlAdapters.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
260+
src/Compiler/Utilities/XmlAdapters.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
261+
src/Compiler/Utilities/zmap.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
262+
src/Compiler/Utilities/zmap.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
263+
src/Compiler/Utilities/zset.fs (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
264+
src/Compiler/Utilities/zset.fsi (e389d7744b7ddf81fd62cf01ce870cf92f6dcabd)
265265
GROUP client
266266
STORAGE: NONE
267267
NUGET

‎src/Fantomas.Core.Tests/AttributeTests.fs‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,3 +1098,28 @@ type StreamReaderExtensions =
10981098
// it might still be running after recieving None!
10991099
static member inline Meh(streamReader: StreamReader, timeout: TimeSpan) = ()
11001100
"""
1101+
1102+
[<Test>]
1103+
let ``trivia in nested multiline tuple expression in attribute, 2525`` () =
1104+
formatSourceString
1105+
false
1106+
"""
1107+
[<assembly: SuppressMessage("Gendarme.Rules.Performance",
1108+
"AvoidRepetitiveCallsToPropertiesRule",
1109+
Scope = "member", // MethodDefinition
1110+
Target = "AltCover.Recorder.Instance/I/CallTrack::instance()",
1111+
Justification = "Bytecode delta only")>]
1112+
()
1113+
"""
1114+
config
1115+
|> prepend newline
1116+
|> should
1117+
equal
1118+
"""
1119+
[<assembly: SuppressMessage("Gendarme.Rules.Performance",
1120+
"AvoidRepetitiveCallsToPropertiesRule",
1121+
Scope = "member", // MethodDefinition
1122+
Target = "AltCover.Recorder.Instance/I/CallTrack::instance()",
1123+
Justification = "Bytecode delta only")>]
1124+
()
1125+
"""

‎src/Fantomas.Core.Tests/PatternMatchingTests.fs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2052,6 +2052,7 @@ with
20522052
"""
20532053

20542054
[<Test>]
2055+
[<Ignore "Resolve in https://github.com/fsprojects/fantomas/pull/2551">]
20552056
let ``single line named fields in a pattern matching should have space surrounding the '=', 1877`` () =
20562057
formatSourceString
20572058
false

‎src/Fantomas.Core/AstTransformer.fs‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,6 +1166,21 @@ and visitSynPat (sp: SynPat) : TriviaNode =
11661166
|> finalContinuation
11671167

11681168
Continuation.sequence continuations finalContinuation
1169+
1170+
| SynPat.ListCons (p1, p2, range, trivia) ->
1171+
let continuations: ((TriviaNode -> TriviaNode) -> TriviaNode) list =
1172+
[ visit p1; visit p2 ]
1173+
1174+
let finalContinuation (nodes: TriviaNode list) : TriviaNode =
1175+
mkNodeWithChildren
1176+
SynPat_ListCons
1177+
range
1178+
(sortChildren
1179+
[| yield! nodes
1180+
yield mkNode SynPat_ListCons_ColonColon trivia.ColonColonRange |])
1181+
|> finalContinuation
1182+
1183+
Continuation.sequence continuations finalContinuation
11691184
| SynPat.Ands (pats, range) ->
11701185
let continuations: ((TriviaNode -> TriviaNode) -> TriviaNode) list =
11711186
pats |> List.map visit
@@ -1240,7 +1255,7 @@ and visitSynPat (sp: SynPat) : TriviaNode =
12401255
and visitSynConstructorArgs (ctorArgs: SynArgPats) : TriviaNode list =
12411256
match ctorArgs with
12421257
| SynArgPats.Pats pats -> List.map visitSynPat pats
1243-
| SynArgPats.NamePatPairs (pats, range) ->
1258+
| SynArgPats.NamePatPairs (pats, _, { ParenRange = StartEndRange 1 (lpr, range, rpr) }) ->
12441259
let children =
12451260
pats
12461261
|> List.map (fun (ident, eqRange, pat) ->
@@ -1251,7 +1266,13 @@ and visitSynConstructorArgs (ctorArgs: SynArgPats) : TriviaNode list =
12511266
mkNode SynArgPats_NamePatPairs_Equals eqRange
12521267
visitSynPat pat |])
12531268

1254-
[ mkNodeWithChildren SynArgPats_NamePatPairs range (sortChildren [| yield! children |]) ]
1269+
[ mkNodeWithChildren
1270+
SynArgPats_NamePatPairs
1271+
range
1272+
(sortChildren
1273+
[| yield mkNode SynArgPats_NamePatPairs_OpeningParenthesis lpr
1274+
yield! children
1275+
yield mkNode SynArgPats_NamePatPairs_ClosingParenthesis rpr |]) ]
12551276

12561277
and visitSynComponentInfo (sci: SynComponentInfo) : TriviaNode list =
12571278
match sci with

0 commit comments

Comments
 (0)