@theia/filesystem 1.24.0-next.7 → 1.24.0-next.71
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/file-resource.d.ts +2 -0
- package/lib/browser/file-resource.d.ts.map +1 -1
- package/lib/browser/file-resource.js +29 -15
- package/lib/browser/file-resource.js.map +1 -1
- package/lib/browser/file-service.js +2 -2
- package/lib/browser/file-service.js.map +1 -1
- package/lib/browser/file-tree/file-tree-model.d.ts.map +1 -1
- package/lib/browser/file-tree/file-tree-model.js +9 -6
- package/lib/browser/file-tree/file-tree-model.js.map +1 -1
- package/lib/common/filesystem-utils.d.ts +5 -4
- package/lib/common/filesystem-utils.d.ts.map +1 -1
- package/lib/common/filesystem-utils.js +31 -8
- package/lib/common/filesystem-utils.js.map +1 -1
- package/lib/common/filesystem-utils.spec.d.ts +2 -0
- package/lib/common/filesystem-utils.spec.d.ts.map +1 -0
- package/lib/common/filesystem-utils.spec.js +379 -0
- package/lib/common/filesystem-utils.spec.js.map +1 -0
- package/package.json +3 -3
- package/src/browser/file-resource.ts +34 -16
- package/src/browser/file-service.ts +2 -2
- package/src/browser/file-tree/file-tree-model.ts +9 -6
- package/src/browser/style/file-dialog.css +1 -1
- package/src/common/filesystem-utils.spec.ts +411 -0
- package/src/common/filesystem-utils.ts +31 -8
|
@@ -0,0 +1,411 @@
|
|
|
1
|
+
// *****************************************************************************
|
|
2
|
+
// Copyright (C) 2022 EclipseSource and others.
|
|
3
|
+
//
|
|
4
|
+
// This program and the accompanying materials are made available under the
|
|
5
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
+
//
|
|
8
|
+
// This Source Code may also be made available under the following Secondary
|
|
9
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
+
// with the GNU Classpath Exception which is available at
|
|
12
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
13
|
+
//
|
|
14
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
|
+
// *****************************************************************************
|
|
16
|
+
|
|
17
|
+
import { FileSystemUtils } from '.';
|
|
18
|
+
import { FileStat } from './files';
|
|
19
|
+
import { expect } from 'chai';
|
|
20
|
+
|
|
21
|
+
describe('generateUniqueResourceURI', () => {
|
|
22
|
+
describe('Target is file', () => {
|
|
23
|
+
describe('file without extension', () => {
|
|
24
|
+
it('appends index', () => {
|
|
25
|
+
const parent = FileStat.dir('parent');
|
|
26
|
+
const source = FileStat.file('source');
|
|
27
|
+
parent.children = [source];
|
|
28
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory);
|
|
29
|
+
expect(result.path.base).to.eq('source 1');
|
|
30
|
+
});
|
|
31
|
+
it('appends first available index', () => {
|
|
32
|
+
const parent = FileStat.dir('parent');
|
|
33
|
+
const source = FileStat.file('source');
|
|
34
|
+
parent.children = [source, FileStat.file('source 1'), FileStat.file('source 3')];
|
|
35
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory);
|
|
36
|
+
expect(result.path.base).to.eq('source 2');
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
it('appends suffix', () => {
|
|
40
|
+
const parent = FileStat.dir('parent');
|
|
41
|
+
const source = FileStat.file('source');
|
|
42
|
+
parent.children = [source];
|
|
43
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
44
|
+
expect(result.path.base).to.eq('source copy');
|
|
45
|
+
});
|
|
46
|
+
|
|
47
|
+
it('appends suffix and index', () => {
|
|
48
|
+
const parent = FileStat.dir('parent');
|
|
49
|
+
const source = FileStat.file('source');
|
|
50
|
+
parent.children = [source, FileStat.file('source copy')];
|
|
51
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
52
|
+
expect(result.path.base).to.eq('source copy 1');
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
it('appends suffix and first available index', () => {
|
|
56
|
+
const parent = FileStat.dir('parent');
|
|
57
|
+
const source = FileStat.file('source');
|
|
58
|
+
parent.children = [source, FileStat.file('source copy'), FileStat.file('source copy 1'), FileStat.file('source copy 3')];
|
|
59
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
60
|
+
expect(result.path.base).to.eq('source copy 2');
|
|
61
|
+
});
|
|
62
|
+
|
|
63
|
+
it('appends only index when source name already contains suffix', () => {
|
|
64
|
+
const parent = FileStat.dir('parent');
|
|
65
|
+
const source = FileStat.file('source copy 1');
|
|
66
|
+
parent.children = [FileStat.file('source'), source, FileStat.file('source copy 2'), FileStat.file('source copy 3')];
|
|
67
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
68
|
+
expect(result.path.base).to.eq('source copy 4');
|
|
69
|
+
});
|
|
70
|
+
});
|
|
71
|
+
describe('file with extension', () => {
|
|
72
|
+
it('appends index', () => {
|
|
73
|
+
const parent = FileStat.dir('parent');
|
|
74
|
+
const source = FileStat.file('source.txt');
|
|
75
|
+
parent.children = [source];
|
|
76
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory);
|
|
77
|
+
expect(result.path.base).to.eq('source 1.txt');
|
|
78
|
+
});
|
|
79
|
+
it('appends first available index', () => {
|
|
80
|
+
const parent = FileStat.dir('parent');
|
|
81
|
+
const source = FileStat.file('source.txt');
|
|
82
|
+
parent.children = [source, FileStat.file('source 1.txt'), FileStat.file('source 3.txt')];
|
|
83
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory);
|
|
84
|
+
expect(result.path.base).to.eq('source 2.txt');
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
it('appends suffix', () => {
|
|
88
|
+
const parent = FileStat.dir('parent');
|
|
89
|
+
const source = FileStat.file('source.txt');
|
|
90
|
+
parent.children = [source];
|
|
91
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
92
|
+
expect(result.path.base).to.eq('source copy.txt');
|
|
93
|
+
});
|
|
94
|
+
|
|
95
|
+
it('appends suffix and index', () => {
|
|
96
|
+
const parent = FileStat.dir('parent');
|
|
97
|
+
const source = FileStat.file('source.txt');
|
|
98
|
+
parent.children = [source, FileStat.file('source copy.txt')];
|
|
99
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
100
|
+
expect(result.path.base).to.eq('source copy 1.txt');
|
|
101
|
+
});
|
|
102
|
+
|
|
103
|
+
it('appends suffix and first available index', () => {
|
|
104
|
+
const parent = FileStat.dir('parent');
|
|
105
|
+
const source = FileStat.file('source.txt');
|
|
106
|
+
parent.children = [source, FileStat.file('source copy.txt'), FileStat.file('source copy 1.txt'), FileStat.file('source copy 3.txt')];
|
|
107
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
108
|
+
expect(result.path.base).to.eq('source copy 2.txt');
|
|
109
|
+
});
|
|
110
|
+
|
|
111
|
+
it('appends only index when source name already contains suffix', () => {
|
|
112
|
+
const parent = FileStat.dir('parent');
|
|
113
|
+
const source = FileStat.file('source copy 1.txt');
|
|
114
|
+
parent.children = [FileStat.file('source.txt'), source, FileStat.file('source copy 2.txt'), FileStat.file('source copy 3.txt')];
|
|
115
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
116
|
+
expect(result.path.base).to.eq('source copy 4.txt');
|
|
117
|
+
});
|
|
118
|
+
});
|
|
119
|
+
describe('dotfile without extension', () => {
|
|
120
|
+
it('appends index', () => {
|
|
121
|
+
const parent = FileStat.dir('parent');
|
|
122
|
+
const source = FileStat.file('.source');
|
|
123
|
+
parent.children = [source];
|
|
124
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory);
|
|
125
|
+
expect(result.path.base).to.eq('.source 1');
|
|
126
|
+
});
|
|
127
|
+
it('appends first available index', () => {
|
|
128
|
+
const parent = FileStat.dir('parent');
|
|
129
|
+
const source = FileStat.file('.source');
|
|
130
|
+
parent.children = [source, FileStat.file('.source 1'), FileStat.file('.source 3')];
|
|
131
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory);
|
|
132
|
+
expect(result.path.base).to.eq('.source 2');
|
|
133
|
+
});
|
|
134
|
+
|
|
135
|
+
it('appends suffix', () => {
|
|
136
|
+
const parent = FileStat.dir('parent');
|
|
137
|
+
const source = FileStat.file('.source');
|
|
138
|
+
parent.children = [source];
|
|
139
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
140
|
+
expect(result.path.base).to.eq('.source copy');
|
|
141
|
+
});
|
|
142
|
+
|
|
143
|
+
it('appends suffix and index', () => {
|
|
144
|
+
const parent = FileStat.dir('parent');
|
|
145
|
+
const source = FileStat.file('.source');
|
|
146
|
+
parent.children = [source, FileStat.file('.source copy')];
|
|
147
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
148
|
+
expect(result.path.base).to.eq('.source copy 1');
|
|
149
|
+
});
|
|
150
|
+
|
|
151
|
+
it('appends suffix and first available index', () => {
|
|
152
|
+
const parent = FileStat.dir('parent');
|
|
153
|
+
const source = FileStat.file('.source');
|
|
154
|
+
parent.children = [source, FileStat.file('.source copy'), FileStat.file('.source copy 1'), FileStat.file('.source copy 3')];
|
|
155
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
156
|
+
expect(result.path.base).to.eq('.source copy 2');
|
|
157
|
+
});
|
|
158
|
+
|
|
159
|
+
it('appends only index when source name already contains suffix', () => {
|
|
160
|
+
const parent = FileStat.dir('parent');
|
|
161
|
+
const source = FileStat.file('.source copy 1');
|
|
162
|
+
parent.children = [FileStat.file('.source'), source, FileStat.file('.source copy 2'), FileStat.file('.source copy 3')];
|
|
163
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
164
|
+
expect(result.path.base).to.eq('.source copy 4');
|
|
165
|
+
});
|
|
166
|
+
});
|
|
167
|
+
describe('dotfile with extension', () => {
|
|
168
|
+
it('appends index', () => {
|
|
169
|
+
const parent = FileStat.dir('parent');
|
|
170
|
+
const source = FileStat.file('.source.txt');
|
|
171
|
+
parent.children = [source];
|
|
172
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory);
|
|
173
|
+
expect(result.path.base).to.eq('.source 1.txt');
|
|
174
|
+
});
|
|
175
|
+
it('appends first available index', () => {
|
|
176
|
+
const parent = FileStat.dir('parent');
|
|
177
|
+
const source = FileStat.file('.source.txt');
|
|
178
|
+
parent.children = [source, FileStat.file('.source 1.txt'), FileStat.file('.source 3.txt')];
|
|
179
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory);
|
|
180
|
+
expect(result.path.base).to.eq('.source 2.txt');
|
|
181
|
+
});
|
|
182
|
+
|
|
183
|
+
it('appends suffix', () => {
|
|
184
|
+
const parent = FileStat.dir('parent');
|
|
185
|
+
const source = FileStat.file('.source.txt');
|
|
186
|
+
parent.children = [source];
|
|
187
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
188
|
+
expect(result.path.base).to.eq('.source copy.txt');
|
|
189
|
+
});
|
|
190
|
+
|
|
191
|
+
it('appends suffix and index', () => {
|
|
192
|
+
const parent = FileStat.dir('parent');
|
|
193
|
+
const source = FileStat.file('.source.txt');
|
|
194
|
+
parent.children = [source, FileStat.file('.source copy.txt')];
|
|
195
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
196
|
+
expect(result.path.base).to.eq('.source copy 1.txt');
|
|
197
|
+
});
|
|
198
|
+
|
|
199
|
+
it('appends suffix and first available index', () => {
|
|
200
|
+
const parent = FileStat.dir('parent');
|
|
201
|
+
const source = FileStat.file('.source.txt');
|
|
202
|
+
parent.children = [source, FileStat.file('.source copy.txt'), FileStat.file('.source copy 1.txt'), FileStat.file('.source copy 3.txt')];
|
|
203
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
204
|
+
expect(result.path.base).to.eq('.source copy 2.txt');
|
|
205
|
+
});
|
|
206
|
+
|
|
207
|
+
it('appends only index when source name already contains suffix', () => {
|
|
208
|
+
const parent = FileStat.dir('parent');
|
|
209
|
+
const source = FileStat.file('.source copy 1.txt');
|
|
210
|
+
parent.children = [FileStat.file('.source.txt'), source, FileStat.file('.source copy 2.txt'), FileStat.file('.source copy 3.txt')];
|
|
211
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
212
|
+
expect(result.path.base).to.eq('.source copy 4.txt');
|
|
213
|
+
});
|
|
214
|
+
});
|
|
215
|
+
});
|
|
216
|
+
|
|
217
|
+
describe('Target is directory', () => {
|
|
218
|
+
describe('directory with path without extension', () => {
|
|
219
|
+
it('appends index', () => {
|
|
220
|
+
const parent = FileStat.dir('parent');
|
|
221
|
+
const source = FileStat.dir('source');
|
|
222
|
+
parent.children = [source];
|
|
223
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory);
|
|
224
|
+
expect(result.path.base).to.eq('source 1');
|
|
225
|
+
});
|
|
226
|
+
it('appends first available index', () => {
|
|
227
|
+
const parent = FileStat.dir('parent');
|
|
228
|
+
const source = FileStat.dir('source');
|
|
229
|
+
parent.children = [source, FileStat.dir('source 1'), FileStat.dir('source 3')];
|
|
230
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory);
|
|
231
|
+
expect(result.path.base).to.eq('source 2');
|
|
232
|
+
});
|
|
233
|
+
|
|
234
|
+
it('appends suffix', () => {
|
|
235
|
+
const parent = FileStat.dir('parent');
|
|
236
|
+
const source = FileStat.dir('source');
|
|
237
|
+
parent.children = [source];
|
|
238
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
239
|
+
expect(result.path.base).to.eq('source copy');
|
|
240
|
+
});
|
|
241
|
+
|
|
242
|
+
it('appends suffix and index', () => {
|
|
243
|
+
const parent = FileStat.dir('parent');
|
|
244
|
+
const source = FileStat.dir('source');
|
|
245
|
+
parent.children = [source, FileStat.dir('source copy')];
|
|
246
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
247
|
+
expect(result.path.base).to.eq('source copy 1');
|
|
248
|
+
});
|
|
249
|
+
|
|
250
|
+
it('appends suffix and first available index', () => {
|
|
251
|
+
const parent = FileStat.dir('parent');
|
|
252
|
+
const source = FileStat.dir('source');
|
|
253
|
+
parent.children = [source, FileStat.dir('source copy'), FileStat.dir('source copy 1'), FileStat.dir('source copy 3')];
|
|
254
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
255
|
+
expect(result.path.base).to.eq('source copy 2');
|
|
256
|
+
});
|
|
257
|
+
|
|
258
|
+
it('appends only index when source name already contains suffix', () => {
|
|
259
|
+
const parent = FileStat.dir('parent');
|
|
260
|
+
const source = FileStat.dir('source copy 1');
|
|
261
|
+
parent.children = [FileStat.dir('source'), source, FileStat.dir('source copy 2'), FileStat.dir('source copy 3')];
|
|
262
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
263
|
+
expect(result.path.base).to.eq('source copy 4');
|
|
264
|
+
});
|
|
265
|
+
});
|
|
266
|
+
describe('directory with path with extension', () => {
|
|
267
|
+
it('appends index', () => {
|
|
268
|
+
const parent = FileStat.dir('parent');
|
|
269
|
+
const source = FileStat.dir('source.test');
|
|
270
|
+
parent.children = [source];
|
|
271
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory);
|
|
272
|
+
expect(result.path.base).to.eq('source.test 1');
|
|
273
|
+
});
|
|
274
|
+
it('appends first available index', () => {
|
|
275
|
+
const parent = FileStat.dir('parent');
|
|
276
|
+
const source = FileStat.dir('source.test');
|
|
277
|
+
parent.children = [source, FileStat.dir('source.test 1'), FileStat.dir('source.test 3')];
|
|
278
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory);
|
|
279
|
+
expect(result.path.base).to.eq('source.test 2');
|
|
280
|
+
});
|
|
281
|
+
|
|
282
|
+
it('appends suffix', () => {
|
|
283
|
+
const parent = FileStat.dir('parent');
|
|
284
|
+
const source = FileStat.dir('source.test');
|
|
285
|
+
parent.children = [source];
|
|
286
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
287
|
+
expect(result.path.base).to.eq('source.test copy');
|
|
288
|
+
});
|
|
289
|
+
|
|
290
|
+
it('appends suffix and index', () => {
|
|
291
|
+
const parent = FileStat.dir('parent');
|
|
292
|
+
const source = FileStat.dir('source.test');
|
|
293
|
+
parent.children = [source, FileStat.dir('source.test copy')];
|
|
294
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
295
|
+
expect(result.path.base).to.eq('source.test copy 1');
|
|
296
|
+
});
|
|
297
|
+
|
|
298
|
+
it('appends suffix and first available index', () => {
|
|
299
|
+
const parent = FileStat.dir('parent');
|
|
300
|
+
const source = FileStat.dir('source.test');
|
|
301
|
+
parent.children = [source, FileStat.dir('source.test copy'), FileStat.dir('source.test copy 1'), FileStat.dir('source.test copy 3')];
|
|
302
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
303
|
+
expect(result.path.base).to.eq('source.test copy 2');
|
|
304
|
+
});
|
|
305
|
+
|
|
306
|
+
it('appends only index when source name already contains suffix', () => {
|
|
307
|
+
const parent = FileStat.dir('parent');
|
|
308
|
+
const source = FileStat.dir('source.test copy 1');
|
|
309
|
+
parent.children = [FileStat.dir('source.test'), source, FileStat.dir('source.test copy 2'), FileStat.dir('source.test copy 3')];
|
|
310
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
311
|
+
expect(result.path.base).to.eq('source.test copy 4');
|
|
312
|
+
});
|
|
313
|
+
});
|
|
314
|
+
describe('name starts with . and has path without extension', () => {
|
|
315
|
+
it('appends index', () => {
|
|
316
|
+
const parent = FileStat.dir('parent');
|
|
317
|
+
const source = FileStat.dir('.source');
|
|
318
|
+
parent.children = [source];
|
|
319
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory);
|
|
320
|
+
expect(result.path.base).to.eq('.source 1');
|
|
321
|
+
});
|
|
322
|
+
it('appends first available index', () => {
|
|
323
|
+
const parent = FileStat.dir('parent');
|
|
324
|
+
const source = FileStat.dir('.source');
|
|
325
|
+
parent.children = [source, FileStat.dir('.source 1'), FileStat.dir('.source 3')];
|
|
326
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory);
|
|
327
|
+
expect(result.path.base).to.eq('.source 2');
|
|
328
|
+
});
|
|
329
|
+
|
|
330
|
+
it('appends suffix', () => {
|
|
331
|
+
const parent = FileStat.dir('parent');
|
|
332
|
+
const source = FileStat.dir('.source');
|
|
333
|
+
parent.children = [source];
|
|
334
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
335
|
+
expect(result.path.base).to.eq('.source copy');
|
|
336
|
+
});
|
|
337
|
+
|
|
338
|
+
it('appends suffix and index', () => {
|
|
339
|
+
const parent = FileStat.dir('parent');
|
|
340
|
+
const source = FileStat.dir('.source');
|
|
341
|
+
parent.children = [source, FileStat.dir('.source copy')];
|
|
342
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
343
|
+
expect(result.path.base).to.eq('.source copy 1');
|
|
344
|
+
});
|
|
345
|
+
|
|
346
|
+
it('appends suffix and first available index', () => {
|
|
347
|
+
const parent = FileStat.dir('parent');
|
|
348
|
+
const source = FileStat.dir('.source');
|
|
349
|
+
parent.children = [source, FileStat.dir('.source copy'), FileStat.dir('.source copy 1'), FileStat.dir('.source copy 3')];
|
|
350
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
351
|
+
expect(result.path.base).to.eq('.source copy 2');
|
|
352
|
+
});
|
|
353
|
+
|
|
354
|
+
it('appends only index when source name already contains suffix', () => {
|
|
355
|
+
const parent = FileStat.dir('parent');
|
|
356
|
+
const source = FileStat.dir('.source copy 1');
|
|
357
|
+
parent.children = [FileStat.dir('.source'), source, FileStat.dir('.source copy 2'), FileStat.dir('.source copy 3')];
|
|
358
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
359
|
+
expect(result.path.base).to.eq('.source copy 4');
|
|
360
|
+
});
|
|
361
|
+
});
|
|
362
|
+
describe('name starts with . and has path with extension', () => {
|
|
363
|
+
it('appends index', () => {
|
|
364
|
+
const parent = FileStat.dir('parent');
|
|
365
|
+
const source = FileStat.dir('.source.test');
|
|
366
|
+
parent.children = [source];
|
|
367
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory);
|
|
368
|
+
expect(result.path.base).to.eq('.source.test 1');
|
|
369
|
+
});
|
|
370
|
+
it('appends first available index', () => {
|
|
371
|
+
const parent = FileStat.dir('parent');
|
|
372
|
+
const source = FileStat.dir('.source.test');
|
|
373
|
+
parent.children = [source, FileStat.dir('.source.test 1'), FileStat.dir('.source.test 3')];
|
|
374
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory);
|
|
375
|
+
expect(result.path.base).to.eq('.source.test 2');
|
|
376
|
+
});
|
|
377
|
+
|
|
378
|
+
it('appends suffix', () => {
|
|
379
|
+
const parent = FileStat.dir('parent');
|
|
380
|
+
const source = FileStat.dir('.source.test');
|
|
381
|
+
parent.children = [source];
|
|
382
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
383
|
+
expect(result.path.base).to.eq('.source.test copy');
|
|
384
|
+
});
|
|
385
|
+
|
|
386
|
+
it('appends suffix and index', () => {
|
|
387
|
+
const parent = FileStat.dir('parent');
|
|
388
|
+
const source = FileStat.dir('.source.test');
|
|
389
|
+
parent.children = [source, FileStat.dir('.source.test copy')];
|
|
390
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
391
|
+
expect(result.path.base).to.eq('.source.test copy 1');
|
|
392
|
+
});
|
|
393
|
+
|
|
394
|
+
it('appends suffix and first available index', () => {
|
|
395
|
+
const parent = FileStat.dir('parent');
|
|
396
|
+
const source = FileStat.dir('.source.test');
|
|
397
|
+
parent.children = [source, FileStat.dir('.source.test copy'), FileStat.dir('.source.test copy 1'), FileStat.dir('.source.test copy 3')];
|
|
398
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
399
|
+
expect(result.path.base).to.eq('.source.test copy 2');
|
|
400
|
+
});
|
|
401
|
+
|
|
402
|
+
it('appends only index when source name already contains suffix', () => {
|
|
403
|
+
const parent = FileStat.dir('parent');
|
|
404
|
+
const source = FileStat.dir('.source.test copy 1');
|
|
405
|
+
parent.children = [FileStat.dir('.source.test'), source, FileStat.dir('.source.test copy 2'), FileStat.dir('.source.test copy 3')];
|
|
406
|
+
const result = FileSystemUtils.generateUniqueResourceURI(parent, source.resource, source.isDirectory, 'copy');
|
|
407
|
+
expect(result.path.base).to.eq('.source.test copy 4');
|
|
408
|
+
});
|
|
409
|
+
});
|
|
410
|
+
});
|
|
411
|
+
});
|
|
@@ -18,24 +18,47 @@ import { FileStat } from '../common/files';
|
|
|
18
18
|
import URI from '@theia/core/lib/common/uri';
|
|
19
19
|
|
|
20
20
|
export namespace FileSystemUtils {
|
|
21
|
+
export const FILE_NAME_SEPARATOR = ' ';
|
|
21
22
|
|
|
22
23
|
/**
|
|
23
24
|
* Generate unique URI for a given parent which does not collide
|
|
24
25
|
*
|
|
25
|
-
* @param parentUri the `URI` of the parent
|
|
26
26
|
* @param parent the `FileStat` of the parent
|
|
27
|
-
* @param
|
|
28
|
-
* @param
|
|
27
|
+
* @param targetUri the initial URI
|
|
28
|
+
* @param isDirectory indicates whether the given targetUri represents a directory
|
|
29
|
+
* @param suffix an optional string to append to the file name, in case of collision (e.g. `copy`)
|
|
29
30
|
*/
|
|
30
|
-
export function generateUniqueResourceURI(
|
|
31
|
+
export function generateUniqueResourceURI(parent: FileStat, targetUri: URI, isDirectory: boolean, suffix?: string): URI {
|
|
31
32
|
const children = !parent.children ? [] : parent.children!.map(child => child.resource);
|
|
33
|
+
let name = targetUri.path.name;
|
|
34
|
+
let extension = targetUri.path.ext;
|
|
35
|
+
if (!name) {
|
|
36
|
+
// special case for dotfiles (e.g. '.foobar'): use the extension as the name
|
|
37
|
+
name = targetUri.path.ext;
|
|
38
|
+
extension = '';
|
|
39
|
+
}
|
|
40
|
+
// we want the path base for directories with the source path `foo.bar` to be generated as `foo.bar copy` and not `foo copy.bar` as we do for files
|
|
41
|
+
if (isDirectory) {
|
|
42
|
+
name = name + extension;
|
|
43
|
+
extension = '';
|
|
44
|
+
}
|
|
32
45
|
|
|
33
|
-
let
|
|
34
|
-
|
|
46
|
+
let base = name + extension;
|
|
47
|
+
// test if the name already contains the suffix or the suffix + index, so we don't add it again
|
|
48
|
+
const nameRegex = RegExp(`.*${FileSystemUtils.FILE_NAME_SEPARATOR}${suffix}(${FileSystemUtils.FILE_NAME_SEPARATOR}[0-9]*)?$`);
|
|
49
|
+
if (suffix && !nameRegex.test(name) && children.some(child => child.path.base === base)) {
|
|
50
|
+
name = name + FILE_NAME_SEPARATOR + suffix;
|
|
51
|
+
base = name + extension;
|
|
52
|
+
}
|
|
53
|
+
if (suffix && nameRegex.test(name)) {
|
|
54
|
+
// remove the existing index from the name, so we can generate a new one
|
|
55
|
+
name = name.replace(RegExp(`${FILE_NAME_SEPARATOR}[0-9]*$`), '');
|
|
56
|
+
}
|
|
57
|
+
let index = 0;
|
|
35
58
|
while (children.some(child => child.path.base === base)) {
|
|
36
59
|
index = index + 1;
|
|
37
|
-
base = name +
|
|
60
|
+
base = name + FILE_NAME_SEPARATOR + index + extension;
|
|
38
61
|
}
|
|
39
|
-
return
|
|
62
|
+
return parent.resource.resolve(base);
|
|
40
63
|
}
|
|
41
64
|
}
|