Skip to content

Commit e3ecdf7

Browse files
owencaowenca
committed
[clang-format][NFC] Remove some extraneous newlines at end of test cases
1 parent 3fe8fd7 commit e3ecdf7

File tree

1 file changed

+44
-44
lines changed

1 file changed

+44
-44
lines changed

‎clang/unittests/Format/SortImportsTestJS.cpp

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ TEST_F(SortImportsTestJS, WrappedImportStatements) {
111111
TEST_F(SortImportsTestJS, SeparateMainCodeBody) {
112112
verifySort("import {sym} from 'a';"
113113
"\n"
114-
"let x = 1;\n",
115-
"import {sym} from 'a'; let x = 1;\n");
114+
"let x = 1;",
115+
"import {sym} from 'a'; let x = 1;");
116116
}
117117

118118
TEST_F(SortImportsTestJS, Comments) {
@@ -123,17 +123,17 @@ TEST_F(SortImportsTestJS, Comments) {
123123
"/** @fileoverview This is a great file. */\n"
124124
"import {sym} from 'b'; // from //foo:bar\n"
125125
"// A very important import follows.\n"
126-
"import {sym} from 'a'; /* more comments */\n");
126+
"import {sym} from 'a'; /* more comments */");
127127
verifySort("import {sym} from 'a';\n"
128128
"import {sym} from 'b';\n"
129129
"\n"
130130
"/** Comment on variable. */\n"
131-
"const x = 1;\n",
131+
"const x = 1;",
132132
"import {sym} from 'b';\n"
133133
"import {sym} from 'a';\n"
134134
"\n"
135135
"/** Comment on variable. */\n"
136-
"const x = 1;\n");
136+
"const x = 1;");
137137
}
138138

139139
TEST_F(SortImportsTestJS, SortStar) {
@@ -142,26 +142,26 @@ TEST_F(SortImportsTestJS, SortStar) {
142142
"import * as bar from 'b';\n",
143143
"import {sym} from 'a';\n"
144144
"import * as foo from 'a';\n"
145-
"import * as bar from 'b';\n");
145+
"import * as bar from 'b';");
146146
}
147147

148148
TEST_F(SortImportsTestJS, AliasesSymbols) {
149149
verifySort("import {sym1 as alias1} from 'b';\n"
150150
"import {sym2 as alias2, sym3 as alias3} from 'c';\n",
151151
"import {sym2 as alias2, sym3 as alias3} from 'c';\n"
152-
"import {sym1 as alias1} from 'b';\n");
152+
"import {sym1 as alias1} from 'b';");
153153
}
154154

155155
TEST_F(SortImportsTestJS, SortSymbols) {
156156
verifySort("import {sym1, sym2 as a, sym3} from 'b';\n",
157-
"import {sym2 as a, sym1, sym3} from 'b';\n");
157+
"import {sym2 as a, sym1, sym3} from 'b';");
158158
verifySort("import {sym1 /* important! */, /*!*/ sym2 as a} from 'b';\n",
159-
"import {/*!*/ sym2 as a, sym1 /* important! */} from 'b';\n");
159+
"import {/*!*/ sym2 as a, sym1 /* important! */} from 'b';");
160160
verifySort("import {sym1, sym2} from 'b';\n", "import {\n"
161161
" sym2 \n"
162162
",\n"
163163
" sym1 \n"
164-
"} from 'b';\n");
164+
"} from 'b';");
165165
}
166166

167167
TEST_F(SortImportsTestJS, GroupImports) {
@@ -173,13 +173,13 @@ TEST_F(SortImportsTestJS, GroupImports) {
173173
"import {b} from './relative/path';\n"
174174
"import {b} from './relative/path/nested';\n"
175175
"\n"
176-
"let x = 1;\n",
176+
"let x = 1;",
177177
"import {b} from './relative/path/nested';\n"
178178
"import {b} from './relative/path';\n"
179179
"import {b} from '../parent/nested';\n"
180180
"import {b} from '../parent';\n"
181181
"import {a} from 'absolute';\n"
182-
"let x = 1;\n");
182+
"let x = 1;");
183183
}
184184

