add additional block scope in kwargs to match ref parser

Author: pfitzseb

src/components/internals.jl

@@ -152,8 +152,10 @@ function parse_comma_sep(ps::ParseState, args::Vector{EXPR}, trivia::Vector{EXPR
     @nocloser ps :inwhere @nocloser ps :newline @closer ps :comma while !closer(ps)
         a = parse_expression(ps)
         if kw && _do_kw_convert(ps, a)
-            a = _kw_convert(a)
+            b = _do_block_convert(a)
+            a = _kw_convert(a, b)
         end
+
         push!(args, a)
         if iscomma(ps.nt)
             if istuple

src/utils.jl

@@ -607,12 +607,24 @@ Should `a` be converted to a keyword-argument expression?
 """
 _do_kw_convert(ps::ParseState, a::EXPR) = !ps.closer.brace && isassignment(a)
 
+_do_block_convert(a::EXPR) =
+    a.args[1] !== nothing && isoperator(a.args[1].head) && a.args[1].args !== nothing && a.args[1].args[1].head === :call
+
 """
-    _kw_convert(ps::ParseState, a::EXPR)
+    _kw_convert(a::EXPR, blockwrap = false)
 
 Converted an assignment expression to a keyword-argument expression.
 """
-_kw_convert(x::EXPR) = EXPR(:kw, EXPR[x.args[1], x.args[2]], EXPR[x.head], x.fullspan, x.span)
+_kw_convert(x::EXPR, blockwrap = false) = EXPR(
+    :kw,
+    EXPR[
+        x.args[1],
+        # in some specific cases, the reference parser wraps the RHS of kwargs in an extra block
+        blockwrap ?
+            EXPR(:block, EXPR[x.args[2]], EXPR[], x.args[2].fullspan, x.args[2].span) :
+            x.args[2]
+    ],
+    EXPR[x.head], x.fullspan, x.span)
 
 """
     convertsigtotuple(sig::EXPR)

test/test_check_base.jl

@@ -160,7 +160,7 @@
                         # CSTParser does not support right now. This does not mean that we
                         # cannot parse that file though, just that Expr conversion doesn't
                         # work well
-                        if v"1.10-" <= VERSION < v"1.11-" && basename(file) == "syntax.jl"
+                        if v"1.10-" <= VERSION < v"1.12-" && basename(file) == "syntax.jl"
                             @test_broken false
                         else
                             @test false

test/test_spec.jl

@@ -91,6 +91,13 @@ end
     include("shared.jl")
 
     test_expr("f(a=1)", :call, 4, false)
+    test_expr("f(::typeof(a)=1)", :call, 4, false)
+    test_expr("f(a::typeof(a)=1)", :call, 4, false)
+    test_expr("f(::a=1)", :call, 4, false)
+    test_expr("f(a::a=1)", :call, 4, false)
+
+    test_expr("f(; a::typeof(a)=1)", :call, 4, false)
+    test_expr("f(; a::a=1)", :call, 4, false)
 end
 
 @testitem ":tuple" begin