Merge pull request #398 from julia-vscode/sp/fix-try-catch-finally

fix: correctly parse try expr catch err finally expr end

Author: pfitzseb

Project.toml

@@ -6,13 +6,13 @@ version = "3.4.3"
 [deps]
 Tokenize = "0796e94c-ce3b-5d07-9a54-7f471281c624"
 
+[compat]
+Tokenize = "0.5.29"
+julia = "1"
+
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 TestItemRunner = "f8b46487-2199-4994-9208-9a1283c18c0a"
 
-[compat]
-julia = "1"
-Tokenize = "0.5.29"
-
 [targets]
 test = ["Test", "TestItemRunner"]

src/components/keywords.jl

@@ -457,7 +457,8 @@ function parse_try(ps::ParseState)
     has_finally = false
     if kindof(ps.nt) === Tokens.FINALLY
         has_finally = true
-        if isempty(catchblock.args) && else_trivia === nothing
+
+        if isempty(catchblock.args) && else_trivia === nothing && caught.head === :FALSE
             args[3] = EXPR(:FALSE, 0, 0, "")
         end
         push!(trivia, EXPR(next(ps)))

test/iterate/test_iterators.jl

@@ -866,6 +866,17 @@ end
     @test headof(x[7]) === :block
     @test headof(x[8]) === :END
 
+    x = cst"try expr catch err finally expr3 end"
+    @test length(x) == 8
+    @test headof(x[1]) === :TRY
+    @test headof(x[2]) === :block
+    @test headof(x[3]) === :CATCH
+    @test valof(x[4]) == "err"
+    @test headof(x[5]) === :block
+    @test headof(x[6]) === :FINALLY
+    @test headof(x[7]) === :block
+    @test headof(x[8]) === :END
+
     x = cst"try expr catch err expr2 finally expr3 end"
     @test length(x) == 8
     @test headof(x[1]) === :TRY

test/parser/test_keyword_blocks.jl

@@ -82,6 +82,14 @@ end
     end
     """ |> test_expr
     @test """
+    try
+        f(1)
+    catch err
+    finally
+        stop(f)
+    end
+    """ |> test_expr
+    @test """
     try
         f(1)
     catch err