codemirror-rails 5.3 → 5.4

data/vendor/assets/javascripts/codemirror/modes/php.js

@@ -17,31 +17,31 @@
     return obj;
   }
 
-  // Helper for stringWithEscapes
-  function matchSequence(list, end) {
-    if (list.length == 0) return stringWithEscapes(end);
+  // Helper for phpString
+  function matchSequence(list, end, escapes) {
+    if (list.length == 0) return phpString(end);
     return function (stream, state) {
       var patterns = list[0];
       for (var i = 0; i < patterns.length; i++) if (stream.match(patterns[i][0])) {
         state.tokenize = matchSequence(list.slice(1), end);
         return patterns[i][1];
       }
-      state.tokenize = stringWithEscapes(end);
+      state.tokenize = phpString(end, escapes);
       return "string";
     };
   }
-  function stringWithEscapes(closing) {
-    return function(stream, state) { return stringWithEscapes_(stream, state, closing); };
+  function phpString(closing, escapes) {
+    return function(stream, state) { return phpString_(stream, state, closing, escapes); };
   }
-  function stringWithEscapes_(stream, state, closing) {
+  function phpString_(stream, state, closing, escapes) {
     // "Complex" syntax
-    if (stream.match("${", false) || stream.match("{$", false)) {
+    if (escapes !== false && stream.match("${", false) || stream.match("{$", false)) {
       state.tokenize = null;
       return "string";
     }
 
     // Simple syntax
-    if (stream.match(/^\$[a-zA-Z_][a-zA-Z0-9_]*/)) {
+    if (escapes !== false && stream.match(/^\$[a-zA-Z_][a-zA-Z0-9_]*/)) {
       // After the variable name there may appear array or object operator.
       if (stream.match("[", false)) {
         // Match array operator
@@ -51,14 +51,14 @@
            [/\$[a-zA-Z_][a-zA-Z0-9_]*/, "variable-2"],
            [/[\w\$]+/, "variable"]],
           [["]", null]]
-        ], closing);
+        ], closing, escapes);
       }
       if (stream.match(/\-\>\w/, false)) {
         // Match object operator
         state.tokenize = matchSequence([
           [["->", null]],
           [[/[\w]+/, "variable"]]
-        ], closing);
+        ], closing, escapes);
       }
       return "variable-2";
     }
