Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
b3a8aa85
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,发现更多精彩内容 >>
提交
b3a8aa85
编写于
10月 28, 2019
作者:
M
Martin Aeschlimann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[theme] Copy input from theme picker when no theme was found. Fixes #40518
上级
d2baccdf
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
62 addition
and
34 deletion
+62
-34
src/vs/workbench/contrib/themes/browser/themes.contribution.ts
...s/workbench/contrib/themes/browser/themes.contribution.ts
+62
-34
未找到文件。
src/vs/workbench/contrib/themes/browser/themes.contribution.ts
浏览文件 @
b3a8aa85
...
...
@@ -59,17 +59,10 @@ export class SelectColorThemeAction extends Action {
}
selectThemeTimeout
=
window
.
setTimeout
(()
=>
{
selectThemeTimeout
=
undefined
;
let
themeId
=
theme
.
id
;
if
(
typeof
theme
.
id
===
'
undefined
'
)
{
// 'pick in marketplace' entry
if
(
applyTheme
)
{
openExtensionViewlet
(
this
.
viewletService
,
'
category:themes
'
);
}
themeId
=
currentTheme
.
id
;
}
const
themeId
=
theme
&&
theme
.
id
!==
undefined
?
theme
.
id
:
currentTheme
.
id
;
let
target
:
ConfigurationTarget
|
undefined
=
undefined
;
if
(
applyTheme
)
{
le
t
confValue
=
this
.
configurationService
.
inspect
(
COLOR_THEME_SETTING
);
cons
t
confValue
=
this
.
configurationService
.
inspect
(
COLOR_THEME_SETTING
);
target
=
typeof
confValue
.
workspace
!==
'
undefined
'
?
ConfigurationTarget
.
WORKSPACE
:
ConfigurationTarget
.
USER
;
}
...
...
@@ -82,15 +75,35 @@ export class SelectColorThemeAction extends Action {
},
applyTheme
?
0
:
200
);
};
const
placeHolder
=
localize
(
'
themes.selectTheme
'
,
"
Select Color Theme (Up/Down Keys to Preview)
"
);
const
autoFocusIndex
=
firstIndex
(
picks
,
p
=>
isItem
(
p
)
&&
p
.
id
===
currentTheme
.
id
);
const
activeItem
:
ThemeItem
=
picks
[
autoFocusIndex
]
as
ThemeItem
;
const
chooseTheme
=
(
theme
:
ThemeItem
)
=>
selectTheme
(
theme
||
currentTheme
,
true
);
const
tryTheme
=
(
theme
:
ThemeItem
)
=>
selectTheme
(
theme
,
false
);
return
this
.
quickInputService
.
pick
(
picks
,
{
placeHolder
,
activeItem
,
onDidFocus
:
tryTheme
})
.
then
(
chooseTheme
);
return
new
Promise
((
s
,
_
)
=>
{
let
isCompleted
=
false
;
const
autoFocusIndex
=
firstIndex
(
picks
,
p
=>
isItem
(
p
)
&&
p
.
id
===
currentTheme
.
id
);
const
quickpick
=
this
.
quickInputService
.
createQuickPick
<
ThemeItem
>
();
quickpick
.
items
=
picks
;
quickpick
.
placeholder
=
localize
(
'
themes.selectTheme
'
,
"
Select Color Theme (Up/Down Keys to Preview)
"
);
quickpick
.
activeItems
=
[
picks
[
autoFocusIndex
]
as
ThemeItem
];
quickpick
.
canSelectMany
=
false
;
quickpick
.
onDidAccept
(
_
=>
{
const
theme
=
quickpick
.
activeItems
[
0
];
if
(
!
theme
||
typeof
theme
.
id
===
'
undefined
'
)
{
// 'pick in marketplace' entry
openExtensionViewlet
(
this
.
viewletService
,
`category:themes
${
quickpick
.
value
}
`
);
}
else
{
selectTheme
(
theme
,
true
);
}
isCompleted
=
true
;
quickpick
.
hide
();
s
();
});
quickpick
.
onDidChangeActive
(
themes
=>
selectTheme
(
themes
[
0
],
false
));
quickpick
.
onDidHide
(()
=>
{
if
(
!
isCompleted
)
{
selectTheme
(
currentTheme
,
true
);
s
();
}
});
quickpick
.
show
();
});
});
}
}
...
...
@@ -131,16 +144,10 @@ class SelectIconThemeAction extends Action {
}
selectThemeTimeout
=
window
.
setTimeout
(()
=>
{
selectThemeTimeout
=
undefined
;
let
themeId
=
theme
.
id
;
if
(
typeof
theme
.
id
===
'
undefined
'
)
{
// 'pick in marketplace' entry
if
(
applyTheme
)
{
openExtensionViewlet
(
this
.
viewletService
,
'
tag:icon-theme
'
);
}
themeId
=
currentTheme
.
id
;
}
const
themeId
=
theme
&&
theme
.
id
!==
undefined
?
theme
.
id
:
currentTheme
.
id
;
let
target
:
ConfigurationTarget
|
undefined
=
undefined
;
if
(
applyTheme
)
{
le
t
confValue
=
this
.
configurationService
.
inspect
(
ICON_THEME_SETTING
);
cons
t
confValue
=
this
.
configurationService
.
inspect
(
ICON_THEME_SETTING
);
target
=
typeof
confValue
.
workspace
!==
'
undefined
'
?
ConfigurationTarget
.
WORKSPACE
:
ConfigurationTarget
.
USER
;
}
this
.
themeService
.
setFileIconTheme
(
themeId
,
target
).
then
(
undefined
,
...
...
@@ -152,14 +159,35 @@ class SelectIconThemeAction extends Action {
},
applyTheme
?
0
:
200
);
};
const
placeHolder
=
localize
(
'
themes.selectIconTheme
'
,
"
Select File Icon Theme
"
);
const
autoFocusIndex
=
firstIndex
(
picks
,
p
=>
isItem
(
p
)
&&
p
.
id
===
currentTheme
.
id
);
const
activeItem
:
ThemeItem
=
picks
[
autoFocusIndex
]
as
ThemeItem
;
const
chooseTheme
=
(
theme
:
ThemeItem
)
=>
selectTheme
(
theme
||
currentTheme
,
true
);
const
tryTheme
=
(
theme
:
ThemeItem
)
=>
selectTheme
(
theme
,
false
);
return
this
.
quickInputService
.
pick
(
picks
,
{
placeHolder
,
activeItem
,
onDidFocus
:
tryTheme
})
.
then
(
chooseTheme
);
return
new
Promise
((
s
,
_
)
=>
{
let
isCompleted
=
false
;
const
autoFocusIndex
=
firstIndex
(
picks
,
p
=>
isItem
(
p
)
&&
p
.
id
===
currentTheme
.
id
);
const
quickpick
=
this
.
quickInputService
.
createQuickPick
<
ThemeItem
>
();
quickpick
.
items
=
picks
;
quickpick
.
placeholder
=
localize
(
'
themes.selectIconTheme
'
,
"
Select File Icon Theme
"
);
quickpick
.
activeItems
=
[
picks
[
autoFocusIndex
]
as
ThemeItem
];
quickpick
.
canSelectMany
=
false
;
quickpick
.
onDidAccept
(
_
=>
{
const
theme
=
quickpick
.
activeItems
[
0
];
if
(
!
theme
||
typeof
theme
.
id
===
'
undefined
'
)
{
// 'pick in marketplace' entry
openExtensionViewlet
(
this
.
viewletService
,
`tag:icon-theme
${
quickpick
.
value
}
`
);
}
else
{
selectTheme
(
theme
,
true
);
}
isCompleted
=
true
;
quickpick
.
hide
();
s
();
});
quickpick
.
onDidChangeActive
(
themes
=>
selectTheme
(
themes
[
0
],
false
));
quickpick
.
onDidHide
(()
=>
{
if
(
!
isCompleted
)
{
selectTheme
(
currentTheme
,
true
);
s
();
}
});
quickpick
.
show
();
});
});
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录