Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
53a3a0fb
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,发现更多精彩内容 >>
提交
53a3a0fb
编写于
1月 13, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
reuse meta-property for text below label & desc
上级
d5a91097
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
35 addition
and
23 deletion
+35
-23
src/vs/base/parts/quickopen/browser/quickOpenModel.ts
src/vs/base/parts/quickopen/browser/quickOpenModel.ts
+21
-18
src/vs/base/parts/quickopen/browser/quickopen.css
src/vs/base/parts/quickopen/browser/quickopen.css
+0
-1
src/vs/workbench/api/node/extHostQuickOpen.ts
src/vs/workbench/api/node/extHostQuickOpen.ts
+4
-1
src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
.../workbench/browser/parts/quickopen/quickOpenController.ts
+9
-3
src/vs/workbench/services/quickopen/common/quickOpenService.ts
...s/workbench/services/quickopen/common/quickOpenService.ts
+1
-0
未找到文件。
src/vs/base/parts/quickopen/browser/quickOpenModel.ts
浏览文件 @
53a3a0fb
...
...
@@ -18,6 +18,7 @@ import {compareAnything} from 'vs/base/common/comparers';
import
ActionBar
=
require
(
'
vs/base/browser/ui/actionbar/actionbar
'
);
import
TreeDefaults
=
require
(
'
vs/base/parts/tree/browser/treeDefaults
'
);
import
HighlightedLabel
=
require
(
'
vs/base/browser/ui/highlightedlabel/highlightedLabel
'
);
import
{
OcticonLabel
}
from
'
vs/base/browser/ui/octiconLabel/octiconLabel
'
;
import
DOM
=
require
(
'
vs/base/browser/dom
'
);
export
interface
IContext
{
...
...
@@ -67,7 +68,7 @@ export class QuickOpenEntry {
}
/**
* Meta information about the entry that is optional and can be shown
to the right of
the label
* Meta information about the entry that is optional and can be shown
below
the label
*/
public
getMeta
():
string
{
return
null
;
...
...
@@ -395,7 +396,7 @@ export interface IQuickOpenEntryTemplateData {
icon
:
HTMLSpanElement
;
prefix
:
HTMLSpanElement
;
label
:
HighlightedLabel
.
HighlightedLabel
;
meta
:
HTMLSpanElement
;
meta
:
OcticonLabel
;
description
:
HighlightedLabel
.
HighlightedLabel
;
actionBar
:
ActionBar
.
ActionBar
;
}
...
...
@@ -420,7 +421,9 @@ class Renderer implements IRenderer<QuickOpenEntry> {
if
(
entry
instanceof
QuickOpenEntryItem
)
{
return
(
<
QuickOpenEntryItem
>
entry
).
getHeight
();
}
if
(
entry
.
getMeta
())
{
return
44
;
}
return
22
;
}
...
...
@@ -482,26 +485,27 @@ class Renderer implements IRenderer<QuickOpenEntry> {
// Label
let
label
=
new
HighlightedLabel
.
HighlightedLabel
(
entry
);
// Meta
let
meta
=
document
.
createElement
(
'
span
'
);
entry
.
appendChild
(
meta
);
DOM
.
addClass
(
meta
,
'
quick-open-entry-meta
'
);
// Description
let
descriptionContainer
=
document
.
createElement
(
'
span
'
);
entry
.
appendChild
(
descriptionContainer
);
DOM
.
addClass
(
descriptionContainer
,
'
quick-open-entry-description
'
);
let
description
=
new
HighlightedLabel
.
HighlightedLabel
(
descriptionContainer
);
// Meta
let
metaContainer
=
document
.
createElement
(
'
div
'
);
entry
.
appendChild
(
metaContainer
);
DOM
.
addClass
(
metaContainer
,
'
quick-open-entry-meta
'
);
let
meta
=
new
OcticonLabel
(
metaContainer
);
return
{
container
:
container
,
icon
:
icon
,
prefix
:
prefix
,
label
:
label
,
meta
:
meta
,
description
:
description
,
group
:
group
,
actionBar
:
actionBar
container
,
icon
,
prefix
,
label
,
meta
,
description
,
group
,
actionBar
};
}
...
...
@@ -566,8 +570,7 @@ class Renderer implements IRenderer<QuickOpenEntry> {
data
.
label
.
set
(
entry
.
getLabel
()
||
''
,
labelHighlights
||
[]);
// Meta
let
metaLabel
=
entry
.
getMeta
()
||
''
;
data
.
meta
.
textContent
=
metaLabel
;
data
.
meta
.
text
=
entry
.
getMeta
();
// Description
let
descriptionHighlights
=
highlights
[
1
];
...
...
src/vs/base/parts/quickopen/browser/quickopen.css
浏览文件 @
53a3a0fb
...
...
@@ -75,7 +75,6 @@
.quick-open-widget
.quick-open-tree
.quick-open-entry-meta
{
opacity
:
0.7
;
margin-left
:
0.5em
;
}
.quick-open-widget
.quick-open-tree
.quick-open-entry-description
{
...
...
src/vs/workbench/api/node/extHostQuickOpen.ts
浏览文件 @
53a3a0fb
...
...
@@ -51,17 +51,20 @@ export class ExtHostQuickOpen {
let
item
=
items
[
handle
];
let
label
:
string
;
let
description
:
string
;
let
meta
:
string
;
if
(
typeof
item
===
'
string
'
)
{
label
=
item
;
}
else
{
label
=
item
.
label
;
description
=
item
.
description
;
meta
=
item
.
detail
;
}
pickItems
.
push
({
label
,
description
,
handle
handle
,
meta
});
}
...
...
src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
浏览文件 @
53a3a0fb
...
...
@@ -269,7 +269,7 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
let
model
=
new
QuickOpenModel
();
let
entries
=
picks
.
map
((
e
)
=>
{
if
(
typeof
e
===
'
string
'
)
{
return
new
PickOpenEntry
(
e
,
null
,
()
=>
progress
(
e
));
return
new
PickOpenEntry
(
e
,
null
,
null
,
()
=>
progress
(
e
));
}
let
entry
=
(
<
IPickOpenEntryItem
>
e
);
...
...
@@ -278,7 +278,7 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
return
new
PickOpenItem
(
entry
.
label
,
entry
.
description
,
entry
.
height
,
entry
.
render
.
bind
(
entry
),
()
=>
progress
(
e
));
}
return
new
PickOpenEntry
(
entry
.
label
,
entry
.
description
,
()
=>
progress
(
e
));
return
new
PickOpenEntry
(
entry
.
label
,
entry
.
description
,
entry
.
meta
,
()
=>
progress
(
e
));
});
if
(
picks
.
length
===
0
)
{
...
...
@@ -853,11 +853,13 @@ class PlaceholderQuickOpenEntry extends QuickOpenEntry {
class
PickOpenEntry
extends
PlaceholderQuickOpenEntry
{
private
_selected
:
boolean
;
private
description
:
string
;
private
meta
:
string
;
constructor
(
label
:
string
,
description
?:
string
,
private
onPreview
?:
()
=>
void
)
{
constructor
(
label
:
string
,
description
?:
string
,
meta
?:
string
,
private
onPreview
?:
()
=>
void
)
{
super
(
label
);
this
.
description
=
description
;
this
.
meta
=
meta
;
}
public
get
selected
():
boolean
{
...
...
@@ -868,6 +870,10 @@ class PickOpenEntry extends PlaceholderQuickOpenEntry {
return
this
.
description
;
}
public
getMeta
():
string
{
return
this
.
meta
;
}
public
run
(
mode
:
Mode
,
context
:
IContext
):
boolean
{
if
(
mode
===
Mode
.
OPEN
)
{
this
.
_selected
=
true
;
...
...
src/vs/workbench/services/quickopen/common/quickOpenService.ts
浏览文件 @
53a3a0fb
...
...
@@ -14,6 +14,7 @@ export interface IPickOpenEntry {
id
?:
string
;
label
:
string
;
description
?:
string
;
meta
?:
string
;
}
export
interface
IPickOptions
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录