development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-06 11:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes #68204

Browse source
This commit is contained in:
isidor 2019-02-27 12:01:45 +01:00
parent c3fdde2fc7
commit 2e7ae88cdd
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/vs/workbench/contrib/files/browser/fileActions.ts
View file

@ -95,6 +95,12 @@ export class BaseErrorReportingAction extends Action {
}
const PLACEHOLDER_URI = URI.file('');
function refreshIfSeparator(value: string, explorerService: IExplorerService): void {
if (value && ((value.indexOf('/') >= 0) || (value.indexOf('\\') >= 0))) {
// New input contains separator, multiple resources will get created workaround for #68204
explorerService.refresh();
}
}
/* New File */
export class NewFileAction extends BaseErrorReportingAction {
@ -129,8 +135,9 @@ export class NewFileAction extends BaseErrorReportingAction {
return folder.fetchChildren(this.fileService).then(() => {
folder.addChild(stat);
const onSuccess = value => {
const onSuccess = (value: string) => {
return this.fileService.createFile(resources.joinPath(folder.resource, value)).then(stat => {
refreshIfSeparator(value, this.explorerService);
return this.editorService.openEditor({ resource: stat.resource, options: { pinned: true } });
}, (error) => {
this.onErrorWithRetry(error, () => onSuccess(value));
@ -185,8 +192,9 @@ export class NewFolderAction extends BaseErrorReportingAction {
return folder.fetchChildren(this.fileService).then(() => {
folder.addChild(stat);
const onSuccess = value => {
const onSuccess = (value: string) => {
return this.fileService.createFolder(resources.joinPath(folder.resource, value)).then(stat => {
refreshIfSeparator(value, this.explorerService);
return this.explorerService.select(stat.resource, true);
}, (error) => {
this.onErrorWithRetry(error, () => onSuccess(value));
@ -1084,7 +1092,7 @@ export const renameHandler = (accessor: ServicesAccessor) => {
if (success) {
const parentResource = stat.parent.resource;
const targetResource = resources.joinPath(parentResource, value);
textFileService.move(stat.resource, targetResource).then(undefined, onUnexpectedError);
textFileService.move(stat.resource, targetResource).then(() => refreshIfSeparator(value, explorerService), onUnexpectedError);
}
explorerService.setEditable(stat, null);
}