[nongnu] elpa/kotlin-mode c40557c411 053/162: Merge pull request #1 from gergoerdi/master

[ELPA Syncer]

branch: elpa/kotlin-mode
commit c40557c4111286b5124af6e99cc09145de23ef57
Merge: 9762ca895d 1624e7d795
Author: Remy Goldschmidt <tak...@gmail.com>
Commit: Remy Goldschmidt <tak...@gmail.com>

    Merge pull request #1 from gergoerdi/master
    
    Comment support, 'nested' and 'inner' class modifiers
---
 kotlin-mode.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kotlin-mode.el b/kotlin-mode.el
index d9d6fc7ae5..8fcff59046 100644
--- a/kotlin-mode.el
+++ b/kotlin-mode.el
@@ -59,7 +59,7 @@
   '("package" "import"))
 
 (defconst kotlin-mode--type-decl-keywords
-  '("data" "class" "trait" "typealias" "enum"))
+  '("nested" "inner" "data" "class" "trait" "typealias" "enum"))
 
 (defconst kotlin-mode--fun-decl-keywords
   '("fun"))
@@ -220,6 +220,10 @@
 
   (setq-local font-lock-defaults '((kotlin-mode-font-lock-keywords) nil nil))
   (setq-local syntax-propertize-function 
#'kotlin-mode--syntax-propertize-function)
+  (set (make-local-variable 'comment-start) "//")
+  (set (make-local-variable 'comment-padding) 1)
+  (set (make-local-variable 'comment-start-skip) "\\(//+\\|/\\*+\\)\\s *")
+  (set (make-local-variable 'comment-end) "")
 
   :group 'kotlin
   :syntax-table kotlin-mode-syntax-table)