summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Mayr <s1410307080@students.fh-hagenberg.at>2015-10-26 16:31:01 +0100
committerWolfgang Mayr <s1410307080@students.fh-hagenberg.at>2015-10-26 16:31:01 +0100
commit51ae7c86e921223b808a85dca72ca1622be713d7 (patch)
treed2746c1d00fcf4c8bd85de530c0211feef1d3734
parent7bc19a5fd1fb7e40c8ec4937a0fe45ddb56b5509 (diff)
downloadpygments-51ae7c86e921223b808a85dca72ca1622be713d7.tar.gz
Added Decorators to TypeScript lexer
-rw-r--r--pygments/lexers/javascript.py2
-rw-r--r--tests/examplefiles/example.ts11
2 files changed, 13 insertions, 0 deletions
diff --git a/pygments/lexers/javascript.py b/pygments/lexers/javascript.py
index 3982c91e..8e2d9797 100644
--- a/pygments/lexers/javascript.py
+++ b/pygments/lexers/javascript.py
@@ -511,6 +511,8 @@ class TypeScriptLexer(RegexLexer):
(r'[0-9]+', Number.Integer),
(r'"(\\\\|\\"|[^"])*"', String.Double),
(r"'(\\\\|\\'|[^'])*'", String.Single),
+ # Match stuff like: Decorators
+ (r'@\w+', Keyword.Declaration),
]
}
diff --git a/tests/examplefiles/example.ts b/tests/examplefiles/example.ts
index 545c6cf5..760e2543 100644
--- a/tests/examplefiles/example.ts
+++ b/tests/examplefiles/example.ts
@@ -21,6 +21,17 @@ class Horse extends Animal {
}
}
+@View({
+ templateUrl: "app/components/LoginForm.html",
+ directives: [FORM_DIRECTIVES, NgIf]
+})
+@Component({
+ selector: "login-form"
+})
+class LoginForm {
+
+}
+
var sam = new Snake("Sammy the Python")
var tom: Animal = new Horse("Tommy the Palomino")