summaryrefslogtreecommitdiff
path: root/public/vendor/codemirror/mode/soy
diff options
context:
space:
mode:
authorWu Cheng-Han2016-07-30 12:25:24 +0800
committerWu Cheng-Han2016-07-30 12:25:24 +0800
commit1490eafdd26a576dcc3832d1811802c0162dfe84 (patch)
treeabf105de4a0ec1659672643b7583330a421e79bb /public/vendor/codemirror/mode/soy
parentb6ca8649af10d969d86f0e8ff31723321d43087a (diff)
Update CodeMirror to version 5.17.1
Diffstat (limited to 'public/vendor/codemirror/mode/soy')
-rw-r--r--public/vendor/codemirror/mode/soy/soy.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/public/vendor/codemirror/mode/soy/soy.js b/public/vendor/codemirror/mode/soy/soy.js
index 79bfc24d..580c306f 100644
--- a/public/vendor/codemirror/mode/soy/soy.js
+++ b/public/vendor/codemirror/mode/soy/soy.js
@@ -121,10 +121,11 @@
return tokenUntil(stream, state, /\{\/literal}/);
case "string":
- if (stream.match(/^.*?"/)) {
- state.soyState.pop();
- } else {
+ var match = stream.match(/^.*?("|\\[\s\S])/);
+ if (!match) {
stream.skipToEnd();
+ } else if (match[1] == "\"") {
+ state.soyState.pop();
}
return "string";
}