Steven Collins avatar Steven Collins committed 6e5f723

Modernize and clean up string formatting code in new JSON highlighting.

Comments (0)

Files changed (1)

pygments/lexers/web.py

     filenames = ['*.json']
     mimetypes = [ 'application/json', ]
 
-    number_regexs = {
+    # integer part of a number
+    int_part = r'-?(0|[1-9]\d*)'
         
-        # integer part of a number
-        'int_part': r'-?(0|[1-9]\d*)',
+    # fractional part of a number
+    frac_part = r'\.\d+'
         
-        # fractional part of a number
-        'frac_part': r'\.\d+',
-        
-        # exponential part of a number
-        'exp_part': r'[eE](\+|-)?\d+'
-    }
+    # exponential part of a number
+    exp_part = r'[eE](\+|-)?\d+'
+
 
     flags = re.DOTALL
     tokens = {
         # represents a simple terminal value
         'simplevalue': [
             (r'(true|false|null)\b', Keyword.Constant),
-            ('%(int_part)s(%(frac_part)s%(exp_part)s|%(exp_part)s|%(frac_part)s)' %
-             number_regexs, Number.Float),
-            (number_regexs['int_part'], Number.Integer),
+            (('{int_part!s}({frac_part!s}{exp_part!s}|'
+              '{exp_part!s}|{frac_part!s})').format(**vars()),
+             Number.Float),
+            (int_part, Number.Integer),
             (r'"(\\\\|\\"|[^"])*"', String.Double),
         ],
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.