[elpa] master 700c024 23/38: Merge pull request #468 from felipeochoa/jsdoc-type

[Dmitry Gutov]

branch: master
commit 700c024d680779d0dadcb9468fdaa8a912c99a39
Merge: ce540d2 4062ae4
Author: Dmitry Gutov <address@hidden>
Commit: GitHub <address@hidden>

    Merge pull request #468 from felipeochoa/jsdoc-type
    
    @type takes a curly-braced arg
---
 js2-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js2-mode.el b/js2-mode.el
index cdcf9e1..0b56364 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -6931,6 +6931,7 @@ of a simple name.  Called before EXPR has a parent node."
              "returns"
              "yield"
              "yields"
+             "type"
              "throw"
              "throws"))
           "\\)\\)\\s-*\\({[^}]+}\\)?")
@@ -6961,7 +6962,6 @@ of a simple name.  Called before EXPR has a parent node."
              "suppress"
              "this"
              "throws"
-             "type"
              "version"))
           "\\)\\)\\s-+\\([^ \t\n]+\\)")
   "Matches jsdoc tags with a single argument.")