Centralize regex metachar escaping, since the surrogate support breaks

one-parsed-char per unicode codepoint already.

1 files changed, 3 insertions, 8 deletions

diff --git a/pygments/lexers/jvm.py b/pygments/lexers/jvm.py
index 696bb1a1..c8caa2c0 100644
--- a/pygments/lexers/jvm.py
+++ b/pygments/lexers/jvm.py
@@ -789,20 +789,15 @@ class KotlinLexer(RegexLexer):
     # for the range of allowed unicode characters in identifiers,
     # see http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-334.pdf
 
-    def _escape(st):
-        return st.replace(u'\\', ur'\\').replace(u'-', ur'\-').\
-               replace(u'[', ur'\[').replace(u']', ur'\]')
-
     levels = {
         'none': '@?[_a-zA-Z][a-zA-Z0-9_]*',
         'basic': ('@?[_' + uni.Lu + uni.Ll + uni.Lt + uni.Lm + uni.Nl + ']' +
                   '[' + uni.Lu + uni.Ll + uni.Lt + uni.Lm + uni.Nl +
                   uni.Nd + uni.Pc + uni.Cf + uni.Mn + uni.Mc + ']*'),
         'full': ('@?(?:_|[^' +
-                 _escape(uni.allexcept('Lu', 'Ll', 'Lt', 'Lm', 'Lo', 'Nl')) + '])'
-                 + '[^' + _escape(uni.allexcept('Lu', 'Ll', 'Lt', 'Lm', 'Lo',
-                                                'Nl', 'Nd', 'Pc', 'Cf', 'Mn',
-                                                'Mc')) + ']*'),
+                 uni.allexcept('Lu', 'Ll', 'Lt', 'Lm', 'Lo', 'Nl') + '])'
+                 + '[^' + uni.allexcept('Lu', 'Ll', 'Lt', 'Lm', 'Lo', 'Nl',
+                                        'Nd', 'Pc', 'Cf', 'Mn', 'Mc') + ']*'),
     }
 
     tokens = {}