1.1 --- a/python.editor/src/org/netbeans/modules/python/editor/lexer/PythonLexer.java Sat Jul 04 18:53:16 2015 +0200
1.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/lexer/PythonLexer.java Sat Jun 27 22:22:42 2015 +0200
1.3 @@ -831,11 +831,13 @@
1.4 return PythonTokenId.STD_SYMBOLS;
1.5 }
1.6 break;
1.7 - case 'l': // lambda, len
1.8 + case 'l': // lambda, len, list
1.9 if (length == 6 && TokenUtilities.textEquals(s, "lambda")) { // NOI18N
1.10 return PythonTokenId.ANY_KEYWORD;
1.11 } else if (length == 3 && TokenUtilities.textEquals(s, "len")) { // NOI18N
1.12 return PythonTokenId.STD_SYMBOLS;
1.13 + } else if (length == 4 && TokenUtilities.textEquals(s, "list")) { // NOI18N
1.14 + return PythonTokenId.STD_SYMBOLS;
1.15 }
1.16 break;
1.17 case 'n': // not
1.18 @@ -872,15 +874,21 @@
1.19 }
1.20 }
1.21 break;
1.22 - case 's': // self, str
1.23 + case 's': // self, set, str, super
1.24 if (length == 4 && TokenUtilities.textEquals(s, "self")) { // NOI18N
1.25 return PythonTokenId.ANY_KEYWORD;
1.26 + } else if (length == 3 && TokenUtilities.textEquals(s, "set")) { // NOI18N
1.27 + return PythonTokenId.STD_SYMBOLS;
1.28 } else if (length == 3 && TokenUtilities.textEquals(s, "str")) { // NOI18N
1.29 return PythonTokenId.STD_SYMBOLS;
1.30 + } else if (length == 5 && TokenUtilities.textEquals(s, "super")) { // NOI18N
1.31 + return PythonTokenId.ANY_KEYWORD;
1.32 }
1.33 - case 't': // try, type
1.34 + case 't': // try, tuple, type
1.35 if (length == 3 && TokenUtilities.textEquals(s, "try")) { // NOI18N
1.36 return PythonTokenId.TRY;
1.37 + } else if (length == 5 && TokenUtilities.textEquals(s, "tuple")) { // NOI18N
1.38 + return PythonTokenId.STD_SYMBOLS;
1.39 } else if (length == 4 && TokenUtilities.textEquals(s, "type")) { // NOI18N
1.40 return PythonTokenId.STD_SYMBOLS;
1.41 }