Merge pull request #169 from julia-vscode/tidy

some cleaning
julia-vscode · May 2, 2020 · 819d6b4 · 819d6b4
2 parents 9f80f2b + 5c532fc
commit 819d6b4
Showing 1 changed file with 7 additions and 28 deletions.
diff --git a/src/components/lists.jl b/src/components/lists.jl
@@ -112,10 +112,7 @@ function parse_array(ps::ParseState, isref = false)
             ps.closer.inref = false
             ret = EXPR(Vcat, args)
             push!(ret, first_arg)
-            while kindof(ps.nt) != Tokens.RSQUARE
-                if kindof(ps.nt) == Tokens.ENDMARKER
-                    break
-                end
+            while kindof(ps.nt) !== Tokens.RSQUARE && kindof(ps.nt) !== Tokens.ENDMARKER
                 a = @closesquare ps  parse_expression(ps)
                 push!(ret, a)
             end
@@ -125,10 +122,7 @@ function parse_array(ps::ParseState, isref = false)
         elseif kindof(ps.ws) == WS || kindof(ps.ws) == SemiColonWS
             ps.closer.inref = false
             first_row = EXPR(Hcat, EXPR[first_arg])
-            while kindof(ps.nt) != Tokens.RSQUARE && kindof(ps.ws) != NewLineWS && kindof(ps.ws) != SemiColonWS
-                if kindof(ps.nt) == Tokens.ENDMARKER
-                    break
-                end
+            while kindof(ps.nt) !== Tokens.RSQUARE && kindof(ps.ws) !== NewLineWS && kindof(ps.ws) !== SemiColonWS && kindof(ps.nt) !== Tokens.ENDMARKER
                 a = @closesquare ps @closer ps :ws @closer ps :wsop parse_expression(ps)
                 push!(first_row, a)
             end
@@ -147,16 +141,10 @@ function parse_array(ps::ParseState, isref = false)
                     first_row = EXPR(Row, first_row.args)
                 end
                 ret = EXPR(Vcat, EXPR[args[1], first_row])
-                while kindof(ps.nt) != Tokens.RSQUARE
-                    if kindof(ps.nt) == Tokens.ENDMARKER
-                        break
-                    end
+                while kindof(ps.nt) !== Tokens.RSQUARE && kindof(ps.nt) !== Tokens.ENDMARKER
                     first_arg = @closesquare ps @closer ps :ws @closer ps :wsop parse_expression(ps)
                     push!(ret, EXPR(Row, EXPR[first_arg]))
-                    while kindof(ps.nt) != Tokens.RSQUARE && kindof(ps.ws) != NewLineWS && kindof(ps.ws) != SemiColonWS
-                        if kindof(ps.nt) == Tokens.ENDMARKER
-                            break
-                        end
+                    while kindof(ps.nt) !== Tokens.RSQUARE && kindof(ps.ws) !== NewLineWS && kindof(ps.ws) !== SemiColonWS && kindof(ps.nt) !== Tokens.ENDMARKER
                         a = @closesquare ps @closer ps :ws @closer ps :wsop parse_expression(ps)
                         push!(last(ret.args), a)
                     end
@@ -261,10 +249,7 @@ function parse_barray(ps::ParseState)
         elseif kindof(ps.ws) == NewLineWS
             ret = EXPR(BracesCat, args)
             push!(ret, first_arg)
-            while kindof(ps.nt) != Tokens.RBRACE
-                if kindof(ps.nt) == Tokens.ENDMARKER
-                    break
-                end
+            while kindof(ps.nt) != Tokens.RBRACE && kindof(ps.nt) !== Tokens.ENDMARKER
                 a = @closebrace ps  parse_expression(ps)
                 push!(ret, a)
             end
@@ -273,10 +258,7 @@ function parse_barray(ps::ParseState)
             return ret
         elseif kindof(ps.ws) == WS || kindof(ps.ws) == SemiColonWS
             first_row = EXPR(Row, EXPR[first_arg])
-            while kindof(ps.nt) != Tokens.RBRACE && kindof(ps.ws) != NewLineWS && kindof(ps.ws) != SemiColonWS
-                if kindof(ps.nt) == Tokens.ENDMARKER
-                    break
-                end
+            while kindof(ps.nt) !== Tokens.RBRACE && kindof(ps.ws) !== NewLineWS && kindof(ps.ws) !== SemiColonWS && kindof(ps.nt) !== Tokens.ENDMARKER
                 a = @closebrace ps @closer ps :ws @closer ps :wsop parse_expression(ps)
                 push!(first_row, a)
             end
@@ -300,10 +282,7 @@ function parse_barray(ps::ParseState)
                     end
                     first_arg = @closebrace ps @closer ps :ws @closer ps :wsop parse_expression(ps)
                     push!(ret, EXPR(Row, EXPR[first_arg]))
-                    while kindof(ps.nt) != Tokens.RBRACE && kindof(ps.ws) != NewLineWS && kindof(ps.ws) != SemiColonWS
-                        if kindof(ps.nt) == Tokens.ENDMARKER
-                            break
-                        end
+                    while kindof(ps.nt) !== Tokens.RBRACE && kindof(ps.ws) !== NewLineWS && kindof(ps.ws) !== SemiColonWS && kindof(ps.nt) !== Tokens.ENDMARKER
                         a = @closebrace ps @closer ps :ws @closer ps :wsop parse_expression(ps)
                         push!(last(ret.args), a)
                     end