Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
0a58b65a
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,发现更多精彩内容 >>
提交
0a58b65a
编写于
1月 13, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
quickopen - prep for meta reuse
上级
68e5439a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
4 addition
and
29 deletion
+4
-29
src/vs/editor/contrib/quickOpen/browser/quickOutline.ts
src/vs/editor/contrib/quickOpen/browser/quickOutline.ts
+2
-20
src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
...vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
+2
-9
未找到文件。
src/vs/editor/contrib/quickOpen/browser/quickOutline.ts
浏览文件 @
0a58b65a
...
@@ -26,18 +26,16 @@ var SCOPE_PREFIX = ':';
...
@@ -26,18 +26,16 @@ var SCOPE_PREFIX = ':';
class
SymbolEntry
extends
QuickOpenModel
.
QuickOpenEntryGroup
{
class
SymbolEntry
extends
QuickOpenModel
.
QuickOpenEntryGroup
{
private
name
:
string
;
private
name
:
string
;
private
meta
:
string
;
private
type
:
string
;
private
type
:
string
;
private
description
:
string
;
private
description
:
string
;
private
range
:
EditorCommon
.
IRange
;
private
range
:
EditorCommon
.
IRange
;
private
editor
:
EditorCommon
.
ICommonCodeEditor
;
private
editor
:
EditorCommon
.
ICommonCodeEditor
;
private
decorator
:
EditorQuickOpen
.
IDecorator
;
private
decorator
:
EditorQuickOpen
.
IDecorator
;
constructor
(
name
:
string
,
meta
:
string
,
type
:
string
,
description
:
string
,
range
:
EditorCommon
.
IRange
,
highlights
:
QuickOpenModel
.
IHighlight
[],
editor
:
EditorCommon
.
ICommonCodeEditor
,
decorator
:
EditorQuickOpen
.
IDecorator
)
{
constructor
(
name
:
string
,
type
:
string
,
description
:
string
,
range
:
EditorCommon
.
IRange
,
highlights
:
QuickOpenModel
.
IHighlight
[],
editor
:
EditorCommon
.
ICommonCodeEditor
,
decorator
:
EditorQuickOpen
.
IDecorator
)
{
super
();
super
();
this
.
name
=
name
;
this
.
name
=
name
;
this
.
meta
=
meta
;
this
.
type
=
type
;
this
.
type
=
type
;
this
.
description
=
description
;
this
.
description
=
description
;
this
.
range
=
range
;
this
.
range
=
range
;
...
@@ -50,10 +48,6 @@ class SymbolEntry extends QuickOpenModel.QuickOpenEntryGroup {
...
@@ -50,10 +48,6 @@ class SymbolEntry extends QuickOpenModel.QuickOpenEntryGroup {
return
this
.
name
;
return
this
.
name
;
}
}
public
getMeta
():
string
{
return
this
.
meta
;
}
public
getIcon
():
string
{
public
getIcon
():
string
{
return
this
.
type
;
return
this
.
type
;
}
}
...
@@ -210,18 +204,6 @@ export class QuickOutlineAction extends EditorQuickOpen.BaseEditorQuickOpenActio
...
@@ -210,18 +204,6 @@ export class QuickOutlineAction extends EditorQuickOpen.BaseEditorQuickOpenActio
for
(
var
i
=
0
;
i
<
flattened
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
flattened
.
length
;
i
++
)
{
var
element
=
flattened
[
i
];
var
element
=
flattened
[
i
];
var
label
=
Strings
.
trim
(
element
.
label
);
var
label
=
Strings
.
trim
(
element
.
label
);
var
meta
:
string
=
null
;
// Parse out parameters from method/function if present
if
(
element
.
type
===
'
method
'
||
element
.
type
===
'
function
'
)
{
var
indexOf
=
label
.
indexOf
(
'
(
'
);
if
(
indexOf
>
0
)
{
meta
=
label
.
substr
(
indexOf
);
label
=
label
.
substr
(
0
,
indexOf
);
}
else
{
meta
=
'
()
'
;
// otherwise make clear this is a method by adding ()
}
}
// Check for meatch
// Check for meatch
var
highlights
=
Filters
.
matchesFuzzy
(
normalizedSearchValue
,
label
);
var
highlights
=
Filters
.
matchesFuzzy
(
normalizedSearchValue
,
label
);
...
@@ -234,7 +216,7 @@ export class QuickOutlineAction extends EditorQuickOpen.BaseEditorQuickOpenActio
...
@@ -234,7 +216,7 @@ export class QuickOutlineAction extends EditorQuickOpen.BaseEditorQuickOpenActio
}
}
// Add
// Add
results
.
push
(
new
SymbolEntry
(
label
,
meta
,
element
.
type
,
description
,
element
.
range
,
highlights
,
this
.
editor
,
this
));
results
.
push
(
new
SymbolEntry
(
label
,
element
.
type
,
description
,
element
.
range
,
highlights
,
this
.
editor
,
this
));
}
}
}
}
...
...
src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
浏览文件 @
0a58b65a
...
@@ -231,19 +231,17 @@ class SymbolEntry extends EditorQuickOpenEntryGroup {
...
@@ -231,19 +231,17 @@ class SymbolEntry extends EditorQuickOpenEntryGroup {
private
editorService
:
IWorkbenchEditorService
;
private
editorService
:
IWorkbenchEditorService
;
private
index
:
number
;
private
index
:
number
;
private
name
:
string
;
private
name
:
string
;
private
meta
:
string
;
private
type
:
string
;
private
type
:
string
;
private
icon
:
string
;
private
icon
:
string
;
private
description
:
string
;
private
description
:
string
;
private
range
:
IRange
;
private
range
:
IRange
;
private
handler
:
GotoSymbolHandler
;
private
handler
:
GotoSymbolHandler
;
constructor
(
index
:
number
,
name
:
string
,
meta
:
string
,
type
:
string
,
description
:
string
,
icon
:
string
,
range
:
IRange
,
highlights
:
IHighlight
[],
editorService
:
IWorkbenchEditorService
,
handler
:
GotoSymbolHandler
)
{
constructor
(
index
:
number
,
name
:
string
,
type
:
string
,
description
:
string
,
icon
:
string
,
range
:
IRange
,
highlights
:
IHighlight
[],
editorService
:
IWorkbenchEditorService
,
handler
:
GotoSymbolHandler
)
{
super
();
super
();
this
.
index
=
index
;
this
.
index
=
index
;
this
.
name
=
name
;
this
.
name
=
name
;
this
.
meta
=
meta
;
this
.
type
=
type
;
this
.
type
=
type
;
this
.
icon
=
icon
;
this
.
icon
=
icon
;
this
.
description
=
description
;
this
.
description
=
description
;
...
@@ -261,10 +259,6 @@ class SymbolEntry extends EditorQuickOpenEntryGroup {
...
@@ -261,10 +259,6 @@ class SymbolEntry extends EditorQuickOpenEntryGroup {
return
this
.
name
;
return
this
.
name
;
}
}
public
getMeta
():
string
{
return
this
.
meta
;
}
public
getIcon
():
string
{
public
getIcon
():
string
{
return
this
.
icon
;
return
this
.
icon
;
}
}
...
@@ -460,7 +454,6 @@ export class GotoSymbolHandler extends QuickOpenHandler {
...
@@ -460,7 +454,6 @@ export class GotoSymbolHandler extends QuickOpenHandler {
for
(
let
i
=
0
;
i
<
flattened
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
flattened
.
length
;
i
++
)
{
let
element
=
flattened
[
i
];
let
element
=
flattened
[
i
];
let
label
=
strings
.
trim
(
element
.
label
);
let
label
=
strings
.
trim
(
element
.
label
);
let
meta
:
string
=
null
;
// Show parent scope as description
// Show parent scope as description
let
description
:
string
=
element
.
containerLabel
;
let
description
:
string
=
element
.
containerLabel
;
...
@@ -470,7 +463,7 @@ export class GotoSymbolHandler extends QuickOpenHandler {
...
@@ -470,7 +463,7 @@ export class GotoSymbolHandler extends QuickOpenHandler {
// Add
// Add
let
icon
=
element
.
icon
||
element
.
type
;
let
icon
=
element
.
icon
||
element
.
type
;
results
.
push
(
new
SymbolEntry
(
i
,
label
,
meta
,
element
.
type
,
description
,
icon
,
element
.
range
,
null
,
this
.
editorService
,
this
));
results
.
push
(
new
SymbolEntry
(
i
,
label
,
element
.
type
,
description
,
icon
,
element
.
range
,
null
,
this
.
editorService
,
this
));
}
}
return
results
;
return
results
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录