aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMichael Albinus2023-01-15 18:50:00 +0100
committerMichael Albinus2023-01-15 18:50:00 +0100
commit9ec60fde2e8b2b144a04d05031a83469abe7846f (patch)
tree4b8ee01a5604c6bcb94a3fa8142b0d733d446446 /test
parent4d37504c432aad019a68698e590912a538c09d36 (diff)
parent0052aa54f6bf4f23f5f6068f593b5b0c4a72b0e6 (diff)
downloademacs-9ec60fde2e8b2b144a04d05031a83469abe7846f.tar.gz
emacs-9ec60fde2e8b2b144a04d05031a83469abe7846f.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'test')
-rw-r--r--test/lisp/erc/resources/networks/merge-server/track.eld2
-rw-r--r--test/lisp/minibuffer-tests.el2
-rw-r--r--test/lisp/progmodes/c-ts-mode-resources/filling.erts198
-rw-r--r--test/lisp/progmodes/c-ts-mode-resources/indent.erts121
-rw-r--r--test/lisp/progmodes/c-ts-mode-tests.el4
-rw-r--r--test/manual/indent/octave.m2
6 files changed, 325 insertions, 4 deletions
diff --git a/test/lisp/erc/resources/networks/merge-server/track.eld b/test/lisp/erc/resources/networks/merge-server/track.eld
index 4a97f92f722..19c37aaf40b 100644
--- a/test/lisp/erc/resources/networks/merge-server/track.eld
+++ b/test/lisp/erc/resources/networks/merge-server/track.eld
@@ -21,7 +21,7 @@
21 (0.00 ":irc.example.net 376 tester :End of message of the day.")) 21 (0.00 ":irc.example.net 376 tester :End of message of the day."))
22 22
23((mode 10 "MODE tester +i") 23((mode 10 "MODE tester +i")
24 (0.00 ":irc.example.net 501 tester x :is not a recognised user mode.") 24 (0.00 ":irc.example.net 501 tester x :is not a recognized user mode.")
25 (0.00 ":NickServ!NickServ@services.int NOTICE tester :Welcome to FooNet, tester! Here on FooNet, we provide services to enable the registration of nicknames and channels! For details, type \2/msg NickServ help\2 and \2/msg ChanServ help\2.") 25 (0.00 ":NickServ!NickServ@services.int NOTICE tester :Welcome to FooNet, tester! Here on FooNet, we provide services to enable the registration of nicknames and channels! For details, type \2/msg NickServ help\2 and \2/msg ChanServ help\2.")
26 (0.02 ":tester!user@10.0.2.100 MODE tester :+i")) 26 (0.02 ":tester!user@10.0.2.100 MODE tester :+i"))
27 27
diff --git a/test/lisp/minibuffer-tests.el b/test/lisp/minibuffer-tests.el
index 2ac5e0f29d6..1de8e56cbd4 100644
--- a/test/lisp/minibuffer-tests.el
+++ b/test/lisp/minibuffer-tests.el
@@ -421,7 +421,7 @@
421 (switch-to-completions) 421 (switch-to-completions)
422 ;; Fixed in bug#55430 422 ;; Fixed in bug#55430
423 (should (equal "aa" (get-text-property (point) 'completion--string))) 423 (should (equal "aa" (get-text-property (point) 'completion--string)))
424 (next-completion 3) 424 (next-completion 2)
425 (should (equal "ac" (get-text-property (point) 'completion--string))) 425 (should (equal "ac" (get-text-property (point) 'completion--string)))
426 (previous-completion 2) 426 (previous-completion 2)
427 (should (equal "aa" (get-text-property (point) 'completion--string))) 427 (should (equal "aa" (get-text-property (point) 'completion--string)))
diff --git a/test/lisp/progmodes/c-ts-mode-resources/filling.erts b/test/lisp/progmodes/c-ts-mode-resources/filling.erts
new file mode 100644
index 00000000000..e51e3658c83
--- /dev/null
+++ b/test/lisp/progmodes/c-ts-mode-resources/filling.erts
@@ -0,0 +1,198 @@
1Code:
2 (lambda ()
3 (c-ts-mode)
4 (setq-local indent-tabs-mode nil)
5 (fill-paragraph))
6
7Point-Char: |
8
9Name: Type 1
10
11=-=
12/* woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
13 * woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
14 * woooomy woooomy woooomy woooomy woooomy woooomy woooomy
15 */
16=-=
17/* woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
18 * woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
19 * woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
20 */
21=-=-=
22
23Name: Type 2
24
25=-=
26/* woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
27 * woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
28 woooomy woooomy woooomy woooomy woooomy woooomy woooomy
29 */
30=-=
31/* woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
32 * woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
33 * woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
34 */
35=-=-=
36
37Name: Type 3
38
39=-=
40/*================================================================
41 woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
42 woooomy woooomy woooomy woooomy woooomy woooomy woooomy
43 woooomy woooomy woooomy woooomy woooomy woooomy woooomy
44 ================================================================*/
45=-=
46/*================================================================
47 woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
48 woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
49 woooomy woooomy woooomy woooomy woooomy woooomy woooomy
50 ================================================================*/
51=-=-=
52
53Name: Type 4
54
55=-=
56/*================================================================
57 * woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
58 woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
59 woooomy woooomy woooomy woooomy woooomy
60 * ================================================================*/
61=-=
62/*================================================================
63 * woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
64 * woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
65 * woooomy woooomy woooomy woooomy woooomy
66 * ================================================================*/
67=-=-=
68
69Name: Type 5
70
71/* woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
72 * woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
73 * woooomy woooomy woooomy woooomy woooomy woooomy woooomy
74 */
75=-=
76/* woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
77 * woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
78 * woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
79 */
80=-=-=
81
82Name: Type 6
83
84=-=
85/* woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
86 woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
87 woooomy woooomy woooomy woooomy woooomy woooomy woooomy
88 */
89=-=
90/* woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
91 woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
92 woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
93 */
94=-=-=
95
96Name: Type 6
97
98=-=
99/* woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
100 woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
101 woooomy woooomy woooomy woooomy woooomy woooomy woooomy
102 */
103=-=
104/* woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
105 woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
106 woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
107 */
108=-=-=
109
110Name: Type 7
111
112=-=
113// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
114// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
115// woooomy woooomy woooomy woooomy woooomy woooomy woooomy
116=-=
117// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
118// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
119// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
120=-=-=
121
122Name: Type 8
123
124=-=
125// ================================================================
126// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
127// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
128// woooomy woooomy woooomy woooomy woooomy woooomy woooomy
129// ================================================================
130=-=
131// ================================================================
132// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
133// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
134// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
135// ================================================================
136=-=-=
137
138Name: Type 9
139
140=-=
141/* woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
142 woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
143 woooomy woooomy woooomy woooomy woooomy woooomy woooomyyy */
144=-=
145/* woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
146 woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
147 woooomy woooomy woooomy woooomy woooomy woooomy woooomy
148 woooomyyy */
149=-=-=
150
151Name: Not Over Fill 1
152
153=-=
154// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
155// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
156// woooomy woooomy woooomy woooomy woooomy woooomy woooomy
157
158// |woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
159// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
160// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
161
162// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
163// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
164// woooomy woooomy woooomy woooomy woooomy woooomy woooomy
165=-=-=
166
167Name: Not Over Fill 2
168
169=-=
170// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
171return; // woooomy woooomy woooomy woooomy woooomy woooomy woooomy
172//| woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
173// woooomy woooomy woooomy woooomy woooomy woooomy woooomy
174return; // woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
175=-=
176// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
177return; // woooomy woooomy woooomy woooomy woooomy woooomy woooomy
178// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
179// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
180return; // woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
181=-=-=
182
183Name: Not Over Fill 3
184
185=-=
186// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
187return; //| woooomy woooomy woooomy woooomy woooomy woooomy woooomy
188// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
189// woooomy woooomy woooomy woooomy woooomy woooomy woooomy
190return; // woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
191=-=
192// woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
193return; // woooomy woooomy woooomy woooomy woooomy woooomy woooomy
194 // woooomy woooomy woooomy woooomy woooomy woooomy woooomy
195 // woooomy woooomy woooomy woooomy woooomy woooomy woooomy
196 // woooomy woooomy
197return; // woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy
198=-=-=
diff --git a/test/lisp/progmodes/c-ts-mode-resources/indent.erts b/test/lisp/progmodes/c-ts-mode-resources/indent.erts
index 5defcbd3c83..71524e273f3 100644
--- a/test/lisp/progmodes/c-ts-mode-resources/indent.erts
+++ b/test/lisp/progmodes/c-ts-mode-resources/indent.erts
@@ -1,8 +1,13 @@
1Code: 1Code:
2 (lambda () 2 (lambda ()
3 (setq indent-tabs-mode nil)
4 (setq c-ts-mode-indent-offset 2)
5 (setq c-ts-mode-indent-style 'gnu)
3 (c-ts-mode) 6 (c-ts-mode)
4 (indent-region (point-min) (point-max))) 7 (indent-region (point-min) (point-max)))
5 8
9Point-Char: |
10
6Name: Basic 11Name: Basic
7 12
8=-= 13=-=
@@ -25,6 +30,68 @@ main (void)
25} 30}
26=-=-= 31=-=-=
27 32
33Name: Labels (GNU Style)
34
35=-=
36int
37main (void)
38{
39 label:
40 return 0;
41 if (true)
42 {
43 label:
44 return 0;
45 }
46 else
47 {
48 if (true)
49 {
50 label:
51 return 0;
52 }
53 }
54}
55=-=-=
56
57Name: For Loop with Multi-line Condition (GNU Style)
58
59=-=
60int main()
61{
62 for (int i = 0;
63 i < b;
64 i++)
65 {
66 return 0;
67 }
68}
69=-=-=
70
71Name: If-Else (GNU Style)
72
73=-=
74int main()
75{
76 if (true)
77 {
78 return 0;
79 }
80 else
81 {
82 return 1;
83 }
84}
85=-=-=
86
87Name: Empty Line
88=-=
89int main()
90{
91 |
92}
93=-=-=
94
28Name: Multiline Parameter List (bug#60398) 95Name: Multiline Parameter List (bug#60398)
29 96
30=-= 97=-=
@@ -34,7 +101,7 @@ int f2(int x,
34}; 101};
35=-=-= 102=-=-=
36 103
37Name: Multiline Block Comments (bug#60270) 104Name: Multiline Block Comments 1 (bug#60270)
38 105
39=-= 106=-=
40/** 107/**
@@ -42,3 +109,55 @@ Name: Multiline Block Comments (bug#60270)
42 * @arg1: 109 * @arg1:
43 */ 110 */
44=-=-= 111=-=-=
112
113Name: Multiline Block Comments 2 (bug#60270)
114
115=-=
116/*
117 some comment
118 */
119=-=-=
120
121Name: Multiline Block Comments 3 (bug#60270)
122
123=-=
124/* some comment
125 */
126=-=-=
127
128Name: Multiline Block Comments 4 (bug#60270)
129
130=-=
131/*
132 * Some comment
133 */
134=-=-=
135
136
137Code:
138 (lambda ()
139 (setq indent-tabs-mode nil)
140 (setq c-ts-mode-indent-offset 8)
141 (setq c-ts-mode-indent-style 'linux)
142 (c-ts-mode)
143 (indent-region (point-min) (point-max)))
144
145Name: Labels (Linux Style)
146
147=-=-=
148int main (void)
149{
150label:
151 return 0;
152 if (true) {
153label:
154 return 0;
155 }
156 else {
157 if (true) {
158label:
159 return 0;
160 }
161 }
162}
163=-=-=
diff --git a/test/lisp/progmodes/c-ts-mode-tests.el b/test/lisp/progmodes/c-ts-mode-tests.el
index 8606faf9913..3d0902fe501 100644
--- a/test/lisp/progmodes/c-ts-mode-tests.el
+++ b/test/lisp/progmodes/c-ts-mode-tests.el
@@ -27,5 +27,9 @@
27 (skip-unless (treesit-ready-p 'c)) 27 (skip-unless (treesit-ready-p 'c))
28 (ert-test-erts-file (ert-resource-file "indent.erts"))) 28 (ert-test-erts-file (ert-resource-file "indent.erts")))
29 29
30(ert-deftest c-ts-mode-test-filling ()
31 (skip-unless (treesit-ready-p 'c))
32 (ert-test-erts-file (ert-resource-file "filling.erts")))
33
30(provide 'c-ts-mode-tests) 34(provide 'c-ts-mode-tests)
31;;; c-ts-mode-tests.el ends here 35;;; c-ts-mode-tests.el ends here
diff --git a/test/manual/indent/octave.m b/test/manual/indent/octave.m
index 76cad09ad1e..08b7fa58d59 100644
--- a/test/manual/indent/octave.m
+++ b/test/manual/indent/octave.m
@@ -1517,7 +1517,7 @@ function copy_files (desc, packdir, global_install)
1517 if (exist (fullfile (desc.dir, getarch ()), "dir") && 1517 if (exist (fullfile (desc.dir, getarch ()), "dir") &&
1518 ! strcmp (fullfile (desc.dir, getarch ()), octfiledir)) 1518 ! strcmp (fullfile (desc.dir, getarch ()), octfiledir))
1519 if (! exist (octfiledir, "dir")) 1519 if (! exist (octfiledir, "dir"))
1520 ## Can be required to create upto three levels of dirs. 1520 ## Can be required to create up to three levels of dirs.
1521 octm1 = fileparts (octfiledir); 1521 octm1 = fileparts (octfiledir);
1522 if (! exist (octm1, "dir")) 1522 if (! exist (octm1, "dir"))
1523 octm2 = fileparts (octm1); 1523 octm2 = fileparts (octm1);
generated by cgit v1.2.1 (git 2.18.0) at 2026-04-14 18:06:12 +0000