Subject: bug#68612: closed (Re: bug#68612: typescript-ts-mode-test-indentation test fails if tsx grammar not installed)

From: [email-masked] (GNU bug Tracking System)
Date: Sun, 21 Jan 2024 05:13:02 +0000

Your bug report

#68612: typescript-ts-mode-test-indentation test fails if tsx grammar not installed

which was filed against the emacs package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
68612: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=68612
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#68612: typescript-ts-mode-test-indentation test fails if tsx grammar not installed
From: Yuan Fu <[email-masked]>
To: Matthew Smith <[email-masked]>
Cc: [email-masked]
Date: Sat, 20 Jan 2024 21:12:06 -0800
List-Id: <debbugs-submit.debbugs.gnu.org>

> On Jan 20, 2024, at 2:35 AM, Matthew Smith <[email-masked]> wrote:
> 
> Severity: minor
> Tags: patch
> 
> Hi,
> 
> typescript-ts-mode-test-indentation only checks if the typescript
> language grammar is installed before running the test, but the test
> also depends on the tsx language grammar.
> 
> A patch is attached that skips the test unless both typescript and tsx
> grammars are installed.
> 

Thank you Matthew! Pushed to emacs-29.

Yuan

Subject: typescript-ts-mode-test-indentation test fails if tsx grammar not installed
From: Matthew Smith <[email-masked]>
To: [email-masked]
Date: Sat, 20 Jan 2024 10:35:23 +0000
List-Id: <debbugs-submit.debbugs.gnu.org>

Severity: minor
Tags: patch

Hi,

typescript-ts-mode-test-indentation only checks if the typescript
language grammar is installed before running the test, but the test
also depends on the tsx language grammar.

A patch is attached that skips the test unless both typescript and tsx
grammars are installed.

Thanks,
Matthew

From 6a38a3f3d369c79bbeec6b80ad43cbf4cbbff81d Mon Sep 17 00:00:00 2001
From: Matthew Smith <[email-masked]>
Date: Sat, 20 Jan 2024 09:45:31 +0000
Subject: [PATCH] typescript-ts-mode: Skip test if tsx grammar missing

typescript-ts-mode-test-indentation depends on both the tree-sitter
typescript grammar, and the tree-sitter tsx grammar. If only the
typescript is installed, the tests will run and then fail unexpectedly
after tsx fails to load.

* test/lisp/progmodes/typescript-ts-mode-tests.el
(typescript-ts-mode-test-indentation): Skip test if tsx grammar is missing.
---
 test/lisp/progmodes/typescript-ts-mode-tests.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/lisp/progmodes/typescript-ts-mode-tests.el b/test/lisp/progmodes/typescript-ts-mode-tests.el
index 27b7df714e6..effd9551fb0 100644
--- a/test/lisp/progmodes/typescript-ts-mode-tests.el
+++ b/test/lisp/progmodes/typescript-ts-mode-tests.el
@@ -24,7 +24,8 @@
 (require 'treesit)
 
 (ert-deftest typescript-ts-mode-test-indentation ()
-  (skip-unless (treesit-ready-p 'typescript))
+  (skip-unless (and (treesit-ready-p 'typescript)
+                    (treesit-ready-p 'tsx)))
   (ert-test-erts-file (ert-resource-file "indent.erts")))
 
 (provide 'typescript-ts-mode-tests)
-- 
2.43.0