diff options
| author | Matth?us G. Chajdas <dev@anteru.net> | 2019-03-06 19:47:03 +0100 |
|---|---|---|
| committer | Matth?us G. Chajdas <dev@anteru.net> | 2019-03-06 19:47:03 +0100 |
| commit | 424a3cc8c6367ed35c75cb259e199a1567e3e226 (patch) | |
| tree | f33163a52bde98f2c32439dc8cb3d8053b38d47b | |
| parent | e58ac2780e96fe1b33275066891bf2dd03822d56 (diff) | |
| download | pygments-424a3cc8c6367ed35c75cb259e199a1567e3e226.tar.gz | |
Fix #1498.
.typoscript is used for TypoScript files, removing the ambiguity with
TypeScript.
| -rw-r--r-- | pygments/lexers/_mapping.py | 2 | ||||
| -rw-r--r-- | pygments/lexers/javascript.py | 6 | ||||
| -rw-r--r-- | pygments/lexers/typoscript.py | 6 |
3 files changed, 2 insertions, 12 deletions
diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py index 331dadf3..12427b3f 100644 --- a/pygments/lexers/_mapping.py +++ b/pygments/lexers/_mapping.py @@ -428,7 +428,7 @@ LEXERS = { 'TypeScriptLexer': ('pygments.lexers.javascript', 'TypeScript', ('ts', 'typescript'), ('*.ts', '*.tsx'), ('text/x-typescript',)), 'TypoScriptCssDataLexer': ('pygments.lexers.typoscript', 'TypoScriptCssData', ('typoscriptcssdata',), (), ()), 'TypoScriptHtmlDataLexer': ('pygments.lexers.typoscript', 'TypoScriptHtmlData', ('typoscripthtmldata',), (), ()), - 'TypoScriptLexer': ('pygments.lexers.typoscript', 'TypoScript', ('typoscript',), ('*.ts', '*.txt'), ('text/x-typoscript',)), + 'TypoScriptLexer': ('pygments.lexers.typoscript', 'TypoScript', ('typoscript',), ('*.typoscript',), ('text/x-typoscript',)), 'UrbiscriptLexer': ('pygments.lexers.urbi', 'UrbiScript', ('urbiscript',), ('*.u',), ('application/x-urbiscript',)), 'VCLLexer': ('pygments.lexers.varnish', 'VCL', ('vcl',), ('*.vcl',), ('text/x-vclsrc',)), 'VCLSnippetLexer': ('pygments.lexers.varnish', 'VCLSnippets', ('vclsnippets', 'vclsnippet'), (), ('text/x-vclsnippet',)), diff --git a/pygments/lexers/javascript.py b/pygments/lexers/javascript.py index 87c4af2d..0507375f 100644 --- a/pygments/lexers/javascript.py +++ b/pygments/lexers/javascript.py @@ -538,12 +538,6 @@ class TypeScriptLexer(RegexLexer): ], } - def analyse_text(text): - if re.search(r'^(import.+(from\s+)?["\']|' - r'(export\s*)?(interface|class|function)\s+)', - text, re.MULTILINE): - return 1.0 - class LassoLexer(RegexLexer): """ diff --git a/pygments/lexers/typoscript.py b/pygments/lexers/typoscript.py index 6e1c3155..f75a6f02 100644 --- a/pygments/lexers/typoscript.py +++ b/pygments/lexers/typoscript.py @@ -108,7 +108,7 @@ class TypoScriptLexer(RegexLexer): name = 'TypoScript' aliases = ['typoscript'] - filenames = ['*.ts', '*.txt'] + filenames = ['*.typoscript'] mimetypes = ['text/x-typoscript'] flags = re.DOTALL | re.MULTILINE @@ -220,7 +220,3 @@ class TypoScriptLexer(RegexLexer): (r'[\w"\-!/&;]+', Text), ], } - - def analyse_text(text): - if '<INCLUDE_TYPOSCRIPT:' in text: - return 1.0 |