Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
34c9201b
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,发现更多精彩内容 >>
提交
34c9201b
编写于
10月 26, 2018
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
workaround #61310
上级
4252e67b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
12 deletion
+17
-12
src/vs/workbench/services/files/electron-browser/fileService.ts
.../workbench/services/files/electron-browser/fileService.ts
+15
-11
src/vs/workbench/services/textfile/common/textFileEditorModel.ts
...workbench/services/textfile/common/textFileEditorModel.ts
+2
-1
未找到文件。
src/vs/workbench/services/files/electron-browser/fileService.ts
浏览文件 @
34c9201b
...
...
@@ -16,7 +16,7 @@ import * as arrays from 'vs/base/common/arrays';
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
*
as
objects
from
'
vs/base/common/objects
'
;
import
*
as
extfs
from
'
vs/base/node/extfs
'
;
import
{
nfcall
,
ThrottledDelayer
}
from
'
vs/base/common/async
'
;
import
{
nfcall
,
ThrottledDelayer
,
timeout
}
from
'
vs/base/common/async
'
;
import
{
URI
as
uri
}
from
'
vs/base/common/uri
'
;
import
*
as
nls
from
'
vs/nls
'
;
import
{
isWindows
,
isLinux
,
isMacintosh
}
from
'
vs/base/common/platform
'
;
...
...
@@ -593,24 +593,28 @@ export class FileService extends Disposable implements IFileService {
else
{
// 4.) truncate
let
retryFromFailingTruncate
=
true
;
return
pfs
.
truncate
(
absolutePath
,
0
).
then
(()
=>
{
retryFromFailingTruncate
=
false
;
// 5.) set contents (with r+ mode) and resolve
return
this
.
doSetContentsAndResolve
(
resource
,
absolutePath
,
value
,
addBom
,
encodingToWrite
,
{
flag
:
'
r+
'
});
},
error
=>
{
if
(
retryFromFailingTruncate
)
{
return
this
.
doSetContentsAndResolve
(
resource
,
absolutePath
,
value
,
addBom
,
encodingToWrite
,
{
flag
:
'
r+
'
}).
then
(
null
,
error
=>
{
if
(
this
.
environmentService
.
verbose
)
{
console
.
error
(
`Truncate
failed (
${
error
}
), falling back to normal save
`
);
console
.
error
(
`Truncate
succeeded, but save failed (
${
error
}
), retrying after 100ms
`
);
}
// we heard from users that fs.truncate() fails (https://github.com/Microsoft/vscode/issues/59561)
// in that case we simply save the file without truncating first (same as macOS and Linux)
return
this
.
doSetContentsAndResolve
(
resource
,
absolutePath
,
value
,
addBom
,
encodingToWrite
);
// we heard from one user that fs.truncate() succeeds, but the save fails (https://github.com/Microsoft/vscode/issues/61310)
// in that case, the file is now entirely empty and the contents are gone. this can happen if an external file watcher is
// installed that reacts on the truncate and keeps the file busy right after. Our workaround is to retry to save after a
// short timeout, assuming that the file is free to write then.
return
timeout
(
100
).
then
(()
=>
this
.
doSetContentsAndResolve
(
resource
,
absolutePath
,
value
,
addBom
,
encodingToWrite
,
{
flag
:
'
r+
'
}));
});
},
error
=>
{
if
(
this
.
environmentService
.
verbose
)
{
console
.
error
(
`Truncate failed (
${
error
}
), falling back to normal save`
);
}
return
TPromise
.
wrapError
(
error
);
// we heard from users that fs.truncate() fails (https://github.com/Microsoft/vscode/issues/59561)
// in that case we simply save the file without truncating first (same as macOS and Linux)
return
this
.
doSetContentsAndResolve
(
resource
,
absolutePath
,
value
,
addBom
,
encodingToWrite
);
});
}
});
...
...
src/vs/workbench/services/textfile/common/textFileEditorModel.ts
浏览文件 @
34c9201b
...
...
@@ -32,6 +32,7 @@ import { isLinux } from 'vs/base/common/platform';
import
{
IDisposable
,
toDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
isEqual
,
isEqualOrParent
}
from
'
vs/base/common/resources
'
;
import
{
onUnexpectedError
}
from
'
vs/base/common/errors
'
;
/**
* The text file editor model listens to changes to its underlying code editor model and saves these changes through the file service back to the disk.
...
...
@@ -846,7 +847,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
// Updated resolved stat with updated stat since touching it might have changed mtime
this
.
updateLastResolvedDiskStat
(
stat
);
},
()
=>
void
0
/* gracefully ignore errors if just touching
*/
));
},
error
=>
onUnexpectedError
(
error
)
/* just log any error but do not notify the user since the file was not dirty
*/
));
}
private
setDirty
(
dirty
:
boolean
):
()
=>
void
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录