@@ -66,8 +66,9 @@
     var escaped = false;
     // Normal string
     while (!stream.eol() &&
-           (escaped || (!stream.match("{$", false) &&
-                        !stream.match(/^(\$[a-zA-Z_][a-zA-Z0-9_]*|\$\{)/, false)))) {
+           (escaped || escapes === false ||
+            (!stream.match("{$", false) &&
+             !stream.match(/^(\$[a-zA-Z_][a-zA-Z0-9_]*|\$\{)/, false)))) {
       if (!escaped && stream.match(closing)) {
         state.tokenize = null;
         state.tokStack.pop(); state.tokStack.pop();
@@ -105,11 +106,13 @@
       },
       "<": function(stream, state) {
         if (stream.match(/<</)) {
+          var nowDoc = stream.eat("'");
           stream.eatWhile(/[\w\.]/);
-          var delim = stream.current().slice(3);
+          var delim = stream.current().slice(3 + (nowDoc ? 1 : 0));
+          if (nowDoc) stream.eat("'");
           if (delim) {
             (state.tokStack || (state.tokStack = [])).push(delim, 0);
-            state.tokenize = stringWithEscapes(delim);
+            state.tokenize = phpString(delim, nowDoc ? false : true);
             return "string";
           }
         }
@@ -128,7 +131,7 @@
       },
       '"': function(_stream, state) {
         (state.tokStack || (state.tokStack = [])).push('"', 0);
-        state.tokenize = stringWithEscapes('"');
+        state.tokenize = phpString('"');
         return "string";
       },
       "{": function(_stream, state) {
@@ -139,7 +142,7 @@
       "}": function(_stream, state) {
         if (state.tokStack && state.tokStack.length > 0 &&
             !--state.tokStack[state.tokStack.length - 1]) {
-          state.tokenize = stringWithEscapes(state.tokStack[state.tokStack.length - 2]);
+          state.tokenize = phpString(state.tokStack[state.tokStack.length - 2]);
         }
         return false;
       }

data/vendor/assets/javascripts/codemirror/modes/python.js

@@ -37,7 +37,7 @@
                         "unichr", "unicode", "xrange", "False", "True", "None"],
              keywords: ["exec", "print"]};
   var py3 = {builtins: ["ascii", "bytes", "exec", "print"],
-             keywords: ["nonlocal", "False", "True", "None"]};
+             keywords: ["nonlocal", "False", "True", "None", "async", "await"]};
 
   CodeMirror.registerHelper("hintWords", "python", commonKeywords.concat(commonBuiltins));
 

data/vendor/assets/javascripts/codemirror/modes/swift.js

@@ -0,0 +1,203 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Swift mode created by Michael Kaminsky https://github.com/mkaminsky11
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object")
+    mod(require("../../lib/codemirror"))
+  else if (typeof define == "function" && define.amd)
+    define(["../../lib/codemirror"], mod)
+  else
+    mod(CodeMirror)
+})(function(CodeMirror) {
+  "use strict"
+
+  function trim(str) { return /^\s*(.*?)\s*$/.exec(str)[1] }
+
+  var separators = [" ","\\\+","\\\-","\\\(","\\\)","\\\*","/",":","\\\?","\\\<","\\\>"," ","\\\."]
+  var tokens = new RegExp(separators.join("|"),"g")
+
+  function getWord(string, pos) {
+    var index = -1, count = 1
+    var words = string.split(tokens)
+    for (var i = 0; i < words.length; i++) {
+      for(var j = 1; j <= words[i].length; j++) {
+        if (count==pos) index = i
+        count++
+      }
+      count++
+    }
+    var ret = ["", ""]
+    if (pos == 0) {
+      ret[1] = words[0]
+      ret[0] = null
+    } else {
+      ret[1] = words[index]
+      ret[0] = words[index-1]
+    }
+    return ret
+  }
+
+  CodeMirror.defineMode("swift", function() {
+    var keywords=["var","let","class","deinit","enum","extension","func","import","init","let","protocol","static","struct","subscript","typealias","var","as","dynamicType","is","new","super","self","Self","Type","__COLUMN__","__FILE__","__FUNCTION__","__LINE__","break","case","continue","default","do","else","fallthrough","if","in","for","return","switch","where","while","associativity","didSet","get","infix","inout","left","mutating","none","nonmutating","operator","override","postfix","precedence","prefix","right","set","unowned","unowned(safe)","unowned(unsafe)","weak","willSet"]
+    var commonConstants=["Infinity","NaN","undefined","null","true","false","on","off","yes","no","nil","null","this","super"]
+    var types=["String","bool","int","string","double","Double","Int","Float","float","public","private","extension"]
+    var numbers=["0","1","2","3","4","5","6","7","8","9"]
+    var operators=["+","-","/","*","%","=","|","&","<",">"]
+    var punc=[";",",",".","(",")","{","}","[","]"]
+    var delimiters=/^(?:[()\[\]{},:`=;]|\.\.?\.?)/
+    var identifiers=/^[_A-Za-z$][_A-Za-z$0-9]*/
+    var properties=/^(@|this\.)[_A-Za-z$][_A-Za-z$0-9]*/
+    var regexPrefixes=/^(\/{3}|\/)/
+
+    return {
+      startState: function() {
+        return {
+          prev: false,
+          string: false,
+          escape: false,
+          inner: false,
+          comment: false,
+          num_left: 0,
+          num_right: 0,
+          doubleString: false,
+          singleString: false
+        }
+      },
+      token: function(stream, state) {
+        if (stream.eatSpace()) return null
+
+        var ch = stream.next()
+        if (state.string) {
+          if (state.escape) {
+            state.escape = false
+            return "string"
+          } else {
+            if ((ch == "\"" && (state.doubleString && !state.singleString) ||
+                 (ch == "'" && (!state.doubleString && state.singleString))) &&
+                !state.escape) {
+              state.string = false
+              state.doubleString = false
+              state.singleString = false
+              return "string"
+            } else if (ch == "\\" && stream.peek() == "(") {
+              state.inner = true
+              state.string = false
+              return "keyword"
+            } else if (ch == "\\" && stream.peek() != "(") {
+              state.escape = true
+              state.string = true
+              return "string"
+            } else {
+              return "string"
+            }
+          }
+        } else if (state.comment) {
+          if (ch == "*" && stream.peek() == "/") {
+            state.prev = "*"
+            return "comment"
+          } else if (ch == "/" && state.prev == "*") {
+            state.prev = false
+            state.comment = false
+            return "comment"
+          }
+          return "comment"
+        } else {
+          if (ch == "/") {
+            if (stream.peek() == "/") {
+              stream.skipToEnd()
+              return "comment"
+            }
+            if (stream.peek() == "*") {
+              state.comment = true
+              return "comment"
+            }
+          }
+          if (ch == "(" && state.inner) {
+            state.num_left++
+            return null
+          }
+          if (ch == ")" && state.inner) {
+            state.num_right++
+            if (state.num_left == state.num_right) {
+              state.inner=false
+              state.string=true
+            }
+            return null
+          }
+
+          var ret = getWord(stream.string, stream.pos)
+          var the_word = ret[1]
+          var prev_word = ret[0]
+
+          if (operators.indexOf(ch + "") > -1) return "operator"
+          if (punc.indexOf(ch) > -1) return "punctuation"
+
+          if (typeof the_word != "undefined") {
+            the_word = trim(the_word)
+            if (typeof prev_word != "undefined") prev_word = trim(prev_word)
+            if (the_word.charAt(0) == "#") return null
+
+            if (types.indexOf(the_word) > -1) return "def"
+            if (commonConstants.indexOf(the_word) > -1) return "atom"
+            if (numbers.indexOf(the_word) > -1) return "number"
+
+            if ((numbers.indexOf(the_word.charAt(0) + "") > -1 ||
+                 operators.indexOf(the_word.charAt(0) + "") > -1) &&
+                numbers.indexOf(ch) > -1) {
+              return "number"
+            }
+
+            if (keywords.indexOf(the_word) > -1 ||
+                keywords.indexOf(the_word.split(tokens)[0]) > -1)
+              return "keyword"
+            if (keywords.indexOf(prev_word) > -1) return "def"
+          }
+          if (ch == '"' && !state.doubleString) {
+            state.string = true
+            state.doubleString = true
+            return "string"
+          }
+          if (ch == "'" && !state.singleString) {
+            state.string = true
+            state.singleString = true
+            return "string"
+          }
+          if (ch == "(" && state.inner)
+            state.num_left++
+          if (ch == ")" && state.inner) {
+            state.num_right++
+            if (state.num_left == state.num_right) {
+              state.inner = false
+              state.string = true
+            }
+            return null
+          }
+          if (stream.match(/^-?[0-9\.]/, false)) {
+            if (stream.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i) ||
+                stream.match(/^-?\d+\.\d*/) ||
+                stream.match(/^-?\.\d+/)) {
+              if (stream.peek() == ".") stream.backUp(1)
+              return "number"
+            }
+            if (stream.match(/^-?0x[0-9a-f]+/i) ||
+                stream.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/) ||
+                stream.match(/^-?0(?![\dx])/i))
+              return "number"
+          }
+          if (stream.match(regexPrefixes)) {
+            if (stream.current()!="/" || stream.match(/^.*\//,false)) return "string"
+            else stream.backUp(1)
+          }
+          if (stream.match(delimiters)) return "punctuation"
+          if (stream.match(identifiers)) return "variable"
+          if (stream.match(properties)) return "property"
+          return "variable"
+        }
+      }
+    }
+  })
+
+  CodeMirror.defineMIME("text/x-swift","swift")
+})

data/vendor/assets/javascripts/codemirror/modes/twig.js

@@ -0,0 +1,132 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("twig", function() {
+    var keywords = ["and", "as", "autoescape", "endautoescape", "block", "do", "endblock", "else", "elseif", "extends", "for", "endfor", "embed", "endembed", "filter", "endfilter", "flush", "from", "if", "endif", "in", "is", "include", "import", "not", "or", "set", "spaceless", "endspaceless", "with", "endwith", "trans", "endtrans", "blocktrans", "endblocktrans", "macro", "endmacro", "use", "verbatim", "endverbatim"],
+        operator = /^[+\-*&%=<>!?|~^]/,
+        sign = /^[:\[\(\{]/,
+        atom = ["true", "false", "null", "empty", "defined", "divisibleby", "divisible by", "even", "odd", "iterable", "sameas", "same as"],
+        number = /^(\d[+\-\*\/])?\d+(\.\d+)?/;
+
+    keywords = new RegExp("((" + keywords.join(")|(") + "))\\b");
+    atom = new RegExp("((" + atom.join(")|(") + "))\\b");
+
+    function tokenBase (stream, state) {
+      var ch = stream.peek();
+
+      //Comment
+      if (state.incomment) {
+        if (!stream.skipTo("#}")) {
+          stream.skipToEnd();
+        } else {
+          stream.eatWhile(/\#|}/);
+          state.incomment = false;
+        }
+        return "comment";
+      //Tag
+      } else if (state.intag) {
+        //After operator
+        if (state.operator) {
+          state.operator = false;
+          if (stream.match(atom)) {
+            return "atom";
+          }
+          if (stream.match(number)) {
+            return "number";
+          }
+        }
+        //After sign
+        if (state.sign) {
+          state.sign = false;
+          if (stream.match(atom)) {
+            return "atom";
+          }
+          if (stream.match(number)) {
+            return "number";
+          }
+        }
+
+        if (state.instring) {
+          if (ch == state.instring) {
+            state.instring = false;
+          }
+          stream.next();
+          return "string";
+        } else if (ch == "'" || ch == '"') {
+          state.instring = ch;
+          stream.next();
+          return "string";
+        } else if (stream.match(state.intag + "}") || stream.eat("-") && stream.match(state.intag + "}")) {
+          state.intag = false;
+          return "tag";
+        } else if (stream.match(operator)) {
+          state.operator = true;
+          return "operator";
+        } else if (stream.match(sign)) {
+          state.sign = true;
+        } else {
+          if (stream.eat(" ") || stream.sol()) {
+            if (stream.match(keywords)) {
+              return "keyword";
+            }
+            if (stream.match(atom)) {
+              return "atom";
+            }
+            if (stream.match(number)) {
+              return "number";
+            }
+            if (stream.sol()) {
+              stream.next();
+            }
+          } else {
+            stream.next();
+          }
+
+        }
+        return "variable";
+      } else if (stream.eat("{")) {
+        if (ch = stream.eat("#")) {
+          state.incomment = true;
+          if (!stream.skipTo("#}")) {
+            stream.skipToEnd();
+          } else {
+            stream.eatWhile(/\#|}/);
+            state.incomment = false;
+          }
+          return "comment";
+        //Open tag
+        } else if (ch = stream.eat(/\{|%/)) {
+          //Cache close tag
+          state.intag = ch;
+          if (ch == "{") {
+            state.intag = "}";
+          }
+          stream.eat("-");
+          return "tag";
+        }
+      }
+      stream.next();
+    };
+
+    return {
+      startState: function () {
+        return {};
+      },
+      token: function (stream, state) {
+        return tokenBase(stream, state);
+      }
+    };
+  });
+
+  CodeMirror.defineMIME("text/x-twig", "twig");
+});

data/vendor/assets/javascripts/codemirror/modes/vb.js

@@ -264,8 +264,9 @@ CodeMirror.defineMode("vb", function(conf, parserConf) {
             if (trueText.match(closing) || trueText.match(doubleClosing) || trueText.match(middle)) return conf.indentUnit*(state.currentIndent-1);
             if(state.currentIndent < 0) return 0;
             return state.currentIndent * conf.indentUnit;
-        }
+        },
 
+        lineComment: "'"
     };
     return external;
 });