Merge branch 'master' of github.com:pygments/pygments

CHANGES

@@ -11,6 +11,7 @@ Version 2.14.0
 
   * GAP session (#2211)
   * func (#2232)
+  * Jsonnet (#2239)
   * MIPS (#2228)
   * Phix (#2222)
   * World of Warcraft TOC format (#2244)

pygments/lexers/_mapping.py

@@ -238,6 +238,7 @@
     'JsonBareObjectLexer': ('pygments.lexers.data', 'JSONBareObject', (), (), ()),
     'JsonLdLexer': ('pygments.lexers.data', 'JSON-LD', ('jsonld', 'json-ld'), ('*.jsonld',), ('application/ld+json',)),
     'JsonLexer': ('pygments.lexers.data', 'JSON', ('json', 'json-object'), ('*.json', 'Pipfile.lock'), ('application/json', 'application/json-object')),
+    'JsonnetLexer': ('pygments.lexers.jsonnet', 'Jsonnet', ('jsonnet',), ('*.jsonnet', '*.libsonnet'), ()),
     'JspLexer': ('pygments.lexers.templates', 'Java Server Page', ('jsp',), ('*.jsp',), ('application/x-jsp',)),
     'JuliaConsoleLexer': ('pygments.lexers.julia', 'Julia console', ('jlcon', 'julia-repl'), (), ()),
     'JuliaLexer': ('pygments.lexers.julia', 'Julia', ('julia', 'jl'), ('*.jl',), ('text/x-julia', 'application/x-julia')),

pygments/lexers/jsonnet.py

@@ -0,0 +1,178 @@
+"""
+    pygments.lexers.jsonnet
+    ~~~~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for Jsonnet data templating language.
+
+    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+from pygments.lexer import (
+    include,
+    RegexLexer,
+    words,
+)
+from pygments.token import (
+    Comment,
+    Keyword,
+    Name,
+    Number,
+    Operator,
+    Punctuation,
+    String,
+    Text,
+    Whitespace,
+)
+
+__all__ = ['JsonnetLexer']
+
+jsonnet_token = r'[^\W\d]\w*'
+jsonnet_function_token = jsonnet_token + r'(?=\()'
+
+
+def string_rules(quote_mark):
+    return [
+        (r"[^{}\\]".format(quote_mark), String),
+        (r"\\.", String.Escape),
+        (quote_mark, String, '#pop'),
+    ]
+
+
+def quoted_field_name(quote_mark):
+    return [
+        (r'([^{quote}\\]|\\.)*{quote}'.format(quote=quote_mark),
+         Name.Variable, 'field_separator')
+    ]
+
+
+class JsonnetLexer(RegexLexer):
+    name = 'Jsonnet'
+    aliases = ['jsonnet']
+    filenames = ['*.jsonnet', '*.libsonnet']
+    url = "https://jsonnet.org"
+    tokens = {
+        # Not used by itself
+        '_comments': [
+            (r'(//|#).*\n', Comment.Single),
+            (r'/\*\*([^/]|/(?!\*))*\*/', String.Doc),
+            (r'/\*([^/]|/(?!\*))*\*/', Comment),
+        ],
+        'root': [
+            include('_comments'),
+            (r"@'.*'", String),
+            (r'@".*"', String),
+            (r"'", String, 'singlestring'),
+            (r'"', String, 'doublestring'),
+            (r'\|\|\|(.|\n)*\|\|\|', String),
+            # Jsonnet has no integers, only an IEEE754 64-bit float
+            (r'[+-]?[0-9]+(.[0-9])?', Number.Float),
+            # Omit : despite spec because it appears to be used as a field
+            # separator
+            (r'[!$~+\-&|^=<>*/%]', Operator),
+            (r'\{', Punctuation, 'object'),
+            (r'\[', Punctuation, 'array'),
+            (r'local\b', Keyword, ('local_name')),
+            (r'assert\b', Keyword, 'assert'),
+            (words([
+                'assert', 'else', 'error', 'false', 'for', 'if', 'import',
+                'importstr', 'in', 'null', 'tailstrict', 'then', 'self',
+                'super', 'true',
+             ], suffix=r'\b'), Keyword),
+            (r'\s+', Whitespace),
+            (r'function(?=\()', Keyword, 'function_params'),
+            (r'std\.' + jsonnet_function_token, Name.Builtin, 'function_args'),
+            (jsonnet_function_token, Name.Function, 'function_args'),
+            (jsonnet_token, Name.Variable),
+            (r'[\.()]', Punctuation),
+        ],
+        'singlestring': string_rules("'"),
+        'doublestring': string_rules('"'),
+        'array': [
+            (r',', Punctuation),
+            (r'\]', Punctuation, '#pop'),
+            include('root'),
+        ],
+        'local_name': [
+            (jsonnet_function_token, Name.Function, 'function_params'),
+            (jsonnet_token, Name.Variable),
+            (r'\s+', Whitespace),
+            ('(?==)', Whitespace, ('#pop', 'local_value')),
+        ],
+        'local_value': [
+            (r'=', Operator),
+            (r';', Punctuation, '#pop'),
+            include('root'),
+        ],
+        'assert': [
+            (r':', Punctuation),
+            (r';', Punctuation, '#pop'),
+            include('root'),
+        ],
+        'function_params': [
+            (jsonnet_token, Name.Variable),
+            (r'\(', Punctuation),
+            (r'\)', Punctuation, '#pop'),
+            (r',', Punctuation),
+            (r'\s+', Whitespace),
+            (r'=', Operator, 'function_param_default'),
+        ],
+        'function_args': [
+            (r'\(', Punctuation),
+            (r'\)', Punctuation, '#pop'),
+            (r',', Punctuation),
+            (r'\s+', Whitespace),
+            include('root'),
+        ],
+        'object': [
+            (r'\s+', Whitespace),
+            (r'local\b', Keyword, 'object_local_name'),
+            (r'assert\b', Keyword, 'object_assert'),
+            (r'\[', Operator, 'field_name_expr'),
+            (fr'(?={jsonnet_token})', Text, 'field_name'),
+            (r'\}', Punctuation, '#pop'),
+            (r'"', Name.Variable, 'double_field_name'),
+            (r"'", Name.Variable, 'single_field_name'),
+            include('_comments'),
+        ],
+        'field_name': [
+            (jsonnet_function_token, Name.Function,
+                ('field_separator', 'function_params')
+             ),
+            (jsonnet_token, Name.Variable, 'field_separator'),
+        ],
+        'double_field_name': quoted_field_name('"'),
+        'single_field_name': quoted_field_name("'"),
+        'field_name_expr': [
+            (r'\]', Operator, 'field_separator'),
+            include('root'),
+        ],
+        'function_param_default': [
+            (r'(?=[,\)])', Whitespace, '#pop'),
+            include('root'),
+        ],
+        'field_separator': [
+            (r'\s+', Whitespace),
+            (r'\+?::?:?', Punctuation, ('#pop', '#pop', 'field_value')),
+            include('_comments'),
+        ],
+        'field_value': [
+            (r',', Punctuation, '#pop'),
+            (r'\}', Punctuation, '#pop:2'),
+            include('root'),
+        ],
+        'object_assert': [
+            (r':', Punctuation),
+            (r',', Punctuation, '#pop'),
+            include('root'),
+        ],
+        'object_local_name': [
+            (jsonnet_token, Name.Variable, ('#pop', 'object_local_value')),
+            (r'\s+', Whitespace),
+        ],
+        'object_local_value': [
+            (r'=', Operator),
+            (r',', Punctuation, '#pop'),
+            (r'\}', Punctuation, '#pop:2'),
+            include('root'),
+        ],
+    }

tests/examplefiles/jsonnet/example.jsonnet

@@ -0,0 +1,74 @@
+/* Multiline /
+comment */
+local x = 100;
+/* Multiline
+comment */
+
+/**
+ * Docs
+ **/
+
+
+local i = import 'foo';
+local foo = 'bar';
+local lambda = function(foo, bar) ['baz', 'qux'];
+local named(foo, bar=10, baz=20) = ['baz', 'qux'];
+local in1troduction = 'introduction';
+assert 5 > 3: "interesting";
+//comment
+{
+  local foo = "bar",
+  spam: 'eggs',
+}
+
+{local foo = "bar"}
+
+
+{
+  // this is a comment
+  # python-style comment
+  assert 1 == 1: 'huh?',
+  spam: 'eggs // /* #',
+  spam2(foo, bar):: 2,
+  spa: 'eggs',
+  foo: 'bar',
+  block: |||
+    Hello
+    Block
+  |||,
+  baz: 'qux' + 'fuzz',
+  'm:oo': 'cow',
+  "b:oo": ('cow'),
+  goo: ['bar', 'ba\nz'],
+  spam3: 2.25,
+  spam4::: -2.25,
+  spam5::: +2.25,
+  spam6//funky
+  : 'hello' //moo
+    , //moo
+  ['spa\'m']: 'eggs',
+  ["spa\"m2"]: "eggs",
+  raw1: @'hello\',
+  raw2: @"hello\",
+  spam7: foo,
+  spam8: lambda(1, 2),
+  spam9: self.spam2(3, 4),
+  intro: in1troduction,
+  spam_10: 10,
+  spam_11(y=10):: 11,
+  spam12: std.type('null'),
+  spam13+: 27,
+  spam14: $.spam13,
+  spam15: ~5,
+  spam16: !false,
+  spam17: 0 - 5,
+  spam18: 5 & 3,
+  spam19: 5 | 3,
+  spam20: 5 ^ 3,
+  spam21: 5 == 3,
+  spam22: 5 < 3,
+  spam23: 5 > 3,
+  spam24: 5 * 3,
+  spam25: 5 / 3,
+  spam26: 5 % 3,
+}