Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
aab05a86
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
aab05a86
编写于
10月 21, 2016
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Hot Exit: avoid direct calls to fs.readdir()/fs.readdirSync() (fixes #14055)
上级
4dc59b7e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
18 deletion
+14
-18
src/vs/base/node/extfs.ts
src/vs/base/node/extfs.ts
+12
-17
src/vs/platform/backup/node/backupService.ts
src/vs/platform/backup/node/backupService.ts
+2
-1
未找到文件。
src/vs/base/node/extfs.ts
浏览文件 @
aab05a86
...
...
@@ -16,11 +16,21 @@ import paths = require('path');
const
loop
=
flow
.
loop
;
export
function
readdirSync
(
path
:
string
):
string
[]
{
// Mac: uses NFD unicode form on disk, but we want NFC
// See also https://github.com/nodejs/node/issues/2165
if
(
platform
.
isMacintosh
)
{
return
fs
.
readdirSync
(
path
).
map
(
c
=>
strings
.
normalizeNFC
(
c
));
}
return
fs
.
readdirSync
(
path
);
}
export
function
readdir
(
path
:
string
,
callback
:
(
error
:
Error
,
files
:
string
[])
=>
void
):
void
{
// Mac: uses NFD unicode form on disk, but we want NFC
// See also https://github.com/nodejs/node/issues/2165
if
(
platform
.
isMacintosh
)
{
return
readdirNormalize
(
path
,
(
error
,
children
)
=>
{
return
fs
.
readdir
(
path
,
(
error
,
children
)
=>
{
if
(
error
)
{
return
callback
(
error
,
null
);
}
...
...
@@ -29,22 +39,7 @@ export function readdir(path: string, callback: (error: Error, files: string[])
});
}
return
readdirNormalize
(
path
,
callback
);
}
function
readdirNormalize
(
path
:
string
,
callback
:
(
error
:
Error
,
files
:
string
[])
=>
void
):
void
{
fs
.
readdir
(
path
,
(
error
,
children
)
=>
{
if
(
error
)
{
return
callback
(
error
,
null
);
}
// Bug in node: In some environments we get "." and ".." as entries from the call to readdir().
// For example Sharepoint via WebDav on Windows includes them. We never want those
// entries in the result set though because they are not valid children of the folder
// for our concerns.
// See https://github.com/nodejs/node/issues/4002
return
callback
(
null
,
children
.
filter
(
c
=>
c
!==
'
.
'
&&
c
!==
'
..
'
));
});
return
fs
.
readdir
(
path
,
callback
);
}
export
function
mkdirp
(
path
:
string
,
mode
:
number
,
callback
:
(
error
:
Error
)
=>
void
):
void
{
...
...
src/vs/platform/backup/node/backupService.ts
浏览文件 @
aab05a86
...
...
@@ -10,6 +10,7 @@ import * as crypto from 'crypto';
import
*
as
arrays
from
'
vs/base/common/arrays
'
;
import
fs
=
require
(
'
fs
'
);
import
pfs
=
require
(
'
vs/base/node/pfs
'
);
import
{
readdirSync
}
from
'
vs/base/node/extfs
'
;
import
Uri
from
'
vs/base/common/uri
'
;
import
{
IBackupService
}
from
'
vs/platform/backup/common/backup
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
...
...
@@ -109,7 +110,7 @@ export class BackupService implements IBackupService {
// Allow sync here as it's only used in workbench initialization's critical path
try
{
return
fs
.
readdirSync
(
untitledDir
).
map
(
file
=>
path
.
join
(
untitledDir
,
file
));
return
readdirSync
(
untitledDir
).
map
(
file
=>
path
.
join
(
untitledDir
,
file
));
}
catch
(
ex
)
{
return
[];
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录