Fix parsing errors using anonymous records and code quotations

docs/release-notes/.FSharp.Compiler.Service/10.0.100.md

@@ -1,6 +1,7 @@
 ### Fixed
 
 * Fix parsing errors using anonymous records and units of measures ([PR #18543](https://github.com/dotnet/fsharp/pull/18543))
+* Fix parsing errors using anonymous records and code quotations ([PR #18603](https://github.com/dotnet/fsharp/pull/18603))
 * Fixed: Allow `return`, `return!`, `yield`, `yield!` type annotations without parentheses ([PR #18533](https://github.com/dotnet/fsharp/pull/18533))
 * Allow `let!` and `use!` type annotations without requiring parentheses ([PR #18508](https://github.com/dotnet/fsharp/pull/18508))
 * Fix find all references for F# exceptions ([PR #18565](https://github.com/dotnet/fsharp/pull/18565))

src/Compiler/Driver/CompilerDiagnostics.fs

@@ -1168,6 +1168,7 @@ type Exception with
                 | Parser.TOKEN_GREATER_RBRACK -> SR.GetString("Parser.TOKEN.GREATER.RBRACK")
                 | Parser.TOKEN_RQUOTE_DOT
                 | Parser.TOKEN_RQUOTE -> SR.GetString("Parser.TOKEN.RQUOTE")
+                | Parser.TOKEN_RQUOTE_BAR_RBRACE -> SR.GetString("Parser.TOKEN.RQUOTE.BAR.RBRACE")
                 | Parser.TOKEN_RBRACK -> SR.GetString("Parser.TOKEN.RBRACK")
                 | Parser.TOKEN_RBRACE
                 | Parser.TOKEN_RBRACE_COMING_SOON

src/Compiler/FSStrings.resx

@@ -360,6 +360,9 @@
   <data name="Parser.TOKEN.GREATER.BAR.RBRACE" xml:space="preserve">
     <value>symbol '&gt;|}'</value>
   </data>  
+  <data name="Parser.TOKEN.RQUOTE.BAR.RBRACE" xml:space="preserve">
+    <value>symbol '@&gt;|}' or '@@&gt;|}'</value>
+  </data>  
   <data name="Parser.TOKEN.GREATER.BAR.RBRACK" xml:space="preserve">
     <value>symbol '&gt;|]'</value>
   </data>

src/Compiler/Service/ServiceLexing.fs

@@ -287,6 +287,7 @@ module internal TokenClassifications =
         | GREATER_BAR_RBRACK -> (FSharpTokenColorKind.Punctuation, FSharpTokenCharKind.Delimiter, FSharpTokenTriggerClass.None)
 
         | RQUOTE _
+        | RQUOTE_BAR_RBRACE _
         | RBRACK
         | RBRACE _
         | RBRACE_COMING_SOON
@@ -1389,6 +1390,7 @@ type FSharpTokenKind =
     | RightArrow
     | GreaterBarRightBracket
     | GreaterBarRightBrace
+    | RQuoteBarRightBrace
     | LeftParenthesisStarRightParenthesis
     | Open
     | Or
@@ -1659,6 +1661,7 @@ type FSharpToken =
         | LQUOTE _ -> FSharpTokenKind.LeftQuote
         | RQUOTE _ -> FSharpTokenKind.RightQuote
         | RQUOTE_DOT _ -> FSharpTokenKind.RightQuoteDot
+        | RQUOTE_BAR_RBRACE _ -> FSharpTokenKind.RQuoteBarRightBrace
         | PERCENT_OP _ -> FSharpTokenKind.PercentOperator
         | BINDER _ -> FSharpTokenKind.Binder
         | LESS _ -> FSharpTokenKind.Less

src/Compiler/Service/ServiceLexing.fsi

@@ -458,6 +458,7 @@ type public FSharpTokenKind =
     | RightArrow
     | GreaterBarRightBracket
     | GreaterBarRightBrace
+    | RQuoteBarRightBrace
     | LeftParenthesisStarRightParenthesis
     | Open
     | Or

src/Compiler/SyntaxTree/LexFilter.fs

@@ -1210,6 +1210,11 @@ type LexFilterImpl (
                             delayToken (pool.UseShiftedLocation(tokenTup, BAR_RBRACK, 1, 0))
                             delayToken (pool.UseShiftedLocation(tokenTup, GREATER res, 0, -2))
                             pool.Return tokenTup
+                        | RQUOTE_BAR_RBRACE x ->
+                            lexbuf.CheckLanguageFeatureAndRecover LanguageFeature.BetterAnonymousRecordParsing lexbuf.LexemeRange
+                            delayToken (pool.UseShiftedLocation(tokenTup, BAR_RBRACE, 1, 0))
+                            delayToken (pool.UseShiftedLocation(tokenTup, RQUOTE(x), 0, -2))
+                            pool.Return tokenTup
                         | GREATER_RBRACK ->
                             delayToken (pool.UseShiftedLocation(tokenTup, RBRACK, 1, 0))
                             delayToken (pool.UseShiftedLocation(tokenTup, GREATER res, 0, -1))
@@ -2631,6 +2636,13 @@ type LexFilterImpl (
                   noMerge()
               true
 
+          | RQUOTE_BAR_RBRACE x ->
+              lexbuf.CheckLanguageFeatureAndRecover LanguageFeature.BetterAnonymousRecordParsing lexbuf.LexemeRange
+              delayToken (pool.UseShiftedLocation(tokenTup, BAR_RBRACE, 1, 0))
+              delayToken (pool.UseShiftedLocation(tokenTup, RQUOTE(x), 0, -2))
+              pool.Return tokenTup
+              true
+
           | _ ->
               false
 

src/Compiler/lex.fsl

@@ -839,6 +839,10 @@ rule token (args: LexArgs) (skip: bool) = parse
 
  | "@@>" { checkExprOp lexbuf; RQUOTE ("<@@ @@>", true) }
 
+ | "@>|}" { RQUOTE_BAR_RBRACE ("<@ @>", false) }
+
+ | "@@>|}" { RQUOTE_BAR_RBRACE ("<@@ @@>", true) }
+
  | '#' { HASH }
 
  | '&' { AMP }

src/Compiler/pars.fsy

@@ -78,7 +78,7 @@ let parse_error_rich = Some(fun (ctxt: ParseErrorContext<_>) ->
 %token <bool> LET YIELD YIELD_BANG AND_BANG
 %token <bool> LESS GREATER /* here the bool indicates if the tokens are part of a type application or type parameter declaration, e.g. C<int>, detected by the lex filter */
 %token <string> PERCENT_OP BINDER
-%token <string * bool> LQUOTE RQUOTE RQUOTE_DOT
+%token <string * bool> LQUOTE RQUOTE RQUOTE_DOT RQUOTE_BAR_RBRACE
 %token BAR_BAR UPCAST DOWNCAST NULL RESERVED MODULE NAMESPACE DELEGATE CONSTRAINT BASE
 %token AND AS ASSERT OASSERT ASR BEGIN DO DONE DOWNTO ELSE ELIF END DOT_DOT DOT_DOT_HAT
 %token EXCEPTION FALSE FOR FUN FUNCTION IF IN JOIN_IN FINALLY DO_BANG