Merge pull request #123 from ronisbr/master

Do not consider `:end` as block ending

julia-mode-tests.el

@@ -433,6 +433,25 @@ function( i=1:2 )
     end
 end")
 
+(ert-deftest julia--test-indent-ignore-:end-as-block-ending ()
+  "Do not consider `:end` as a block ending."
+  (julia--should-indent
+   "if a == :end
+r = 1
+end"
+   "if a == :end
+    r = 1
+end")
+
+  (julia--should-indent
+   "if a == a[end-4:end]
+r = 1
+end"
+   "if a == a[end-4:end]
+    r = 1
+end")
+  )
+
 (ert-deftest julia--test-symbol-font-locking-at-bol ()
   "Symbols get font-locked at beginning or line."
   (julia--should-font-lock

julia-mode.el

@@ -411,8 +411,7 @@ Do not move back beyond position MIN."
         (setq nesting-count
               (cond ((julia-at-keyword julia-block-start-keywords)
                      (+ nesting-count 1))
-                    ((and (equal (current-word t) "end")
-                          (not (julia-in-comment)))
+                    ((julia-at-keyword '("end"))
                      (- nesting-count 1))
                     (t nesting-count))))
       (if (> nesting-count 0)