fix python string highlighting

This commit is contained in:
Fabian Jakobs 2011-02-11 15:28:43 +01:00
commit fcf4e764a3

View file

@ -72,7 +72,7 @@ PythonHighlightRules = function() {
("").split("|") ("").split("|")
); );
var strPre = "(?:(?:[rubRUB])|(?:[ubUB][rR]))?"; var strPre = "(?:r|u|ur|R|U|UR|Ur|uR)?";
var decimalInteger = "(?:(?:[1-9]\\d*)|(?:0))"; var decimalInteger = "(?:(?:[1-9]\\d*)|(?:0))";
var octInteger = "(?:0[oO]?[0-7]+)"; var octInteger = "(?:0[oO]?[0-7]+)";
@ -93,24 +93,24 @@ PythonHighlightRules = function() {
regex : "#.*$" regex : "#.*$"
}, { }, {
token : "string", // """ string token : "string", // """ string
regex : strPre + '"{3}(?:(?:.)|(?:^"{3}))*?"{3}' regex : strPre + '"{3}(?:[^\\\\]|\\\\.)*?"{3}'
}, { }, {
token : "string", // multi line """ string start token : "string", // multi line """ string start
regex : strPre + '"{3}.*$', regex : strPre + '"{3}.*$',
next : "qqstring" next : "qqstring"
}, { }, {
token : "string", // " string token : "string", // " string
regex : strPre + '"(?:(?:\\\\.)|(?:[^"\\\\]))*?"' regex : strPre + '"(?:[^\\\\]|\\\\.)*?"'
}, { }, {
token : "string", // ''' string token : "string", // ''' string
regex : strPre + "'{3}(?:(?:.)|(?:^'{3}))*?'{3}" regex : strPre + "'{3}(?:[^\\\\]|\\\\.)*?'{3}"
}, { }, {
token : "string", // multi line ''' string start token : "string", // multi line ''' string start
regex : strPre + "'{3}.*$", regex : strPre + "'{3}.*$",
next : "qstring" next : "qstring"
}, { }, {
token : "string", // ' string token : "string", // ' string
regex : strPre + "'(?:(?:\\\\.)|(?:[^'\\\\]))*?'" regex : strPre + "'(?:[^\\\\]|\\\\.)*?'"
}, { }, {
token : "constant.numeric", // imaginary token : "constant.numeric", // imaginary
regex : "(?:" + floatNumber + "|\\d+)[jJ]\\b" regex : "(?:" + floatNumber + "|\\d+)[jJ]\\b"
@ -153,8 +153,8 @@ PythonHighlightRules = function() {
regex : "\\s+" regex : "\\s+"
} ], } ],
"qqstring" : [ { "qqstring" : [ {
token : "string", // multi line """ string end token : "string", // multi line """ string end
regex : '(?:^"{3})*?"{3}', regex : '(?:[^\\\\]|\\\\.)*?"{3}',
next : "start" next : "start"
}, { }, {
token : "string", token : "string",
@ -162,7 +162,7 @@ PythonHighlightRules = function() {
} ], } ],
"qstring" : [ { "qstring" : [ {
token : "string", // multi line ''' string end token : "string", // multi line ''' string end
regex : "(?:^'{3})*?'{3}", regex : "(?:[^\\\\]|\\\\.)*?'{3}",
next : "start" next : "start"
}, { }, {
token : "string", token : "string",