Skip to content

Commit f4141ac

Browse files
amcaseyamcasey
committed
Separate OrganizeImports into its own namespace and file
1 parent 979b146 commit f4141ac

File tree

3 files changed

+314
-299
lines changed

3 files changed

+314
-299
lines changed

Diff for: ‎src/harness/unittests/organizeImports.ts

+21-21
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ namespace ts {
66
describe("Organize imports", () => {
77
describe("Sort imports", () => {
88
it("No imports", () => {
9-
assert.isEmpty(sortImports([]));
9+
assert.isEmpty(OrganizeImports.sortImports([]));
1010
});
1111

1212
it("One import", () => {
1313
const unsortedImports = parseImports(`import "lib";`);
14-
const actualSortedImports = sortImports(unsortedImports);
14+
const actualSortedImports = OrganizeImports.sortImports(unsortedImports);
1515
const expectedSortedImports = unsortedImports;
1616
assertListEqual(expectedSortedImports, actualSortedImports);
1717
});
@@ -84,27 +84,27 @@ namespace ts {
8484

8585
function assertUnaffectedBySort(...importStrings: string[]) {
8686
const unsortedImports1 = parseImports(...importStrings);
87-
assertListEqual(unsortedImports1, sortImports(unsortedImports1));
87+
assertListEqual(unsortedImports1, OrganizeImports.sortImports(unsortedImports1));
8888

8989
const unsortedImports2 = reverse(unsortedImports1);
90-
assertListEqual(unsortedImports2, sortImports(unsortedImports2));
90+
assertListEqual(unsortedImports2, OrganizeImports.sortImports(unsortedImports2));
9191
}
9292

9393
function assertSortsBefore(importString1: string, importString2: string) {
9494
const imports = parseImports(importString1, importString2);
95-
assertListEqual(imports, sortImports(imports));
96-
assertListEqual(imports, sortImports(reverse(imports)));
95+
assertListEqual(imports, OrganizeImports.sortImports(imports));
96+
assertListEqual(imports, OrganizeImports.sortImports(reverse(imports)));
9797
}
9898
});
9999

100100
describe("Coalesce imports", () => {
101101
it("No imports", () => {
102-
assert.isEmpty(coalesceImports([]));
102+
assert.isEmpty(OrganizeImports.coalesceImports([]));
103103
});
104104

105105
it("Sort specifiers", () => {
106106
const sortedImports = parseImports(`import { default as m, a as n, b, y, z as o } from "lib";`);
107-
const actualCoalescedImports = coalesceImports(sortedImports);
107+
const actualCoalescedImports = OrganizeImports.coalesceImports(sortedImports);
108108
const expectedCoalescedImports = parseImports(`import { a as n, b, default as m, y, z as o } from "lib";`);
109109
assertListEqual(expectedCoalescedImports, actualCoalescedImports);
110110
});
@@ -113,7 +113,7 @@ namespace ts {
113113
const sortedImports = parseImports(
114114
`import "lib";`,
115115
`import "lib";`);
116-
const actualCoalescedImports = coalesceImports(sortedImports);
116+
const actualCoalescedImports = OrganizeImports.coalesceImports(sortedImports);
117117
const expectedCoalescedImports = parseImports(`import "lib";`);
118118
assertListEqual(expectedCoalescedImports, actualCoalescedImports);
119119
});
@@ -122,7 +122,7 @@ namespace ts {
122122
const sortedImports = parseImports(
123123
`import * as x from "lib";`,
124124
`import * as y from "lib";`);
125-
const actualCoalescedImports = coalesceImports(sortedImports);
125+
const actualCoalescedImports = OrganizeImports.coalesceImports(sortedImports);
126126
const expectedCoalescedImports = sortedImports;
127127
assertListEqual(expectedCoalescedImports, actualCoalescedImports);
128128
});
@@ -131,7 +131,7 @@ namespace ts {
131131
const sortedImports = parseImports(
132132
`import x from "lib";`,
133133
`import y from "lib";`);
134-
const actualCoalescedImports = coalesceImports(sortedImports);
134+
const actualCoalescedImports = OrganizeImports.coalesceImports(sortedImports);
135135
const expectedCoalescedImports = parseImports(`import { default as x, default as y } from "lib";`);
136136
assertListEqual(expectedCoalescedImports, actualCoalescedImports);
137137
});
@@ -140,7 +140,7 @@ namespace ts {
140140
const sortedImports = parseImports(
141141
`import { x } from "lib";`,
142142
`import { y as z } from "lib";`);
143-
const actualCoalescedImports = coalesceImports(sortedImports);
143+
const actualCoalescedImports = OrganizeImports.coalesceImports(sortedImports);
144144
const expectedCoalescedImports = parseImports(`import { x, y as z } from "lib";`);
145145
assertListEqual(expectedCoalescedImports, actualCoalescedImports);
146146
});
@@ -149,7 +149,7 @@ namespace ts {
149149
const sortedImports = parseImports(
150150
`import "lib";`,
151151
`import * as x from "lib";`);
152-
const actualCoalescedImports = coalesceImports(sortedImports);
152+
const actualCoalescedImports = OrganizeImports.coalesceImports(sortedImports);
153153
const expectedCoalescedImports = sortedImports;
154154
assertListEqual(expectedCoalescedImports, actualCoalescedImports);
155155
});
@@ -158,7 +158,7 @@ namespace ts {
158158
const sortedImports = parseImports(
159159
`import "lib";`,
160160
`import x from "lib";`);
161-
const actualCoalescedImports = coalesceImports(sortedImports);
161+
const actualCoalescedImports = OrganizeImports.coalesceImports(sortedImports);
162162
const expectedCoalescedImports = sortedImports;
163163
assertListEqual(expectedCoalescedImports, actualCoalescedImports);
164164
});
@@ -167,7 +167,7 @@ namespace ts {
167167
const sortedImports = parseImports(
168168
`import "lib";`,
169169
`import { x } from "lib";`);
170-
const actualCoalescedImports = coalesceImports(sortedImports);
170+
const actualCoalescedImports = OrganizeImports.coalesceImports(sortedImports);
171171
const expectedCoalescedImports = sortedImports;
172172
assertListEqual(expectedCoalescedImports, actualCoalescedImports);
173173
});
@@ -176,7 +176,7 @@ namespace ts {
176176
const sortedImports = parseImports(
177177
`import * as x from "lib";`,
178178
`import y from "lib";`);
179-
const actualCoalescedImports = coalesceImports(sortedImports);
179+
const actualCoalescedImports = OrganizeImports.coalesceImports(sortedImports);
180180
const expectedCoalescedImports = parseImports(
181181
`import y, * as x from "lib";`);
182182
assertListEqual(expectedCoalescedImports, actualCoalescedImports);
@@ -186,7 +186,7 @@ namespace ts {
186186
const sortedImports = parseImports(
187187
`import * as x from "lib";`,
188188
`import { y } from "lib";`);
189-
const actualCoalescedImports = coalesceImports(sortedImports);
189+
const actualCoalescedImports = OrganizeImports.coalesceImports(sortedImports);
190190
const expectedCoalescedImports = sortedImports;
191191
assertListEqual(expectedCoalescedImports, actualCoalescedImports);
192192
});
@@ -195,7 +195,7 @@ namespace ts {
195195
const sortedImports = parseImports(
196196
`import x from "lib";`,
197197
`import { y } from "lib";`);
198-
const actualCoalescedImports = coalesceImports(sortedImports);
198+
const actualCoalescedImports = OrganizeImports.coalesceImports(sortedImports);
199199
const expectedCoalescedImports = parseImports(
200200
`import x, { y } from "lib";`);
201201
assertListEqual(expectedCoalescedImports, actualCoalescedImports);
@@ -211,7 +211,7 @@ namespace ts {
211211
`import * as x from "lib";`,
212212
`import z from "lib";`,
213213
`import { a } from "lib";`);
214-
const actualCoalescedImports = coalesceImports(sortedImports);
214+
const actualCoalescedImports = OrganizeImports.coalesceImports(sortedImports);
215215
const expectedCoalescedImports = parseImports(
216216
`import "lib";`,
217217
`import * as x from "lib";`,
@@ -226,7 +226,7 @@ namespace ts {
226226
`import { b } from "lib1";`,
227227
`import { c } from "lib2";`,
228228
`import { a } from "lib2";`);
229-
const actualCoalescedImports = coalesceImports(sortedImports);
229+
const actualCoalescedImports = OrganizeImports.coalesceImports(sortedImports);
230230
const expectedCoalescedImports = parseImports(
231231
`import { b, d } from "lib1";`,
232232
`import { a, c } from "lib2";`);
@@ -239,7 +239,7 @@ namespace ts {
239239
`import * as x from "lib";`,
240240
`import * as y from "lib";`,
241241
`import z from "lib";`);
242-
const actualCoalescedImports = coalesceImports(sortedImports);
242+
const actualCoalescedImports = OrganizeImports.coalesceImports(sortedImports);
243243
const expectedCoalescedImports = sortedImports;
244244
assertListEqual(expectedCoalescedImports, actualCoalescedImports);
245245
});

0 commit comments

Comments
 (0)