[nongnu] elpa/kotlin-mode b2c51ab7ba 057/162: Merge pull request #2 from gergoerdi/master

[ELPA Syncer]

branch: elpa/kotlin-mode
commit b2c51ab7ba2821be60306f191d5c0ceb45c37351
Merge: c40557c411 ffd69308ab
Author: Remy Goldschmidt <taktoa@gmail.com>
Commit: Remy Goldschmidt <taktoa@gmail.com>

    Merge pull request #2 from gergoerdi/master
    
    Some enhancements for non-"class" type declarations
---
 kotlin-mode.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kotlin-mode.el b/kotlin-mode.el
index 8fcff59046..aab40459e0 100644
--- a/kotlin-mode.el
+++ b/kotlin-mode.el
@@ -59,7 +59,7 @@
   '("package" "import"))
 
 (defconst kotlin-mode--type-decl-keywords
-  '("nested" "inner" "data" "class" "trait" "typealias" "enum"))
+  '("nested" "inner" "data" "class" "interface" "trait" "typealias" "enum"))
 
 (defconst kotlin-mode--fun-decl-keywords
   '("fun"))
@@ -75,7 +75,7 @@
     ;; Loops
     "while" "for" "do" "continue" "break"
     ;; Miscellaneous
-    "when" "is" "in"))
+    "when" "is" "in" "as"))
 
 (defconst kotlin-mode--context-variables-keywords
   '("this" "super"))
@@ -118,7 +118,7 @@
 
     ;; Classes/Enums
     (,(rx-to-string
-      `(and bow "class" eow (+ space)
+      `(and bow (or ,@kotlin-mode--type-decl-keywords) eow (+ space)
             (group (+ word)) eow)
       t)
      1 font-lock-type-face)