185185
TEST_F(SortImportsTestJS, Exports) {
@@ -193,20 +193,20 @@ TEST_F(SortImportsTestJS, Exports) {
193193
"export {S};\n"
194194
"\n"
195195
"let x = 1;\n"
196-
"export y = 1;\n",
196+
"export y = 1;",
197197
"export {R} from './relative';\n"
198198
"import {T} from './cpath';\n"
199199
"export {S};\n"
200200
"export {A, B} from 'apath';\n"
201201
"import {S} from 'bpath';\n"
202202
"export {P} from '../parent';\n"
203203
"let x = 1;\n"
204-
"export y = 1;\n");
204+
"export y = 1;");
205205
verifySort("import {S} from 'bpath';\n"
206206
"\n"
207207
"export {T} from 'epath';\n",
208208
"export {T} from 'epath';\n"
209-
"import {S} from 'bpath';\n");
209+
"import {S} from 'bpath';");
210210
}
211211

212212
TEST_F(SortImportsTestJS, SideEffectImports) {
@@ -219,7 +219,7 @@ TEST_F(SortImportsTestJS, SideEffectImports) {
219219
"import {R} from './relative';\n"
220220
"import 'ZZside-effect';\n"
221221
"import {A} from 'absolute';\n"
222-
"import 'AAside-effect';\n");
222+
"import 'AAside-effect';");
223223
}
224224

225225
TEST_F(SortImportsTestJS, AffectedRange) {
@@ -262,7 +262,7 @@ TEST_F(SortImportsTestJS, SortingCanShrink) {
262262
}
263263

264264
TEST_F(SortImportsTestJS, TrailingComma) {
265-
verifySort("import {A, B,} from 'aa';\n", "import {B, A,} from 'aa';\n");
265+
verifySort("import {A, B,} from 'aa';\n", "import {B, A,} from 'aa';");
266266
}
267267

268268
TEST_F(SortImportsTestJS, SortCaseInsensitive) {
@@ -308,20 +308,20 @@ TEST_F(SortImportsTestJS, SortDefaultImports) {
308308
verifySort("import {A} from 'a';\n"
309309
"import {default as B} from 'b';\n",
310310
"import {default as B} from 'b';\n"
311-
"import {A} from 'a';\n");
311+
"import {A} from 'a';");
312312
}
313313

314314
TEST_F(SortImportsTestJS, MergeImports) {
315315
// basic operation
316316
verifySort("import {X, Y} from 'a';\n"
317317
"import {Z} from 'z';\n"
318318
"\n"
319-
"X + Y + Z;\n",
319+
"X + Y + Z;",
320320
"import {X} from 'a';\n"
321321
"import {Z} from 'z';\n"
322322
"import {Y} from 'a';\n"
323323
"\n"
324-
"X + Y + Z;\n");
324+
"X + Y + Z;");
325325

326326
// merge only, no resorting.
327327
verifySort("import {A, B} from 'foo';\n", "import {A} from 'foo';\n"
@@ -333,15 +333,15 @@ TEST_F(SortImportsTestJS, MergeImports) {
333333

334334
// ignores import *
335335
verifySort("import * as foo from 'foo';\n"
336-
"import {A} from 'foo';\n",
336+
"import {A} from 'foo';",
337337
"import * as foo from 'foo';\n"
338-
"import {A} from 'foo';\n");
338+
"import {A} from 'foo';");
339339

340340
// ignores default import
341341
verifySort("import X from 'foo';\n"
342-
"import {A} from 'foo';\n",
342+
"import {A} from 'foo';",
343343
"import X from 'foo';\n"
344-
"import {A} from 'foo';\n");
344+
"import {A} from 'foo';");
345345

346346
// keeps comments
347347
// known issue: loses the 'also a' comment.
@@ -350,15 +350,15 @@ TEST_F(SortImportsTestJS, MergeImports) {
350350
"// z\n"
351351
"import {Z} from 'z';\n"
352352
"\n"
353-
"X + Y + Z;\n",
353+
"X + Y + Z;",
354354
"// a\n"
355355
"import {/* y */ Y} from 'a';\n"
356356
"// z\n"
357357
"import {Z} from 'z';\n"
358358
"// also a\n"
359359
"import {/* x */ X} from 'a';\n"
360360
"\n"
361-
"X + Y + Z;\n");
361+
"X + Y + Z;");
362362

363363
// do not merge imports and exports
364364
verifySort("import {A} from 'foo';\n"
@@ -375,18 +375,18 @@ TEST_F(SortImportsTestJS, MergeImports) {
375375
"\n"
376376
"import {bar} from './a';\n",
377377
"import {bar} from './a';\n"
378-
"import './a';\n");
378+
"import './a';");
379379
}
380380

