Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
2b4a8c02
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,发现更多精彩内容 >>
提交
2b4a8c02
编写于
9月 05, 2018
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #46538
上级
4380358c
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
39 addition
and
2 deletion
+39
-2
src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts
...ch/services/files/node/watcher/nsfw/nsfwWatcherService.ts
+39
-2
未找到文件。
src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts
浏览文件 @
2b4a8c02
...
@@ -15,6 +15,7 @@ import { ThrottledDelayer } from 'vs/base/common/async';
...
@@ -15,6 +15,7 @@ import { ThrottledDelayer } from 'vs/base/common/async';
import
{
FileChangeType
}
from
'
vs/platform/files/common/files
'
;
import
{
FileChangeType
}
from
'
vs/platform/files/common/files
'
;
import
{
normalizeNFC
}
from
'
vs/base/common/normalization
'
;
import
{
normalizeNFC
}
from
'
vs/base/common/normalization
'
;
import
{
Event
,
Emitter
}
from
'
vs/base/common/event
'
;
import
{
Event
,
Emitter
}
from
'
vs/base/common/event
'
;
import
{
realcaseSync
,
realpathSync
}
from
'
vs/base/node/extfs
'
;
const
nsfwActionToRawChangeType
:
{
[
key
:
number
]:
number
}
=
[];
const
nsfwActionToRawChangeType
:
{
[
key
:
number
]:
number
}
=
[];
nsfwActionToRawChangeType
[
nsfw
.
actions
.
CREATED
]
=
FileChangeType
.
ADDED
;
nsfwActionToRawChangeType
[
nsfw
.
actions
.
CREATED
]
=
FileChangeType
.
ADDED
;
...
@@ -70,6 +71,34 @@ export class NsfwWatcherService implements IWatcherService {
...
@@ -70,6 +71,34 @@ export class NsfwWatcherService implements IWatcherService {
}
}
});
});
// NSFW does not report file changes in the path provided on macOS if
// - the path uses wrong casing
// - the path is a symbolic link
// We have to detect this case and massage the events to correct this.
let
realBasePathDiffers
=
false
;
let
realBasePathLength
=
request
.
basePath
.
length
;
if
(
platform
.
isMacintosh
)
{
try
{
// First check for symbolic link
let
realBasePath
=
realpathSync
(
request
.
basePath
);
// Second check for casing difference
if
(
request
.
basePath
===
realBasePath
)
{
realBasePath
=
(
realcaseSync
(
request
.
basePath
)
||
request
.
basePath
);
}
if
(
request
.
basePath
!==
realBasePath
)
{
realBasePathLength
=
realBasePath
.
length
;
realBasePathDiffers
=
true
;
console
.
warn
(
`Watcher basePath does not match version on disk and will be corrected (original:
${
request
.
basePath
}
, real:
${
realBasePath
}
)`
);
}
}
catch
(
error
)
{
// ignore
}
}
nsfw
(
request
.
basePath
,
events
=>
{
nsfw
(
request
.
basePath
,
events
=>
{
for
(
let
i
=
0
;
i
<
events
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
events
.
length
;
i
++
)
{
const
e
=
events
[
i
];
const
e
=
events
[
i
];
...
@@ -114,9 +143,17 @@ export class NsfwWatcherService implements IWatcherService {
...
@@ -114,9 +143,17 @@ export class NsfwWatcherService implements IWatcherService {
const
events
=
undeliveredFileEvents
;
const
events
=
undeliveredFileEvents
;
undeliveredFileEvents
=
[];
undeliveredFileEvents
=
[];
// Mac uses NFD unicode form on disk, but we want NFC
if
(
platform
.
isMacintosh
)
{
if
(
platform
.
isMacintosh
)
{
events
.
forEach
(
e
=>
e
.
path
=
normalizeNFC
(
e
.
path
));
events
.
forEach
(
e
=>
{
// Mac uses NFD unicode form on disk, but we want NFC
e
.
path
=
normalizeNFC
(
e
.
path
);
// Convert paths back to original form in case it differs
if
(
realBasePathDiffers
)
{
e
.
path
=
request
.
basePath
+
e
.
path
.
substr
(
realBasePathLength
);
}
});
}
}
// Broadcast to clients normalized
// Broadcast to clients normalized
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录