inlineFileType2 as booleans into IStat, #47475

This commit is contained in:
Johannes Rieken
2018-04-20 14:11:34 +02:00
parent 9bcb7a0cfe
commit 4a27ac8498
6 changed files with 18 additions and 25 deletions

View File

@@ -700,7 +700,6 @@ export function createApiFactory(
DeprecatedFileChangeType: extHostTypes.FileChangeType,
DeprecatedFileType: extHostTypes.FileType,
FileChangeType2: extHostTypes.FileChangeType2,
FileType2: extHostTypes.FileType2,
FileSystemError: extHostTypes.FileSystemError,
FoldingRange: extHostTypes.FoldingRange,
FoldingRangeKind: extHostTypes.FoldingRangeKind

View File

@@ -14,7 +14,7 @@ import * as path from 'path';
import { IDisposable } from 'vs/base/common/lifecycle';
import { asWinJsPromise } from 'vs/base/common/async';
import { values } from 'vs/base/common/map';
import { Range, FileType, FileChangeType, FileChangeType2, FileType2 } from 'vs/workbench/api/node/extHostTypes';
import { Range, FileType, FileChangeType, FileChangeType2 } from 'vs/workbench/api/node/extHostTypes';
import { ExtHostLanguageFeatures } from 'vs/workbench/api/node/extHostLanguageFeatures';
import { Schemas } from 'vs/base/common/network';
@@ -91,21 +91,23 @@ class FileSystemProviderShim implements vscode.FileSystemProvider2 {
private static _modernizeFileStat(stat: vscode.DeprecatedFileStat): vscode.FileStat2 {
let { mtime, size, type } = stat;
let newType: vscode.FileType2;
let isFile = false;
let isDirectory = false;
let isSymbolicLink = false;
// no support for bitmask, effectively no support for symlinks
switch (type) {
case FileType.Dir:
newType = FileType2.Directory;
isDirectory = true;
break;
case FileType.File:
newType = FileType2.File;
isFile = true;
break;
case FileType.Symlink:
newType = FileType2.SymbolicLink;
isSymbolicLink = true;
break;
}
return { mtime, size, type: newType };
return { mtime, size, isFile, isDirectory, isSymbolicLink };
}
private static _modernizeFileChange(e: vscode.DeprecatedFileChange): vscode.FileChange2 {

View File

@@ -1832,12 +1832,6 @@ export enum FileType {
Symlink = 2
}
export enum FileType2 {
File = 1,
Directory = 2,
SymbolicLink = 4,
}
export class FileSystemError extends Error {
static EntryExists(message?: string): FileSystemError {