Merge branch 'dgud/emacs-catch-improvements' into dev

* dgud/emacs-catch-improvements:
  Improved indentation of old catch.
  Added more type highlighting and fixed record indentation with types.

3 files changed, 191 insertions, 46 deletions

diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index c31f76025e..91acfdf2b6 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -659,24 +659,30 @@ resulting regexp is surrounded by \\_< and \\_>."
 (eval-and-compile
   (defconst erlang-guards-regexp (erlang-regexp-opt erlang-guards 'symbols)))
 
-
 (eval-and-compile
   (defvar erlang-predefined-types
     '("any"
       "arity"
+      "boolean"
       "byte"
       "char"
       "cons"
       "deep_string"
+      "iolist"
       "maybe_improper_list"
+      "module"
       "mfa"
       "nil"
+      "neg_integer"
       "none"
       "non_neg_integer"
       "nonempty_list"
       "nonempty_improper_list"
       "nonempty_maybe_improper_list"
+      "no_return"
+      "pos_integer"
       "string"
+      "term"
       "timeout")
     "Erlang type specs types"))
 
@@ -2484,9 +2490,10 @@ Value is list (stack token-start token-type in-what)."
 	    ((looking-at "\\(of\\)[^_a-zA-Z0-9]")
 	     ;; Must handle separately, try X of -> catch
 	     (if (and stack (eq (car (car stack)) 'try))
-		 (let ((try-column (nth 2 (car stack))))
+		 (let ((try-column (nth 2 (car stack)))
+		       (try-pos (nth 1 (car stack))))
 		   (erlang-pop stack)
-		   (erlang-push (list 'icr token try-column) stack))))
+		   (erlang-push (list 'icr try-pos try-column) stack))))
 	    
 	    ((looking-at "\\(fun\\)[^_a-zA-Z0-9]")
 	     ;; Push a new layer if we are defining a `fun'
@@ -2747,7 +2754,7 @@ Return nil if inside string, t if in a comment."
            ;;
            ;; `after' should be indented to the same level as the
            ;; corresponding receive.
-           (cond ((looking-at "\\(after\\|catch\\|of\\)\\($\\|[^_a-zA-Z0-9]\\)")
+           (cond ((looking-at "\\(after\\|of\\)\\($\\|[^_a-zA-Z0-9]\\)")
 		  (nth 2 stack-top))
 		 ((looking-at "when[^_a-zA-Z0-9]")
 		  ;; Handling one when part
@@ -2766,7 +2773,7 @@ Return nil if inside string, t if in a comment."
 	  ((and (eq (car stack-top) '||) (looking-at "\\(]\\|>>\\)[^_a-zA-Z0-9]"))
 	   (nth 2 (car (cdr stack))))
           ;; Real indentation, where operators create extra indentation etc.
-          ((memq (car stack-top) '(-> || begin try))
+          ((memq (car stack-top) '(-> || try begin))
 	   (if (looking-at "\\(of\\)[^_a-zA-Z0-9]")
 	       (nth 2 stack-top)
 	     (goto-char (nth 1 stack-top))
@@ -2795,19 +2802,24 @@ Return nil if inside string, t if in a comment."
 			    (erlang-caddr (car stack))
 			  0))
 		       ((looking-at "catch\\($\\|[^_a-zA-Z0-9]\\)")
-			(if (or (eq (car stack-top) 'try)
-				(eq (car (car (cdr stack))) 'icr))
-			    (progn 
-			      (if (eq (car stack-top) '->)
-				  (erlang-pop stack))
-			      (if stack
-				  (erlang-caddr (car stack))
-				0))
-			  base)) ;; old catch 
+			;; Are we in a try
+			(let ((start (if (eq (car stack-top) '->)
+					 (car (cdr stack))
+				       stack-top)))
+			  (if (null start) nil
+			    (goto-char (nth 1 start)))
+			  (cond ((looking-at "try\\($\\|[^_a-zA-Z0-9]\\)")
+				 (progn
+				   (if (eq (car stack-top) '->)
+				       (erlang-pop stack))
+				   (if stack
+				       (erlang-caddr (car stack))
+				     0)))
+				(t (erlang-indent-standard indent-point token base 'nil))))) ;; old catch
 		       (t 
 			(erlang-indent-standard indent-point token base 'nil)
 			))))
-	       ))
+	     ))
 	  ((eq (car stack-top) 'when)
 	   (goto-char (nth 1 stack-top))
 	   (if (looking-at "when\\s *\\($\\|%\\)")
@@ -2833,27 +2845,32 @@ Return nil if inside string, t if in a comment."
              (current-column)))
 	  ;; Type and Spec indentation
 	  ((eq (car stack-top) '::)
-	   (cond ((null erlang-argument-indent)
-		  ;; indent to next column.
-		  (+ 2 (nth 2 stack-top)))
-		 ((looking-at "::[^_a-zA-Z0-9]")
-		  (nth 2 stack-top))
-		 (t
-		  (let ((start-alternativ (if (looking-at "|") 2 0)))
-		    (goto-char (nth 1 stack-top))
-		    (- (cond ((looking-at "::\\s *\\($\\|%\\)")
-			      ;; Line ends with ::
-			      (if (eq (car (car (last stack))) 'spec)
+	   (if (looking-at "}")
+	       ;; Closing record definition with types
+	       ;; pop stack and recurse
+	       (erlang-calculate-stack-indent indent-point
+					      (cons (erlang-pop stack) (cdr state)))
+	     (cond ((null erlang-argument-indent)
+		    ;; indent to next column.
+		    (+ 2 (nth 2 stack-top)))
+		   ((looking-at "::[^_a-zA-Z0-9]")
+		    (nth 2 stack-top))
+		   (t
+		    (let ((start-alternativ (if (looking-at "|") 2 0)))
+		      (goto-char (nth 1 stack-top))
+		      (- (cond ((looking-at "::\\s *\\($\\|%\\)")
+				;; Line ends with ::
+				(if (eq (car (car (last stack))) 'spec)
 				  (+ (erlang-indent-find-preceding-expr 1)
 				     erlang-argument-indent)
-				(+ (erlang-indent-find-preceding-expr 2)
-				   erlang-argument-indent)))
-			     (t
-			      ;; Indent to the same column as the first
-			      ;; argument.
-			      (goto-char (+ 2 (nth 1 stack-top)))
-			      (skip-chars-forward " \t")
-			      (current-column))) start-alternativ)))))	
+				  (+ (erlang-indent-find-preceding-expr 2)
+				     erlang-argument-indent)))
+			       (t
+				;; Indent to the same column as the first
+				;; argument.
+				(goto-char (+ 2 (nth 1 stack-top)))
+				(skip-chars-forward " \t")
+				(current-column))) start-alternativ))))))
 	  )))
 
 (defun erlang-indent-standard (indent-point token base inside-parenthesis)
diff --git a/lib/tools/emacs/test.erl.indented b/lib/tools/emacs/test.erl.indented
index 1dc976d8dc..2948ccf1b5 100644
--- a/lib/tools/emacs/test.erl.indented
+++ b/lib/tools/emacs/test.erl.indented
@@ -93,11 +93,27 @@
 -type t13() :: maybe_improper_list(integer(), t11()). 
 -type t14() :: [erl_scan:foo() | 
 		%% Should be highlighted
-		non_neg_integer() | nonempty_list() | 
+		term() |
+		bool() |
+		byte() |
+		char() |
+		non_neg_integer() | nonempty_list() |
+		pos_integer() |
+		neg_integer() |
+		number() |
+		list() |
 		nonempty_improper_list() | nonempty_maybe_improper_list() |
+		maybe_improper_list() | string() | iolist() | byte() |
+		module() |
+		mfa() 	|
+		node() 	|
+		timeout() |
+		no_return() |
 		%% Should not be highlighted
 		nonempty_() | nonlist() | 
-		erl_scan:bar(34, 92) | t13() | m:f(integer() | <<_:_*16>>)]. 
+		erl_scan:bar(34, 92) | t13() | m:f(integer() | <<_:_*16>>)].
+
+
 -type t15() :: {binary(),<<>>,<<_:34>>,<<_:_*42>>,
 		<<_:3,_:_*14>>,<<>>} | [<<>>|<<_:34>>|<<_:16>>|
 					<<_:3,_:_*1472>>|<<_:19,_:_*14>>| <<_:34>>|
@@ -172,6 +188,9 @@
 	  f19 = 3 :: integer()|undefined,
 	  f5 = 3 :: undefined|integer()}). 
 
+-record(state, {
+	  sequence_number = 1          :: integer()
+	 }).
 
 
 highlighting(X)			  % Function definitions should be highlighted
@@ -493,7 +512,9 @@ indent_try_catch() ->
 	file:close(Xfile)
     end;
 indent_try_catch() ->
-    try foo(bar) of
+    try
+	foo(bar)
+    of
 	X when true andalso
 	       kalle ->
 	    io:format(stdout, "Parsing file ~s, ",
@@ -551,14 +572,57 @@ indent_catch() ->
     C = catch B + 
 	float(43.1),
 
-    case catch (X) of 
+    case catch foo(X) of
+	A ->
+	    B
+    end,
+
+    case
+	catch foo(X)
+    of
 	A ->
 	    B
     end,
+
+    case
+	foo(X)
+    of
+	A ->
+	    catch B,
+	    X
+    end,
+
     try sune of
 	_ -> foo
     catch _:_ -> baf
-    end.
+    end,
+
+    try
+	sune
+    of
+	_ ->
+	    X = 5,
+	    (catch foo(X)),
+	    X + 10
+    catch _:_ -> baf
+    end,
+
+    try
+	(catch sune)
+    of
+	_ ->
+            catch foo()  %% BUGBUG can't handle catch inside try without parentheses
+    catch _:_ ->
+	    baf
+    end,
+
+    try
+	(catch exit())
+    catch
+	_ ->
+	    catch baf()
+    end,
+    ok.
 
 indent_binary() ->
     X = lists:foldr(fun(M) ->
diff --git a/lib/tools/emacs/test.erl.orig b/lib/tools/emacs/test.erl.orig
index feb9e4e5a1..1221c5655e 100644
--- a/lib/tools/emacs/test.erl.orig
+++ b/lib/tools/emacs/test.erl.orig
@@ -93,11 +93,27 @@
 -type t13() :: maybe_improper_list(integer(), t11()). 
 -type t14() :: [erl_scan:foo() | 
         %% Should be highlighted
-	non_neg_integer() | nonempty_list() | 
+	term() |
+	bool() |
+	byte() |
+	char() |
+	non_neg_integer() | nonempty_list() |
+	pos_integer() |
+	neg_integer() |
+	number() |
+	list() |
 	nonempty_improper_list() | nonempty_maybe_improper_list() |
+	maybe_improper_list() | string() | iolist() | byte() |
+	module() |
+	mfa() 	|
+	node() 	|
+	timeout() |
+	no_return() |
 	%% Should not be highlighted
 	nonempty_() | nonlist() | 
-erl_scan:bar(34, 92) | t13() | m:f(integer() | <<_:_*16>>)]. 
+ erl_scan:bar(34, 92) | t13() | m:f(integer() | <<_:_*16>>)].
+
+
 -type t15() :: {binary(),<<>>,<<_:34>>,<<_:_*42>>,
 		<<_:3,_:_*14>>,<<>>} | [<<>>|<<_:34>>|<<_:16>>|
 <<_:3,_:_*1472>>|<<_:19,_:_*14>>| <<_:34>>|
@@ -172,6 +188,9 @@ f18 :: 1 | 2 | 'undefined',
 f19 = 3 :: integer()|undefined,
 f5 = 3 :: undefined|integer()}). 
 
+-record(state, {
+  sequence_number = 1          :: integer()
+  }).
 
 
 highlighting(X)			  % Function definitions should be highlighted
@@ -493,7 +512,9 @@ indent_try_catch() ->
   file:close(Xfile)
  end;
 indent_try_catch() ->
- try foo(bar) of
+ try
+   foo(bar)
+ of
  X when true andalso
  kalle ->
   io:format(stdout, "Parsing file ~s, ",
@@ -551,14 +572,57 @@ indent_catch() ->
   C = catch B + 
      float(43.1),
  
-  case catch (X) of 
+  case catch foo(X) of
   A ->
  B
  end,
+
+ case
+  catch foo(X)
+ of
+ A ->
+   B
+  end,
+
+  case
+  foo(X)
+   of
+ A ->
+	  catch B,
+	  X
+   end,
+
  try sune of
-   _ -> foo
- catch _:_ -> baf
- end.
+ _ -> foo
+   catch _:_ -> baf
+   end,
+
+    try
+sune
+   of
+ _ ->
+   X = 5,
+   (catch foo(X)),
+   X + 10
+   catch _:_ -> baf
+   end,
+
+   try
+ (catch sune)
+   of
+ _ ->
+   catch foo()  %% BUGBUG can't handle catch inside try without parentheses
+   catch _:_ ->
+    baf
+   end,
+
+   try
+(catch exit())
+   catch
+_ ->
+    catch baf()
+   end,
+ ok.
 
 indent_binary() ->
   X = lists:foldr(fun(M) ->