Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d014eb12
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,发现更多精彩内容 >>
提交
d014eb12
编写于
9月 25, 2020
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update formatting for new TS version
上级
c0ae7346
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
27 deletion
+27
-27
src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
...ices/userDataSync/browser/userDataSyncWorkbenchService.ts
+4
-4
src/vs/workbench/services/userDataSync/electron-browser/userDataSyncService.ts
...ices/userDataSync/electron-browser/userDataSyncService.ts
+23
-23
未找到文件。
src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
浏览文件 @
d014eb12
...
...
@@ -749,10 +749,10 @@ class UserDataSyncPreview extends Disposable implements IUserDataSyncPreview {
const
newResources
=
this
.
toUserDataSyncResourceGroups
(
(
this
.
manualSync
?.
preview
||
[])
.
map
(([
syncResource
,
syncResourcePreview
])
=>
([
syncResource
,
syncResourcePreview
.
resourcePreviews
]))
([
syncResource
,
syncResourcePreview
.
resourcePreviews
]))
);
if
(
!
equals
(
newResources
,
this
.
_resources
,
(
a
,
b
)
=>
isEqual
(
a
.
local
,
b
.
local
)
&&
a
.
mergeState
===
b
.
mergeState
))
{
this
.
_resources
=
newResources
;
...
...
src/vs/workbench/services/userDataSync/electron-browser/userDataSyncService.ts
浏览文件 @
d014eb12
...
...
@@ -136,16 +136,16 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
private
async
updateConflicts
(
conflicts
:
[
SyncResource
,
IResourcePreview
[]][]):
Promise
<
void
>
{
// Revive URIs
this
.
_conflicts
=
conflicts
.
map
(([
syncResource
,
conflicts
])
=>
([
syncResource
,
conflicts
.
map
(
r
=>
({
...
r
,
localResource
:
URI
.
revive
(
r
.
localResource
),
remoteResource
:
URI
.
revive
(
r
.
remoteResource
),
previewResource
:
URI
.
revive
(
r
.
previewResource
),
}))
]));
([
syncResource
,
conflicts
.
map
(
r
=>
({
...
r
,
localResource
:
URI
.
revive
(
r
.
localResource
),
remoteResource
:
URI
.
revive
(
r
.
remoteResource
),
previewResource
:
URI
.
revive
(
r
.
previewResource
),
}))
]));
this
.
_onDidChangeConflicts
.
fire
(
this
.
_conflicts
);
}
...
...
@@ -239,19 +239,19 @@ class ManualSyncTask implements IManualSyncTask {
private
deserializePreviews
(
previews
:
[
SyncResource
,
ISyncResourcePreview
][]):
[
SyncResource
,
ISyncResourcePreview
][]
{
return
previews
.
map
(([
syncResource
,
preview
])
=>
([
syncResource
,
{
isLastSyncFromCurrentMachine
:
preview
.
isLastSyncFromCurrentMachine
,
resourcePreviews
:
preview
.
resourcePreviews
.
map
(
r
=>
({
...
r
,
localResource
:
URI
.
revive
(
r
.
localResource
),
remoteResource
:
URI
.
revive
(
r
.
remoteResource
),
previewResource
:
URI
.
revive
(
r
.
previewResource
),
acceptedResource
:
URI
.
revive
(
r
.
acceptedResource
),
}))
}
]));
([
syncResource
,
{
isLastSyncFromCurrentMachine
:
preview
.
isLastSyncFromCurrentMachine
,
resourcePreviews
:
preview
.
resourcePreviews
.
map
(
r
=>
({
...
r
,
localResource
:
URI
.
revive
(
r
.
localResource
),
remoteResource
:
URI
.
revive
(
r
.
remoteResource
),
previewResource
:
URI
.
revive
(
r
.
previewResource
),
acceptedResource
:
URI
.
revive
(
r
.
acceptedResource
),
}))
}
]));
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录