From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 25 Apr 2024 15:59:25 +0000 (+0300)
Subject: Fix last change
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=37766c502a1f8ac09a189bbb585fac727c2665d1;p=emacs.git

Fix last change

* test/lisp/progmodes/csharp-mode-tests.el
(csharp-ts-mode-test-indentation): Move the test to here.
* test/lisp/progmodes/csharp-ts-mode-tests.el: Remove file.
* test/lisp/progmodes/csharp-ts-mode-resources/indent.erts: Move
to test/lisp/progmodes/csharp-mode-resources/indent-ts.erts.

(cherry picked from commit d8687fd6cd807db1c76084a5e2bb214f9b6c9a49)
---

diff --git a/test/lisp/progmodes/csharp-mode-resources/indent-ts.erts b/test/lisp/progmodes/csharp-mode-resources/indent-ts.erts
new file mode 100644
index 00000000000..3cb23608270
--- /dev/null
+++ b/test/lisp/progmodes/csharp-mode-resources/indent-ts.erts
@@ -0,0 +1,51 @@
+Code:
+  (lambda ()
+    (csharp-ts-mode)
+    (indent-region (point-min) (point-max)))
+
+Point-Char: |
+
+Name: Indent single statement body for if/else. (bug#70345)
+
+=-=
+
+int x;
+int y;
+
+if (true)
+    x = 2;
+
+if (true)
+{
+    x = 2;
+}
+
+if (true)
+    x = 2;
+else
+    y = 2;
+
+if (true)
+{
+    x = 2;
+}
+else
+{
+    y = 2;
+}
+
+if (true)
+    x = 2;
+else
+{
+    y = 2;
+}
+
+if (true)
+{
+    x = 2;
+}
+else
+    y = 2;
+
+=-=-=
diff --git a/test/lisp/progmodes/csharp-mode-tests.el b/test/lisp/progmodes/csharp-mode-tests.el
index f50fabf5836..2878fa601f2 100644
--- a/test/lisp/progmodes/csharp-mode-tests.el
+++ b/test/lisp/progmodes/csharp-mode-tests.el
@@ -26,5 +26,8 @@
 (ert-deftest csharp-mode-test-indentation ()
   (ert-test-erts-file (ert-resource-file "indent.erts")))
 
+(ert-deftest csharp-ts-mode-test-indentation ()
+  (ert-test-erts-file (ert-resource-file "indent-ts.erts")))
+
 (provide 'csharp-mode-tests)
 ;;; csharp-mode-tests.el ends here
diff --git a/test/lisp/progmodes/csharp-ts-mode-resources/indent.erts b/test/lisp/progmodes/csharp-ts-mode-resources/indent.erts
deleted file mode 100644
index 3cb23608270..00000000000
--- a/test/lisp/progmodes/csharp-ts-mode-resources/indent.erts
+++ /dev/null
@@ -1,51 +0,0 @@
-Code:
-  (lambda ()
-    (csharp-ts-mode)
-    (indent-region (point-min) (point-max)))
-
-Point-Char: |
-
-Name: Indent single statement body for if/else. (bug#70345)
-
-=-=
-
-int x;
-int y;
-
-if (true)
-    x = 2;
-
-if (true)
-{
-    x = 2;
-}
-
-if (true)
-    x = 2;
-else
-    y = 2;
-
-if (true)
-{
-    x = 2;
-}
-else
-{
-    y = 2;
-}
-
-if (true)
-    x = 2;
-else
-{
-    y = 2;
-}
-
-if (true)
-{
-    x = 2;
-}
-else
-    y = 2;
-
-=-=-=
diff --git a/test/lisp/progmodes/csharp-ts-mode-tests.el b/test/lisp/progmodes/csharp-ts-mode-tests.el
deleted file mode 100644
index 0df0211d86b..00000000000
--- a/test/lisp/progmodes/csharp-ts-mode-tests.el
+++ /dev/null
@@ -1,30 +0,0 @@
-;;; csharp-ts-mode-tests.el --- Tests for Tree-sitter-based C# mode  -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2024 Free Software Foundation, Inc.
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'ert)
-(require 'ert-x)
-(require 'csharp-mode)
-
-(ert-deftest csharp-ts-mode-test-indentation ()
-  (ert-test-erts-file (ert-resource-file "indent.erts")))
-
-(provide 'csharp-ts-mode-tests)
-;;; csharp-ts-mode-tests.el ends here