Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
dc5a137e
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,发现更多精彩内容 >>
提交
dc5a137e
编写于
10月 01, 2019
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use US English in settings sync
上级
73c61c4e
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
22 addition
and
22 deletion
+22
-22
src/vs/platform/userDataSync/common/extensionsSync.ts
src/vs/platform/userDataSync/common/extensionsSync.ts
+7
-7
src/vs/platform/userDataSync/common/settingsSync.ts
src/vs/platform/userDataSync/common/settingsSync.ts
+12
-12
src/vs/platform/userDataSync/common/userDataSync.ts
src/vs/platform/userDataSync/common/userDataSync.ts
+2
-2
src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
...vs/workbench/contrib/userDataSync/browser/userDataSync.ts
+1
-1
未找到文件。
src/vs/platform/userDataSync/common/extensionsSync.ts
浏览文件 @
dc5a137e
...
...
@@ -70,16 +70,16 @@ export class ExtensionsSynchroniser extends Disposable implements ISynchroniser
async
sync
():
Promise
<
boolean
>
{
if
(
!
this
.
configurationService
.
getValue
<
boolean
>
(
'
configurationSync.enableExtensions
'
))
{
this
.
logService
.
trace
(
'
Extensions: Skipping synchroni
s
ing extensions as it is disabled.
'
);
this
.
logService
.
trace
(
'
Extensions: Skipping synchroni
z
ing extensions as it is disabled.
'
);
return
false
;
}
if
(
this
.
status
!==
SyncStatus
.
Idle
)
{
this
.
logService
.
trace
(
'
Extensions: Skipping synchroni
s
ing extensions as it is running already.
'
);
this
.
logService
.
trace
(
'
Extensions: Skipping synchroni
z
ing extensions as it is running already.
'
);
return
false
;
}
this
.
logService
.
trace
(
'
Extensions: Started synchroni
s
ing extensions...
'
);
this
.
logService
.
trace
(
'
Extensions: Started synchroni
z
ing extensions...
'
);
this
.
setStatus
(
SyncStatus
.
Syncing
);
try
{
...
...
@@ -88,13 +88,13 @@ export class ExtensionsSynchroniser extends Disposable implements ISynchroniser
this
.
setStatus
(
SyncStatus
.
Idle
);
if
(
e
instanceof
UserDataSyncStoreError
&&
e
.
code
===
UserDataSyncStoreErrorCode
.
Rejected
)
{
// Rejected as there is a new remote version. Syncing again,
this
.
logService
.
info
(
'
Extensions: Failed to synchronise extensions as there is a new remote version available. Synchroni
s
ing again...
'
);
this
.
logService
.
info
(
'
Extensions: Failed to synchronise extensions as there is a new remote version available. Synchroni
z
ing again...
'
);
return
this
.
sync
();
}
throw
e
;
}
this
.
logService
.
trace
(
'
Extensions: Finised synchroni
s
ing extensions.
'
);
this
.
logService
.
trace
(
'
Extensions: Finised synchroni
z
ing extensions.
'
);
this
.
setStatus
(
SyncStatus
.
Idle
);
return
true
;
}
...
...
@@ -129,7 +129,7 @@ export class ExtensionsSynchroniser extends Disposable implements ISynchroniser
const
{
added
,
removed
,
updated
,
remote
}
=
this
.
merge
(
localExtensions
,
remoteExtensions
,
lastSyncExtensions
);
if
(
!
added
.
length
&&
!
removed
.
length
&&
!
updated
.
length
&&
!
remote
)
{
this
.
logService
.
trace
(
'
Extensions: No changes found during synchroni
s
ing extensions.
'
);
this
.
logService
.
trace
(
'
Extensions: No changes found during synchroni
z
ing extensions.
'
);
}
if
(
added
.
length
||
removed
.
length
||
updated
.
length
)
{
...
...
@@ -162,7 +162,7 @@ export class ExtensionsSynchroniser extends Disposable implements ISynchroniser
const
ignoredExtensions
=
this
.
configurationService
.
getValue
<
string
[]
>
(
'
configurationSync.extensionsToIgnore
'
)
||
[];
// First time sync
if
(
!
remoteExtensions
)
{
this
.
logService
.
info
(
'
Extensions: Remote extensions does not exist. Synchroni
s
ing extensions for the first time.
'
);
this
.
logService
.
info
(
'
Extensions: Remote extensions does not exist. Synchroni
z
ing extensions for the first time.
'
);
return
{
added
:
[],
removed
:
[],
updated
:
[],
remote
:
localExtensions
.
filter
(({
identifier
})
=>
ignoredExtensions
.
some
(
id
=>
id
.
toLowerCase
()
===
identifier
.
id
.
toLowerCase
()))
};
}
...
...
src/vs/platform/userDataSync/common/settingsSync.ts
浏览文件 @
dc5a137e
...
...
@@ -81,27 +81,27 @@ export class SettingsSynchroniser extends Disposable implements ISynchroniser {
async
sync
(
_continue
?:
boolean
):
Promise
<
boolean
>
{
if
(
!
this
.
configurationService
.
getValue
<
boolean
>
(
'
configurationSync.enableSettings
'
))
{
this
.
logService
.
trace
(
'
Settings: Skipping synchroni
s
ing settings as it is disabled.
'
);
this
.
logService
.
trace
(
'
Settings: Skipping synchroni
z
ing settings as it is disabled.
'
);
return
false
;
}
if
(
_continue
)
{
this
.
logService
.
info
(
'
Settings: Resumed synchroni
s
ing settings
'
);
this
.
logService
.
info
(
'
Settings: Resumed synchroni
z
ing settings
'
);
return
this
.
continueSync
();
}
if
(
this
.
status
!==
SyncStatus
.
Idle
)
{
this
.
logService
.
trace
(
'
Settings: Skipping synchroni
s
ing settings as it is running already.
'
);
this
.
logService
.
trace
(
'
Settings: Skipping synchroni
z
ing settings as it is running already.
'
);
return
false
;
}
this
.
logService
.
trace
(
'
Settings: Started synchroni
s
ing settings...
'
);
this
.
logService
.
trace
(
'
Settings: Started synchroni
z
ing settings...
'
);
this
.
setStatus
(
SyncStatus
.
Syncing
);
try
{
const
result
=
await
this
.
getPreview
();
if
(
result
.
hasConflicts
)
{
this
.
logService
.
info
(
'
Settings: Detected conflicts while synchroni
s
ing settings.
'
);
this
.
logService
.
info
(
'
Settings: Detected conflicts while synchroni
z
ing settings.
'
);
this
.
setStatus
(
SyncStatus
.
HasConflicts
);
return
false
;
}
...
...
@@ -112,12 +112,12 @@ export class SettingsSynchroniser extends Disposable implements ISynchroniser {
this
.
setStatus
(
SyncStatus
.
Idle
);
if
(
e
instanceof
UserDataSyncStoreError
&&
e
.
code
===
UserDataSyncStoreErrorCode
.
Rejected
)
{
// Rejected as there is a new remote version. Syncing again,
this
.
logService
.
info
(
'
Settings: Failed to synchronise settings as there is a new remote version available. Synchroni
s
ing again...
'
);
this
.
logService
.
info
(
'
Settings: Failed to synchronise settings as there is a new remote version available. Synchroni
z
ing 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
(
'
Settings: Failed to synchronise settings as there is a new local version available. Synchroni
s
ing again...
'
);
this
.
logService
.
info
(
'
Settings: Failed to synchronise settings as there is a new local version available. Synchroni
z
ing again...
'
);
return
this
.
sync
();
}
throw
e
;
...
...
@@ -128,7 +128,7 @@ export class SettingsSynchroniser extends Disposable implements ISynchroniser {
if
(
this
.
syncPreviewResultPromise
)
{
this
.
syncPreviewResultPromise
.
cancel
();
this
.
syncPreviewResultPromise
=
null
;
this
.
logService
.
info
(
'
Settings: Stopped synchroni
s
ing settings.
'
);
this
.
logService
.
info
(
'
Settings: Stopped synchroni
z
ing settings.
'
);
}
this
.
fileService
.
del
(
this
.
environmentService
.
settingsSyncPreviewResource
);
this
.
setStatus
(
SyncStatus
.
Idle
);
...
...
@@ -158,7 +158,7 @@ export class SettingsSynchroniser extends Disposable implements ISynchroniser {
let
{
fileContent
,
remoteUserData
,
hasLocalChanged
,
hasRemoteChanged
}
=
await
this
.
syncPreviewResultPromise
;
if
(
!
hasLocalChanged
&&
!
hasRemoteChanged
)
{
this
.
logService
.
trace
(
'
Settings: No changes found during synchroni
s
ing settings.
'
);
this
.
logService
.
trace
(
'
Settings: No changes found during synchroni
z
ing settings.
'
);
}
if
(
hasLocalChanged
)
{
this
.
logService
.
info
(
'
Settings: Updating local settings
'
);
...
...
@@ -178,10 +178,10 @@ export class SettingsSynchroniser extends Disposable implements ISynchroniser {
// Delete the preview
await
this
.
fileService
.
del
(
this
.
environmentService
.
settingsSyncPreviewResource
);
}
else
{
this
.
logService
.
trace
(
'
Settings: No changes found during synchroni
s
ing settings.
'
);
this
.
logService
.
trace
(
'
Settings: No changes found during synchroni
z
ing settings.
'
);
}
this
.
logService
.
trace
(
'
Settings: Finised synchroni
s
ing settings.
'
);
this
.
logService
.
trace
(
'
Settings: Finised synchroni
z
ing settings.
'
);
this
.
syncPreviewResultPromise
=
null
;
this
.
setStatus
(
SyncStatus
.
Idle
);
}
...
...
@@ -235,7 +235,7 @@ export class SettingsSynchroniser extends Disposable implements ISynchroniser {
// First time syncing to remote
else
if
(
fileContent
)
{
this
.
logService
.
info
(
'
Settings: Remote settings does not exist. Synchroni
s
ing settings for the first time.
'
);
this
.
logService
.
info
(
'
Settings: Remote settings does not exist. Synchroni
z
ing settings for the first time.
'
);
hasRemoteChanged
=
true
;
previewContent
=
fileContent
.
value
.
toString
();
}
...
...
src/vs/platform/userDataSync/common/userDataSync.ts
浏览文件 @
dc5a137e
...
...
@@ -38,13 +38,13 @@ export function registerConfiguration(): IDisposable {
},
'
configurationSync.enableSettings
'
:
{
type
:
'
boolean
'
,
description
:
localize
(
'
configurationSync.enableSettings
'
,
"
When enabled settings are synchronised while synchroni
s
ing configuration.
"
),
description
:
localize
(
'
configurationSync.enableSettings
'
,
"
When enabled settings are synchronised while synchroni
z
ing configuration.
"
),
default
:
true
,
scope
:
ConfigurationScope
.
APPLICATION
,
},
'
configurationSync.enableExtensions
'
:
{
type
:
'
boolean
'
,
description
:
localize
(
'
configurationSync.enableExtensions
'
,
"
When enabled extensions are synchronised while synchroni
s
ing configuration.
"
),
description
:
localize
(
'
configurationSync.enableExtensions
'
,
"
When enabled extensions are synchronised while synchroni
z
ing configuration.
"
),
default
:
true
,
scope
:
ConfigurationScope
.
APPLICATION
,
},
...
...
src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
浏览文件 @
dc5a137e
...
...
@@ -116,7 +116,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
}
else
if
(
this
.
userDataSyncService
.
status
===
SyncStatus
.
HasConflicts
)
{
badge
=
new
NumberBadge
(
1
,
()
=>
localize
(
'
resolve conflicts
'
,
"
Resolve Conflicts
"
));
}
else
if
(
this
.
userDataSyncService
.
status
===
SyncStatus
.
Syncing
)
{
badge
=
new
ProgressBadge
(()
=>
localize
(
'
syncing
'
,
"
Synchroni
s
ing User Configuration...
"
));
badge
=
new
ProgressBadge
(()
=>
localize
(
'
syncing
'
,
"
Synchroni
z
ing User Configuration...
"
));
clazz
=
'
progress-badge
'
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录