Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
1166dfb0
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1166dfb0
编写于
3月 15, 2019
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debt - avoid artificial ConfigurationWriter
上级
7b6004f6
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
28 addition
and
44 deletion
+28
-44
src/vs/workbench/services/themes/browser/workbenchThemeService.ts
...orkbench/services/themes/browser/workbenchThemeService.ts
+28
-44
未找到文件。
src/vs/workbench/services/themes/browser/workbenchThemeService.ts
浏览文件 @
1166dfb0
...
...
@@ -13,7 +13,6 @@ import { Registry } from 'vs/platform/registry/common/platform';
import
*
as
errors
from
'
vs/base/common/errors
'
;
import
{
IConfigurationService
,
ConfigurationTarget
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IConfigurationRegistry
,
Extensions
as
ConfigurationExtensions
,
IConfigurationPropertySchema
,
IConfigurationNode
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
ColorThemeData
}
from
'
./colorThemeData
'
;
import
{
ITheme
,
Extensions
as
ThemingExtensions
,
IThemingRegistry
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
Event
,
Emitter
}
from
'
vs/base/common/event
'
;
...
...
@@ -85,7 +84,6 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
private
watchedIconThemeLocation
:
URI
|
undefined
;
private
themingParticipantChangeListener
:
IDisposable
;
private
_configurationWriter
:
ConfigurationWriter
;
private
get
colorCustomizations
():
IColorCustomizations
{
return
this
.
configurationService
.
getValue
<
IColorCustomizations
>
(
CUSTOM_WORKBENCH_COLORS_SETTING
)
||
{};
...
...
@@ -101,7 +99,6 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
@
IConfigurationService
private
readonly
configurationService
:
IConfigurationService
,
@
ITelemetryService
private
readonly
telemetryService
:
ITelemetryService
,
@
IWindowService
private
readonly
windowService
:
IWindowService
,
@
IInstantiationService
private
readonly
instantiationService
:
IInstantiationService
,
@
IEnvironmentService
private
readonly
environmentService
:
IEnvironmentService
)
{
...
...
@@ -429,7 +426,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
private
writeColorThemeConfiguration
(
settingsTarget
:
ConfigurationTarget
|
undefined
|
'
auto
'
):
Promise
<
IColorTheme
>
{
if
(
!
types
.
isUndefinedOrNull
(
settingsTarget
))
{
return
this
.
configurationWriter
.
writeConfiguration
(
COLOR_THEME_SETTING
,
this
.
currentColorTheme
.
settingsId
,
settingsTarget
).
then
(
_
=>
this
.
currentColorTheme
);
return
this
.
writeConfiguration
(
COLOR_THEME_SETTING
,
this
.
currentColorTheme
.
settingsId
,
settingsTarget
).
then
(
_
=>
this
.
currentColorTheme
);
}
return
Promise
.
resolve
(
this
.
currentColorTheme
);
}
...
...
@@ -538,17 +535,38 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
private
writeFileIconConfiguration
(
settingsTarget
:
ConfigurationTarget
|
undefined
|
'
auto
'
):
Promise
<
IFileIconTheme
>
{
if
(
!
types
.
isUndefinedOrNull
(
settingsTarget
))
{
return
this
.
configurationWriter
.
writeConfiguration
(
ICON_THEME_SETTING
,
this
.
currentIconTheme
.
settingsId
,
settingsTarget
).
then
(
_
=>
this
.
currentIconTheme
);
return
this
.
writeConfiguration
(
ICON_THEME_SETTING
,
this
.
currentIconTheme
.
settingsId
,
settingsTarget
).
then
(
_
=>
this
.
currentIconTheme
);
}
return
Promise
.
resolve
(
this
.
currentIconTheme
);
}
private
get
configurationWriter
():
ConfigurationWriter
{
// separate out the ConfigurationWriter to avoid a dependency of the IConfigurationEditingService
if
(
!
this
.
_configurationWriter
)
{
this
.
_configurationWriter
=
this
.
instantiationService
.
createInstance
(
ConfigurationWriter
);
public
writeConfiguration
(
key
:
string
,
value
:
any
,
settingsTarget
:
ConfigurationTarget
|
'
auto
'
):
Promise
<
void
>
{
let
settings
=
this
.
configurationService
.
inspect
(
key
);
if
(
settingsTarget
===
'
auto
'
)
{
if
(
!
types
.
isUndefined
(
settings
.
workspaceFolder
))
{
settingsTarget
=
ConfigurationTarget
.
WORKSPACE_FOLDER
;
}
else
if
(
!
types
.
isUndefined
(
settings
.
workspace
))
{
settingsTarget
=
ConfigurationTarget
.
WORKSPACE
;
}
else
{
settingsTarget
=
ConfigurationTarget
.
USER
;
}
}
return
this
.
_configurationWriter
;
if
(
settingsTarget
===
ConfigurationTarget
.
USER
)
{
if
(
value
===
settings
.
user
)
{
return
Promise
.
resolve
(
undefined
);
// nothing to do
}
else
if
(
value
===
settings
.
default
)
{
if
(
types
.
isUndefined
(
settings
.
user
))
{
return
Promise
.
resolve
(
undefined
);
// nothing to do
}
value
=
undefined
;
// remove configuration from user settings
}
}
else
if
(
settingsTarget
===
ConfigurationTarget
.
WORKSPACE
||
settingsTarget
===
ConfigurationTarget
.
WORKSPACE_FOLDER
)
{
if
(
value
===
settings
.
value
)
{
return
Promise
.
resolve
(
undefined
);
// nothing to do
}
}
return
this
.
configurationService
.
updateValue
(
key
,
value
,
settingsTarget
);
}
private
getBaseThemeFromContainer
()
{
...
...
@@ -585,40 +603,6 @@ function _applyRules(styleSheetContent: string, rulesClassName: string) {
registerColorThemeSchemas
();
registerFileIconThemeSchemas
();
class
ConfigurationWriter
{
constructor
(@
IConfigurationService
private
readonly
configurationService
:
IConfigurationService
)
{
}
public
writeConfiguration
(
key
:
string
,
value
:
any
,
settingsTarget
:
ConfigurationTarget
|
'
auto
'
):
Promise
<
void
>
{
let
settings
=
this
.
configurationService
.
inspect
(
key
);
if
(
settingsTarget
===
'
auto
'
)
{
if
(
!
types
.
isUndefined
(
settings
.
workspaceFolder
))
{
settingsTarget
=
ConfigurationTarget
.
WORKSPACE_FOLDER
;
}
else
if
(
!
types
.
isUndefined
(
settings
.
workspace
))
{
settingsTarget
=
ConfigurationTarget
.
WORKSPACE
;
}
else
{
settingsTarget
=
ConfigurationTarget
.
USER
;
}
}
if
(
settingsTarget
===
ConfigurationTarget
.
USER
)
{
if
(
value
===
settings
.
user
)
{
return
Promise
.
resolve
(
undefined
);
// nothing to do
}
else
if
(
value
===
settings
.
default
)
{
if
(
types
.
isUndefined
(
settings
.
user
))
{
return
Promise
.
resolve
(
undefined
);
// nothing to do
}
value
=
undefined
;
// remove configuration from user settings
}
}
else
if
(
settingsTarget
===
ConfigurationTarget
.
WORKSPACE
||
settingsTarget
===
ConfigurationTarget
.
WORKSPACE_FOLDER
)
{
if
(
value
===
settings
.
value
)
{
return
Promise
.
resolve
(
undefined
);
// nothing to do
}
}
return
this
.
configurationService
.
updateValue
(
key
,
value
,
settingsTarget
);
}
}
// Configuration: Themes
const
configurationRegistry
=
Registry
.
as
<
IConfigurationRegistry
>
(
ConfigurationExtensions
.
Configuration
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录