Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
39612184
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,发现更多精彩内容 >>
提交
39612184
编写于
7月 03, 2018
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove progress usage from theme picker
上级
ebe5f263
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
17 deletion
+33
-17
src/vs/platform/quickOpen/common/quickOpen.ts
src/vs/platform/quickOpen/common/quickOpen.ts
+12
-4
src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
.../workbench/browser/parts/quickopen/quickOpenController.ts
+17
-7
src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts
...ench/parts/themes/electron-browser/themes.contribution.ts
+4
-6
未找到文件。
src/vs/platform/quickOpen/common/quickOpen.ts
浏览文件 @
39612184
...
...
@@ -86,6 +86,14 @@ export interface IPickOptions {
contextKey
?:
string
;
}
export
interface
IStringPickOptions
extends
IPickOptions
{
onDidFocus
?:
(
item
:
string
)
=>
void
;
}
export
interface
ITypedPickOptions
<
T
extends
IPickOpenEntry
>
extends
IPickOptions
{
onDidFocus
?:
(
entry
:
T
)
=>
void
;
}
export
interface
IShowOptions
{
quickNavigateConfiguration
?:
IQuickNavigateConfiguration
;
inputSelection
?:
{
start
:
number
;
end
:
number
;
};
...
...
@@ -114,10 +122,10 @@ export interface IQuickOpenService {
* Passing in a promise will allow you to resolve the elements in the background while quick open will show a
* progress bar spinning.
*/
pick
(
picks
:
TPromise
<
string
[]
>
,
options
?:
IPickOptions
,
token
?:
CancellationToken
):
TPromise
<
string
>
;
pick
<
T
extends
IPickOpenEntry
>
(
picks
:
TPromise
<
T
[]
>
,
options
?:
I
PickOptions
,
token
?:
CancellationToken
):
TPromise
<
T
>
;
pick
(
picks
:
string
[],
options
?:
IPickOptions
,
token
?:
CancellationToken
):
TPromise
<
string
>
;
pick
<
T
extends
IPickOpenEntry
>
(
picks
:
T
[],
options
?:
I
PickOptions
,
token
?:
CancellationToken
):
TPromise
<
T
>
;
pick
(
picks
:
TPromise
<
string
[]
>
,
options
?:
I
String
PickOptions
,
token
?:
CancellationToken
):
TPromise
<
string
>
;
pick
<
T
extends
IPickOpenEntry
>
(
picks
:
TPromise
<
T
[]
>
,
options
?:
I
TypedPickOptions
<
T
>
,
token
?:
CancellationToken
):
TPromise
<
T
>
;
pick
(
picks
:
string
[],
options
?:
I
String
PickOptions
,
token
?:
CancellationToken
):
TPromise
<
string
>
;
pick
<
T
extends
IPickOpenEntry
>
(
picks
:
T
[],
options
?:
I
TypedPickOptions
<
T
>
,
token
?:
CancellationToken
):
TPromise
<
T
>
;
/**
* Allows to navigate from the outside in an opened picker.
...
...
src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
浏览文件 @
39612184
...
...
@@ -34,7 +34,7 @@ import { Event, Emitter } from 'vs/base/common/event';
import
{
IPartService
}
from
'
vs/workbench/services/part/common/partService
'
;
import
{
QuickOpenHandler
,
QuickOpenHandlerDescriptor
,
IQuickOpenRegistry
,
Extensions
,
EditorQuickOpenEntry
,
CLOSE_ON_FOCUS_LOST_CONFIG
}
from
'
vs/workbench/browser/quickopen
'
;
import
*
as
errors
from
'
vs/base/common/errors
'
;
import
{
IPickOpenEntry
,
IFilePickOpenEntry
,
IQuickOpenService
,
I
PickOptions
,
IShowOptions
,
IPickOpenItem
}
from
'
vs/platform/quickOpen/common/quickOpen
'
;
import
{
IPickOpenEntry
,
IFilePickOpenEntry
,
IQuickOpenService
,
I
ShowOptions
,
IPickOpenItem
,
IStringPickOptions
,
ITypedPickOptions
}
from
'
vs/platform/quickOpen/common/quickOpen
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
...
...
@@ -73,6 +73,7 @@ interface IInternalPickOptions {
ignoreFocusLost
?:
boolean
;
quickNavigateConfiguration
?:
IQuickNavigateConfiguration
;
onDidType
?:
(
value
:
string
)
=>
any
;
onDidFocus
?:
(
item
:
any
)
=>
void
;
}
export
class
QuickOpenController
extends
Component
implements
IQuickOpenService
{
...
...
@@ -145,11 +146,11 @@ export class QuickOpenController extends Component implements IQuickOpenService
}
}
pick
(
picks
:
TPromise
<
string
[]
>
,
options
?:
IPickOptions
,
token
?:
CancellationToken
):
TPromise
<
string
>
;
pick
<
T
extends
IPickOpenEntry
>
(
picks
:
TPromise
<
T
[]
>
,
options
?:
I
PickOptions
,
token
?:
CancellationToken
):
TPromise
<
string
>
;
pick
(
picks
:
string
[],
options
?:
IPickOptions
,
token
?:
CancellationToken
):
TPromise
<
string
>
;
pick
<
T
extends
IPickOpenEntry
>
(
picks
:
T
[],
options
?:
I
PickOptions
,
token
?:
CancellationToken
):
TPromise
<
T
>
;
pick
(
arg1
:
string
[]
|
TPromise
<
string
[]
>
|
IPickOpenEntry
[]
|
TPromise
<
IPickOpenEntry
[]
>
,
options
?:
I
PickOptions
,
token
?:
CancellationToken
):
TPromise
<
string
|
IPickOpenEntry
>
{
pick
(
picks
:
TPromise
<
string
[]
>
,
options
?:
I
String
PickOptions
,
token
?:
CancellationToken
):
TPromise
<
string
>
;
pick
<
T
extends
IPickOpenEntry
>
(
picks
:
TPromise
<
T
[]
>
,
options
?:
I
TypedPickOptions
<
T
>
,
token
?:
CancellationToken
):
TPromise
<
string
>
;
pick
(
picks
:
string
[],
options
?:
I
String
PickOptions
,
token
?:
CancellationToken
):
TPromise
<
string
>
;
pick
<
T
extends
IPickOpenEntry
>
(
picks
:
T
[],
options
?:
I
TypedPickOptions
<
T
>
,
token
?:
CancellationToken
):
TPromise
<
T
>
;
pick
(
arg1
:
string
[]
|
TPromise
<
string
[]
>
|
IPickOpenEntry
[]
|
TPromise
<
IPickOpenEntry
[]
>
,
options
?:
I
StringPickOptions
|
ITypedPickOptions
<
IPickOpenEntry
>
,
token
?:
CancellationToken
):
TPromise
<
string
|
IPickOpenEntry
>
{
if
(
!
options
)
{
options
=
Object
.
create
(
null
);
}
...
...
@@ -279,7 +280,16 @@ export class QuickOpenController extends Component implements IQuickOpenService
// Model
const
model
=
new
QuickOpenModel
([],
new
PickOpenActionProvider
());
const
entries
=
picks
.
map
((
e
,
index
)
=>
this
.
instantiationService
.
createInstance
(
PickOpenEntry
,
e
,
index
,
()
=>
progress
(
e
),
()
=>
this
.
pickOpenWidget
.
refresh
()));
const
entries
=
picks
.
map
((
e
,
index
)
=>
{
const
onPreview
=
()
=>
{
if
(
options
.
onDidFocus
)
{
options
.
onDidFocus
(
e
);
}
progress
(
e
);
};
return
this
.
instantiationService
.
createInstance
(
PickOpenEntry
,
e
,
index
,
onPreview
,
()
=>
this
.
pickOpenWidget
.
refresh
());
});
if
(
picks
.
length
===
0
)
{
entries
.
push
(
this
.
instantiationService
.
createInstance
(
PickOpenEntry
,
{
label
:
nls
.
localize
(
'
emptyPicks
'
,
"
There are no entries to pick from
"
)
},
0
,
null
,
null
));
}
...
...
src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts
浏览文件 @
39612184
...
...
@@ -77,13 +77,11 @@ export class SelectColorThemeAction extends Action {
const
placeHolder
=
localize
(
'
themes.selectTheme
'
,
"
Select Color Theme (Up/Down Keys to Preview)
"
);
const
autoFocusIndex
=
firstIndex
(
picks
,
p
=>
p
.
id
===
currentTheme
.
id
);
const
delayer
=
new
Delayer
<
void
>
(
100
);
const
chooseTheme
=
theme
=>
delayer
.
trigger
(()
=>
selectTheme
(
theme
||
currentTheme
,
true
),
0
);
const
tryTheme
=
theme
=>
delayer
.
trigger
(()
=>
selectTheme
(
theme
,
false
));
return
this
.
quickOpenService
.
pick
(
picks
,
{
placeHolder
,
autoFocus
:
{
autoFocusIndex
}
})
.
then
(
theme
=>
delayer
.
trigger
(()
=>
selectTheme
(
theme
||
currentTheme
,
true
),
0
),
null
,
theme
=>
delayer
.
trigger
(()
=>
selectTheme
(
theme
,
false
))
);
return
this
.
quickOpenService
.
pick
(
picks
,
{
placeHolder
,
autoFocus
:
{
autoFocusIndex
},
onDidFocus
:
tryTheme
})
.
then
(
chooseTheme
);
});
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录