Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Smithy Lexer (#1878) #1879

Merged
merged 3 commits into from Aug 8, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
Expand Up @@ -227,6 +227,7 @@ Other contributors, listed alphabetically, are:
* Matthias Vallentin -- Bro lexer
* Benoît Vinot -- AMPL lexer
* Linh Vu Hong -- RSL lexer
* Immanuel Washington -- Smithy lexer
* Nathan Weizenbaum -- Haml and Sass lexers
* Nathan Whetsell -- Csound lexers
* Dietmar Winkler -- Modelica lexer
Expand Down
1 change: 1 addition & 0 deletions doc/languages.rst
Expand Up @@ -280,6 +280,7 @@ Other markup
* Scdoc
* Sieve
* Singularity
* `Smithy <https://awslabs.github.io/smithy/>`_
* SPARQL
* SQL, also MySQL, SQLite
* Squid configuration
Expand Down
1 change: 1 addition & 0 deletions pygments/lexers/_mapping.py
Expand Up @@ -431,6 +431,7 @@
'SmalltalkLexer': ('pygments.lexers.smalltalk', 'Smalltalk', ('smalltalk', 'squeak', 'st'), ('*.st',), ('text/x-smalltalk',)),
'SmartGameFormatLexer': ('pygments.lexers.sgf', 'SmartGameFormat', ('sgf',), ('*.sgf',), ()),
'SmartyLexer': ('pygments.lexers.templates', 'Smarty', ('smarty',), ('*.tpl',), ('application/x-smarty',)),
'SmithyLexer': ('pygments.lexers.smithy', 'Smithy', ('smithy', 'Smithy'), ('*.smithy',), ()),
'SnobolLexer': ('pygments.lexers.snobol', 'Snobol', ('snobol',), ('*.snobol',), ('text/x-snobol',)),
'SnowballLexer': ('pygments.lexers.dsls', 'Snowball', ('snowball',), ('*.sbl',), ()),
'SolidityLexer': ('pygments.lexers.solidity', 'Solidity', ('solidity',), ('*.sol',), ()),
Expand Down
60 changes: 60 additions & 0 deletions pygments/lexers/smithy.py
@@ -0,0 +1,60 @@
# -*- coding: utf-8 -*-
"""
Smithy IDL lexer
~~~~~~~~~~~~~~~~

Lexers for the Smithy IDL.
"""
Anteru marked this conversation as resolved.
Show resolved Hide resolved

import re

from pygments.lexer import RegexLexer, default, include, bygroups
from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
Number, Literal

__all__ = ['SmithyLexer']


class SmithyLexer(RegexLexer):
"""
For Smithy IDL
Anteru marked this conversation as resolved.
Show resolved Hide resolved
"""
name = 'Smithy'
filenames = ['*.smithy']
aliases = ['smithy', 'Smithy']

flags = re.MULTILINE | re.UNICODE
unquoted = r'[A-Z-a-z0-9_\.#$-]+'
identifier = r"[A-Z-a-z0-9_\.#$-]+"

tokens = {
'root': [
(r'///.*$', Comment.Multiline),
(r'//.*$', Comment),
(r'@[0-9a-zA-Z\.#-]*', Name.Decorator),
(r'(=)', Name.Decorator),
(r'^(\$version)(:)(.+)', bygroups(Keyword.Declaration, Name.Decorator, Name.Class)),
(r'^(namespace)(\s+' + identifier + r')\b', bygroups(Keyword.Declaration, Name.Class)),
(r'^(use|byte|short|integer|long|float|'
r'document|double|bigInteger|bigDecimal|boolean|blob|string|timestamp)(\s+' + identifier + r')\b',
bygroups(Keyword.Declaration, Name.Class)),
(r'^(apply|list|map|set|structure|union|resource|operation|service|trait)(\s+' + identifier + r')',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have a words() function to efficiently match lists of words, can you please change those two to use that?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah cool, added.

bygroups(Keyword.Declaration, Name.Class)),
(r'^(metadata)(\s+.+)\s*(=)',
bygroups(Keyword.Declaration, Name.Class, Name.Decorator)),
(r"(true|false|null)", Keyword.Constant),
(r"(-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?)", Number),
(identifier + ":", Name.Label),
(identifier, Name.Variable.Class),
(r'\[', Text, "#push"),
(r'\]', Text, "#pop"),
(r'\(', Text, "#push"),
(r'\)', Text, "#pop"),
(r'{', Text, "#push"),
(r'}', Text, "#pop"),
(r'"{3}(\\\\|\n|\\")*"{3}', String.Doc),
(r'"(\\\\|\n|\\"|[^"])*"', String.Double),
(r"'(\\\\|\n|\\'|[^'])*'", String.Single),
(r'[:,\s]+', Text),
Anteru marked this conversation as resolved.
Show resolved Hide resolved
]
}