381381
TEST_F(SortImportsTestJS, RespectsClangFormatOff) {
382382
verifySort("// clang-format off\n"
383383
"import {B} from './b';\n"
384384
"import {A} from './a';\n"
385-
"// clang-format on\n",
385+
"// clang-format on",
386386
"// clang-format off\n"
387387
"import {B} from './b';\n"
388388
"import {A} from './a';\n"
389-
"// clang-format on\n");
389+
"// clang-format on");
390390

391391
verifySort("import {A} from './sorted1_a';\n"
392392
"import {B} from './sorted1_b';\n"
@@ -403,36 +403,36 @@ TEST_F(SortImportsTestJS, RespectsClangFormatOff) {
403403
"import {A} from './unsorted_a';\n"
404404
"// clang-format on\n"
405405
"import {B} from './sorted2_b';\n"
406-
"import {A} from './sorted2_a';\n");
406+
"import {A} from './sorted2_a';");
407407

408408
// Boundary cases
409-
verifySort("// clang-format on\n", "// clang-format on\n");
410-
verifySort("// clang-format off\n", "// clang-format off\n");
409+
verifySort("// clang-format on", "// clang-format on");
410+
verifySort("// clang-format off", "// clang-format off");
411411
verifySort("// clang-format on\n"
412-
"// clang-format off\n",
412+
"// clang-format off",
413413
"// clang-format on\n"
414-
"// clang-format off\n");
414+
"// clang-format off");
415415
verifySort("// clang-format off\n"
416416
"// clang-format on\n"
417417
"import {A} from './a';\n"
418418
"import {B} from './b';\n",
419419
"// clang-format off\n"
420420
"// clang-format on\n"
421421
"import {B} from './b';\n"
422-
"import {A} from './a';\n");
422+
"import {A} from './a';");
423423
// section ends with comment
424424
verifySort("// clang-format on\n"
425425
"import {A} from './a';\n"
426426
"import {B} from './b';\n"
427427
"import {C} from './c';\n"
428428
"\n" // inserted empty line is working as intended: splits imports
429429
// section from main code body
430-
"// clang-format off\n",
430+
"// clang-format off",
431431
"// clang-format on\n"
432432
"import {C} from './c';\n"
433433
"import {B} from './b';\n"
434434
"import {A} from './a';\n"
435-
"// clang-format off\n");
435+
"// clang-format off");
436436
}
437437

438438
TEST_F(SortImportsTestJS, RespectsClangFormatOffInNamedImports) {
@@ -455,14 +455,14 @@ TEST_F(SortImportsTestJS, ImportEqAliases) {
455455
"\n"
456456
"export {Z};\n"
457457
"\n"
458-
"console.log(Z);\n",
458+
"console.log(Z);",
459459
"import {A} from 'foo';\n"
460460
"import Z = A.C;\n"
461461
"export {Z};\n"
462462
"import {B} from 'bar';\n"
463463
"import Y = B.C.Z;\n"
464464
"\n"
465-
"console.log(Z);\n");
465+
"console.log(Z);");
466466
}
467467

468468
TEST_F(SortImportsTestJS, ImportExportType) {
@@ -482,18 +482,18 @@ TEST_F(SortImportsTestJS, ImportExportType) {
482482

483483
// Symbols within import statement
484484
verifySort("import {type sym1, type sym2 as a, sym3} from 'b';\n",
485-
"import {type sym2 as a, type sym1, sym3} from 'b';\n");
485+
"import {type sym2 as a, type sym1, sym3} from 'b';");
486486

487487
// Merging
488488
verifySort("import {X, type Z} from 'a';\n"
489489
"import type {Y} from 'a';\n"
490490
"\n"
491-
"X + Y + Z;\n",
491+
"X + Y + Z;",
492492
"import {X} from 'a';\n"
493493
"import {type Z} from 'a';\n"
494494
"import type {Y} from 'a';\n"
495495
"\n"
496-
"X + Y + Z;\n");
496+
"X + Y + Z;");
497497

498498
// Merging: empty imports
499499
verifySort("import type {A} from 'foo';\n", "import type {} from 'foo';\n"
@@ -508,10 +508,10 @@ TEST_F(SortImportsTestJS, ImportExportType) {
508508
// statements should therefore not merge.
509509
verifySort("export type A = B;\n"
510510
"export {X};\n"
511-
"export {Y};\n",
511+
"export {Y};",
512512
"export type A = B;\n"
513513
"export {X};\n"
514-
"export {Y};\n");
514+
"export {Y};");
515515
}
516516

517517
TEST_F(SortImportsTestJS, TemplateKeyword) {

0 commit comments

Comments
 (0)