[kotlin mode] Improve string tokenizing, add keywords

mode/clike/clike.js

@@ -535,19 +535,36 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     modeProps: {closeBrackets: {triples: '"'}}
   });
 
+  function tokenKotlinString(tripleString){
+    return function (stream, state) {
+      var escaped = false, next, end = false;
+      while (!stream.eol()) {
+        if (!tripleString && !escaped && stream.match('"') ) {end = true; break;}
+        if (tripleString && stream.match('"""')) {end = true; break;}
+        next = stream.next();
+        if(!escaped && next == "$" && stream.match('{'))
+          stream.skipTo("}");
+        escaped = !escaped && next == "\\" && !tripleString;
+      }
+      if (end || !tripleString)
+        state.tokenize = null;
+      return "string";
+    }
+  }
+
   def("text/x-kotlin", {
     name: "clike",
     keywords: words(
       /*keywords*/
       "package as typealias class interface this super val " +
       "var fun for is in This throw return " +
-      "break continue object if else while do try when !in !is as?" +
+      "break continue object if else while do try when !in !is as? " +
 
       /*soft keywords*/
       "file import where by get set abstract enum open inner override private public internal " +
       "protected catch finally out final vararg reified dynamic companion constructor init " +
       "sealed field property receiver param sparam lateinit data inline noinline tailrec " +
-      "external annotation crossinline"
+      "external annotation crossinline const operator infix"
     ),
     types: words(
       /* package java.lang */
@@ -556,10 +573,18 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       "Runtime Runnable SecurityManager Short StackTraceElement StrictMath String " +
       "StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"
     ),
+    intendSwitch: false,
+    indentStatements: false,
     multiLineStrings: true,
     blockKeywords: words("catch class do else finally for if where try while enum"),
     defKeywords: words("class val var object package interface fun"),
     atoms: words("true false null this"),
+    hooks: {
+      '"': function(stream, state) {
+        state.tokenize = tokenKotlinString(stream.match('""'));
+        return state.tokenize(stream, state);
+      }
+    },
     modeProps: {closeBrackets: {triples: '"'}}
   });