Remove unique ref kinds, specify version

TODO: Tests need fixing

Author: mlechu

src/expr.jl

@@ -76,9 +76,9 @@ function _leaf_to_Expr(source, txtbuf, txtbuf_offset, head, srcrange, node)
         return k == K"error" ?
             Expr(:error) :
             Expr(:error, "$(_token_error_descriptions[k]): `$(source[srcrange])`")
-    elseif k == K"RefBegin"
+    elseif k == K"begin" # begin/end as firstindex/lastindex
         return Expr(:begin)
-    elseif k == K"RefEnd"
+    elseif k == K"end"
         return Expr(:end)
     else
         val = isnothing(node) ?

src/kinds.jl

@@ -198,10 +198,6 @@ register_kinds!(JuliaSyntax, 0, [
         # macro name may not appear as characters in the source: The `@` may be
         # detached from the macro name as in `@A.x` (ugh!!), or have a _str or _cmd
         # suffix appended.
-        "BEGIN_REF_IDENTIFIERS"
-            "RefBegin"
-            "RefEnd"
-        "BEGIN_REF_IDENTIFIERS"
         "BEGIN_MACRO_NAMES"
             "MacroName"
             "StringMacroName"

src/parser.jl

@@ -3627,14 +3627,10 @@ function parse_atom(ps::ParseState, check_identifiers=true, has_unary_prefix=fal
         elseif check_identifiers && is_closing_token(ps, leading_kind)
             # :(end)  ==>  (quote-: (error end))
             bump(ps, error="invalid identifier")
-        elseif ps.end_symbol && leading_kind in KSet"begin end"
+        elseif ps.end_symbol && leading_kind in KSet"begin end" && ps.stream.version >= (1, 12)
             # https://github.com/JuliaLang/julia/issues/57269
             # Parse a[begin] differently from a[var"begin"]
-            if leading_kind == K"begin"
-                bump(ps, remap_kind=K"RefBegin")
-            elseif leading_kind == K"end"
-                bump(ps, remap_kind=K"RefEnd")
-            end
+            bump(ps)
         else
             # Remap keywords to identifiers.
             # :end  ==>  (quote-: end)

test/parser.jl

@@ -410,6 +410,9 @@ tests = [
         "(a=1)[]" =>  "(ref (parens (= a 1)))"
         "a[end]"  =>  "(ref a end)"
         "a[begin]"  =>  "(ref a begin)"
+        "a[var\"end\"]"  =>  "(ref a (var end))"
+        "a[var\"begin\"]"  =>  "(ref a (var begin))"
+        "a[var\"test\"]"  =>  "(ref a (var test))"
         "a[:(end)]" => "(typed_hcat a (quote-: (parens (error-t))) (error-t))"
         "T[x   y]"  =>  "(typed_hcat T x y)"
         "T[x ; y]"  =>  "(typed_vcat T x y)"
@@ -1153,6 +1156,9 @@ parsestmt_with_kind_tests = [
     "a >>= b" => "(op= a::Identifier >>::Identifier b::Identifier)"
     ":+="    => "(quote-: +=::op=)"
     ":.+="   => "(quote-: (. +=::op=))"
+    # TODO: specify version 1.12
+    # "a[begin]" => "(ref a::Identifier begin::begin)"
+    # "a[end]" => "(ref a::Identifier end::end)"
 ]
 
 @testset "parser `Kind` remapping" begin