diff --git a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts index d93f0a80edaf8db91998af309d4358ee0c7fa086..3f7fbe5d3f8e3bdfbfa50f198ab5e082bf828c51 100644 --- a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts +++ b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts @@ -8,7 +8,7 @@ import URI from 'vs/base/common/uri'; import { FileService } from 'vs/workbench/services/files/electron-browser/fileService'; import { IContent, IStreamContent, IFileStat, IResolveContentOptions, IUpdateContentOptions, IResolveFileOptions, IResolveFileResult, FileOperationEvent, FileOperation, IFileSystemProvider, IStat, FileType, IImportResult, FileChangesEvent, ICreateFileOptions, FileOperationError, FileOperationResult, ITextSnapshot, snapshotToString } from 'vs/platform/files/common/files'; import { TPromise } from 'vs/base/common/winjs.base'; -import { basename, join } from 'path'; +import { posix } from 'path'; import { IDisposable } from 'vs/base/common/lifecycle'; import { isFalsyOrEmpty, distinct } from 'vs/base/common/arrays'; import { Schemas } from 'vs/base/common/network'; @@ -33,7 +33,7 @@ function toIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], recurse isDirectory: false, isSymbolicLink: stat.type === FileType.Symlink, resource: resource, - name: basename(resource.path), + name: posix.basename(resource.path), mtime: stat.mtime, size: stat.size, etag: stat.mtime.toString(29) + stat.size.toString(31), @@ -421,7 +421,7 @@ export class RemoteFileService extends FileService { if (resource.scheme === Schemas.file) { return super.rename(resource, newName); } else { - const target = resource.with({ path: join(resource.path, '..', newName) }); + const target = resource.with({ path: posix.join(resource.path, '..', newName) }); return this._doMoveWithInScheme(resource, target, false); } } @@ -467,7 +467,7 @@ export class RemoteFileService extends FileService { if (source.scheme === targetFolder.scheme && source.scheme === Schemas.file) { return super.importFile(source, targetFolder); } else { - const target = targetFolder.with({ path: join(targetFolder.path, basename(source.path)) }); + const target = targetFolder.with({ path: posix.join(targetFolder.path, posix.basename(source.path)) }); return this.copyFile(source, target, false).then(stat => ({ stat, isNew: false })); } }