[swift mode] Properly handle empty strings

Author: graue

mode/swift/swift.js

@@ -73,8 +73,9 @@
       stream.match("..")
       return "punctuation"
     }
-    if (ch = stream.match(/("{3}|"|')/)) {
-      var tokenize = tokenString(ch[0])
+    var stringMatch
+    if (stringMatch = stream.match(/("""|"|')/)) {
+      var tokenize = tokenString.bind(null, stringMatch[0])
       state.tokenize.push(tokenize)
       return tokenize(stream, state)
     }
@@ -115,29 +116,29 @@
     }
   }
 
-  function tokenString(quote) {
-    var singleLine = quote.length == 1
-    return function(stream, state) {
-      var ch, escaped = false
-      while (ch = stream.next()) {
-        if (escaped) {
-          if (ch == "(") {
-            state.tokenize.push(tokenUntilClosingParen())
-            return "string"
-          }
-          escaped = false
-        } else if (stream.match(quote)) {
-          state.tokenize.pop()
+  function tokenString(openQuote, stream, state) {
+    var singleLine = openQuote.length == 1
+    var ch, escaped = false
+    while (ch = stream.peek()) {
+      if (escaped) {
+        stream.next()
+        if (ch == "(") {
+          state.tokenize.push(tokenUntilClosingParen())
           return "string"
-        } else {
-          escaped = ch == "\\"
         }
-      }
-      if (singleLine) {
+        escaped = false
+      } else if (stream.match(openQuote)) {
         state.tokenize.pop()
+        return "string"
+      } else {
+        stream.next()
+        escaped = ch == "\\"
       }
-      return "string"
     }
+    if (singleLine) {
+      state.tokenize.pop()
+    }
+    return "string"
   }
 
   function tokenComment(stream, state) {

mode/swift/test.js

@@ -40,7 +40,8 @@
      "[string multi]",
      "[string line]",
      "[string \"test\"]",
-     "[string \"\"\"]");
+     "[string \"\"\"]",
+     "[variable print][punctuation (][string \"\"][punctuation )]");
 
   // Comments.
   MT("comments",