Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c4714300
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,发现更多精彩内容 >>
提交
c4714300
编写于
9月 12, 2019
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
error handling
上级
2253cbfd
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
16 addition
and
26 deletion
+16
-26
src/vs/workbench/services/userData/common/settingsSync.ts
src/vs/workbench/services/userData/common/settingsSync.ts
+16
-26
未找到文件。
src/vs/workbench/services/userData/common/settingsSync.ts
浏览文件 @
c4714300
...
...
@@ -92,7 +92,18 @@ export class SettingsSyncService extends Disposable implements ISynchroniser {
await
this
.
apply
();
return
true
;
}
catch
(
e
)
{
this
.
syncPreviewResultPromise
=
null
;
this
.
setStatus
(
SyncStatus
.
Idle
);
if
(
e
instanceof
RemoteUserDataError
&&
e
.
code
===
RemoteUserDataErrorCode
.
Rejected
)
{
// Rejected as there is a new remote version. Syncing again,
this
.
logService
.
info
(
'
Failed to Synchronise settings as there is a new remote version available. Synchronising again...
'
);
return
this
.
sync
();
}
if
(
e
instanceof
FileSystemProviderError
&&
e
.
code
===
FileSystemProviderErrorCode
.
FileExists
)
{
// Rejected as there is a new local version. Syncing again.
this
.
logService
.
info
(
'
Failed to Synchronise settings as there is a new local version available. Synchronising again...
'
);
return
this
.
sync
();
}
throw
e
;
}
}
...
...
@@ -414,38 +425,17 @@ export class SettingsSyncService extends Disposable implements ISynchroniser {
}
private
async
writeToRemote
(
content
:
string
,
ref
:
string
|
null
):
Promise
<
string
>
{
try
{
return
await
this
.
remoteUserDataService
.
write
(
SettingsSyncService
.
EXTERNAL_USER_DATA_SETTINGS_KEY
,
content
,
ref
);
}
catch
(
e
)
{
if
(
e
instanceof
RemoteUserDataError
&&
e
.
code
===
RemoteUserDataErrorCode
.
Rejected
)
{
// Rejected as there is a new version. Sync again
}
// An unknown error
throw
e
;
}
return
this
.
remoteUserDataService
.
write
(
SettingsSyncService
.
EXTERNAL_USER_DATA_SETTINGS_KEY
,
content
,
ref
);
}
private
async
writeToLocal
(
newContent
:
string
,
oldContent
:
IFileContent
|
null
):
Promise
<
void
>
{
if
(
oldContent
)
{
try
{
// file exists before
await
this
.
fileService
.
writeFile
(
this
.
workbenchEnvironmentService
.
settingsResource
,
VSBuffer
.
fromString
(
newContent
),
oldContent
);
}
catch
(
error
)
{
// Error to check for dirty to sync again
throw
error
;
}
// file exists already
await
this
.
fileService
.
writeFile
(
this
.
workbenchEnvironmentService
.
settingsResource
,
VSBuffer
.
fromString
(
newContent
),
oldContent
);
}
else
{
try
{
// file does not exist before
await
this
.
fileService
.
createFile
(
this
.
workbenchEnvironmentService
.
settingsResource
,
VSBuffer
.
fromString
(
newContent
),
{
overwrite
:
false
});
}
catch
(
error
)
{
if
(
error
instanceof
FileSystemProviderError
&&
error
.
code
===
FileSystemProviderErrorCode
.
FileExists
)
{
await
this
.
sync
();
}
throw
error
;
}
// file does not exist
await
this
.
fileService
.
createFile
(
this
.
workbenchEnvironmentService
.
settingsResource
,
VSBuffer
.
fromString
(
newContent
),
{
overwrite
:
false
});
}
}
private
updateLastSyncValue
(
remoteUserData
:
IUserData
):
void
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录