Skip to content

Commit fe66076

Browse files
author
isidor
committed
fileActions: polish how strings. methods are used
1 parent 78bad99 commit fe66076

1 file changed

Lines changed: 17 additions & 17 deletions

File tree

‎src/vs/workbench/contrib/files/browser/fileActions.ts‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { extname, basename } from 'vs/base/common/path';
1010
import * as resources from 'vs/base/common/resources';
1111
import { URI } from 'vs/base/common/uri';
1212
import { toErrorMessage } from 'vs/base/common/errorMessage';
13-
import * as strings from 'vs/base/common/strings';
1413
import { Action } from 'vs/base/common/actions';
1514
import { dispose, IDisposable } from 'vs/base/common/lifecycle';
1615
import { VIEWLET_ID, IExplorerService, IFilesConfiguration, VIEW_ID } from 'vs/workbench/contrib/files/common/files';
@@ -49,6 +48,7 @@ import { IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/commo
4948
import { once } from 'vs/base/common/functional';
5049
import { Codicon } from 'vs/base/common/codicons';
5150
import { IViewsService } from 'vs/workbench/common/views';
51+
import { trim, rtrim, pad } from 'vs/base/common/strings';
5252

5353
export const NEW_FILE_COMMAND_ID = 'explorer.newFile';
5454
export const NEW_FILE_LABEL = nls.localize('newFile', "New File");
@@ -375,8 +375,8 @@ export function incrementFileName(name: string, isFolder: boolean, incrementalNa
375375
return name.replace(suffixFileRegex, (match, g1?, g2?, g3?) => {
376376
let number = parseInt(g2);
377377
return number < maxNumber
378-
? g1 + strings.pad(number + 1, g2.length) + g3
379-
: strings.format('{0}{1}.1{2}', g1, g2, g3);
378+
? g1 + pad(number + 1, g2.length) + g3
379+
: `${g1}${g2}.1${g3}`;
380380
});
381381
}
382382

@@ -386,8 +386,8 @@ export function incrementFileName(name: string, isFolder: boolean, incrementalNa
386386
return name.replace(prefixFileRegex, (match, g1?, g2?, g3?) => {
387387
let number = parseInt(g1);
388388
return number < maxNumber
389-
? strings.pad(number + 1, g1.length) + g2 + g3
390-
: strings.format('{0}{1}.1{2}', g1, g2, g3);
389+
? pad(number + 1, g1.length) + g2 + g3
390+
: `${g1}${g2}.1${g3}`;
391391
});
392392
}
393393

@@ -397,24 +397,24 @@ export function incrementFileName(name: string, isFolder: boolean, incrementalNa
397397
return name.replace(prefixFileNoNameRegex, (match, g1?, g2?) => {
398398
let number = parseInt(g1);
399399
return number < maxNumber
400-
? strings.pad(number + 1, g1.length) + g2
401-
: strings.format('{0}.1{1}', g1, g2);
400+
? pad(number + 1, g1.length) + g2
401+
: `${g1}.1${g2}`;
402402
});
403403
}
404404

405405
// file.txt=>file.1.txt
406406
const lastIndexOfDot = name.lastIndexOf('.');
407407
if (!isFolder && lastIndexOfDot >= 0) {
408-
return strings.format('{0}.1{1}', name.substr(0, lastIndexOfDot), name.substr(lastIndexOfDot));
408+
return `${name.substr(0, lastIndexOfDot)}.1${name.substr(lastIndexOfDot)}`;
409409
}
410410

411411
// folder.1=>folder.2
412412
if (isFolder && name.match(/(\d+)$/)) {
413413
return name.replace(/(\d+)$/, (match, ...groups) => {
414414
let number = parseInt(groups[0]);
415415
return number < maxNumber
416-
? strings.pad(number + 1, groups[0].length)
417-
: strings.format('{0}.1', groups[0]);
416+
? pad(number + 1, groups[0].length)
417+
: `${groups[0]}.1`;
418418
});
419419
}
420420

@@ -423,13 +423,13 @@ export function incrementFileName(name: string, isFolder: boolean, incrementalNa
423423
return name.replace(/^(\d+)(.*)$/, (match, ...groups) => {
424424
let number = parseInt(groups[0]);
425425
return number < maxNumber
426-
? strings.pad(number + 1, groups[0].length) + groups[1]
427-
: strings.format('{0}{1}.1', groups[0], groups[1]);
426+
? pad(number + 1, groups[0].length) + groups[1]
427+
: `${groups[0]}${groups[1]}.1`;
428428
});
429429
}
430430

431431
// file/folder=>file.1/folder.1
432-
return strings.format('{0}.1', name);
432+
return `${name}.1`;
433433
}
434434

435435
// Global Compare with
@@ -781,12 +781,12 @@ export function getWellFormedFileName(filename: string): string {
781781
}
782782

783783
// Trim tabs
784-
filename = strings.trim(filename, '\t');
784+
filename = trim(filename, '\t');
785785

786786
// Remove trailing dots and slashes
787-
filename = strings.rtrim(filename, '.');
788-
filename = strings.rtrim(filename, '/');
789-
filename = strings.rtrim(filename, '\\');
787+
filename = rtrim(filename, '.');
788+
filename = rtrim(filename, '/');
789+
filename = rtrim(filename, '\\');
790790

791791
return filename;
792792
}

0 commit comments

Comments
 (0)