branch: elpa/typescript-mode
commit fe63c579b51c7943f0c78702adbf1547b29cf6ed
Merge: 706f938aef 871c23111a
Author: Jostein Kjønigsen <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #120 from emacs-typescript/tsx-tests
add a test for simple tsx
---
Dockerfile | 14 ++++++++++++++
README.md | 11 +++++++++++
typescript-mode-general-tests.el | 6 ++++++
3 files changed, 31 insertions(+)
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000..de988623e3
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,14 @@
+FROM ubuntu:bionic
+
+RUN apt-get update && \
+ apt-get install -y \
+ make curl python git emacs
+
+RUN curl -fsSL https://raw.githubusercontent.com/cask/cask/master/go | python
+ENV PATH="/root/.cask/bin:${PATH}"
+
+RUN mkdir -p /typescript-mode
+COPY . /typescript-mode
+WORKDIR /typescript-mode
+
+CMD ["make", "test"]
diff --git a/README.md b/README.md
index 0cb72633b2..fb090c3ee0 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,17 @@ to `false`: `tsc --pretty false`. However, doing this does
more than
just turning off the colors. It also causes `tsc` to produce less
elaborate error messages.
+# Contributing
+
+To run the tests you can run `make test`.
+
+If you prefer, you may run the tests via the provided `Dockerfile`.
+
+```bash
+docker build -t typescript-mode .
+docker run --rm -v $(pwd):/typescript-mode typescript-mode
+```
+
# Other Typescript-packages of interest
While `typescript.el` may *not* provide a full kitchen-sink, the good
diff --git a/typescript-mode-general-tests.el b/typescript-mode-general-tests.el
index 7185a3643a..2c022cc1e3 100644
--- a/typescript-mode-general-tests.el
+++ b/typescript-mode-general-tests.el
@@ -349,6 +349,12 @@ function foo<Z, Y, Z & Y, Z | Y | Z, Y<X<X, Y>>>()\n"
(("Z" "Y" "X") . font-lock-type-face)
(("<" ">" "," "&" "|") . nil))))
+(ert-deftest font-lock/tsx ()
+ "Tests that tsx blocks are not considered generics by virtue of the <."
+ (font-lock-test
+ "<div>test</div>"
+ '((("div" . nil)))))
+
(ert-deftest font-lock/regexp ()
"Regular expresssions should be fontified as string constant."
(let ((content "=/foo/ (/bar/ ,/baz/ :/buzz/"))
