mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-03 20:06:08 +01:00 
			
		
		
		
	upgrade code mirror to 5.65.15 and fix modes requiring multiplex or overlay, fixes #4279
This commit is contained in:
		
							
								
								
									
										6
									
								
								libraries/codemirror/mode/python/python.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								libraries/codemirror/mode/python/python.js
									
									
									
									
										vendored
									
									
								
							@@ -20,7 +20,7 @@
 | 
			
		||||
                        "def", "del", "elif", "else", "except", "finally",
 | 
			
		||||
                        "for", "from", "global", "if", "import",
 | 
			
		||||
                        "lambda", "pass", "raise", "return",
 | 
			
		||||
                        "try", "while", "with", "yield", "in"];
 | 
			
		||||
                        "try", "while", "with", "yield", "in", "False", "True"];
 | 
			
		||||
  var commonBuiltins = ["abs", "all", "any", "bin", "bool", "bytearray", "callable", "chr",
 | 
			
		||||
                        "classmethod", "compile", "complex", "delattr", "dict", "dir", "divmod",
 | 
			
		||||
                        "enumerate", "eval", "filter", "float", "format", "frozenset",
 | 
			
		||||
@@ -60,7 +60,7 @@
 | 
			
		||||
    if (py3) {
 | 
			
		||||
      // since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
 | 
			
		||||
      var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;
 | 
			
		||||
      myKeywords = myKeywords.concat(["nonlocal", "False", "True", "None", "async", "await"]);
 | 
			
		||||
      myKeywords = myKeywords.concat(["nonlocal", "None", "aiter", "anext", "async", "await", "breakpoint", "match", "case"]);
 | 
			
		||||
      myBuiltins = myBuiltins.concat(["ascii", "bytes", "exec", "print"]);
 | 
			
		||||
      var stringPrefixes = new RegExp("^(([rbuf]|(br)|(rb)|(fr)|(rf))?('{3}|\"{3}|['\"]))", "i");
 | 
			
		||||
    } else {
 | 
			
		||||
@@ -68,7 +68,7 @@
 | 
			
		||||
      myKeywords = myKeywords.concat(["exec", "print"]);
 | 
			
		||||
      myBuiltins = myBuiltins.concat(["apply", "basestring", "buffer", "cmp", "coerce", "execfile",
 | 
			
		||||
                                      "file", "intern", "long", "raw_input", "reduce", "reload",
 | 
			
		||||
                                      "unichr", "unicode", "xrange", "False", "True", "None"]);
 | 
			
		||||
                                      "unichr", "unicode", "xrange", "None"]);
 | 
			
		||||
      var stringPrefixes = new RegExp("^(([rubf]|(ur)|(br))?('{3}|\"{3}|['\"]))", "i");
 | 
			
		||||
    }
 | 
			
		||||
    var keywords = wordRegexp(myKeywords);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user