Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
b31c338c
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b31c338c
编写于
6月 20, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Settings editor - add setting to configure TOC behavior during search
上级
b1361059
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
39 addition
and
5 deletion
+39
-5
src/vs/workbench/electron-browser/main.contribution.ts
src/vs/workbench/electron-browser/main.contribution.ts
+6
-0
src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
...bench/parts/preferences/browser/media/settingsEditor2.css
+1
-2
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
...vs/workbench/parts/preferences/browser/settingsEditor2.ts
+4
-1
src/vs/workbench/parts/preferences/browser/tocTree.ts
src/vs/workbench/parts/preferences/browser/tocTree.ts
+28
-2
未找到文件。
src/vs/workbench/electron-browser/main.contribution.ts
浏览文件 @
b31c338c
...
...
@@ -306,6 +306,12 @@ configurationRegistry.registerConfiguration({
'
type
'
:
'
boolean
'
,
'
description
'
:
nls
.
localize
(
'
enableNaturalLanguageSettingsSearch
'
,
"
Controls whether to enable the natural language search mode for settings.
"
),
'
default
'
:
true
},
'
workbench.settings.settingsSearchTocBehavior
'
:
{
'
type
'
:
'
string
'
,
'
enum
'
:
[
'
hide
'
,
'
filter
'
,
'
show
'
],
'
description
'
:
nls
.
localize
(
'
settingsSearchTocBehavior
'
,
"
Controls the behavior of the settings editor TOC while searching.
"
),
'
default
'
:
'
hide
'
}
}
});
...
...
src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
浏览文件 @
b31c338c
...
...
@@ -101,7 +101,6 @@
.settings-editor
>
.settings-body
{
display
:
flex
;
margin
:
auto
;
margin-top
:
5px
;
max-width
:
1000px
;
}
...
...
@@ -115,7 +114,7 @@
}
.search-mode
.settings-toc-container
{
/* display: none; */
display
:
none
;
}
.settings-editor
>
.settings-body
.settings-toc-container
.monaco-tree-row
.settings-toc-entry
{
...
...
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
浏览文件 @
b31c338c
...
...
@@ -468,7 +468,10 @@ export class SettingsEditor2 extends BaseEditor {
}
private
toggleSearchMode
():
void
{
DOM
.
toggleClass
(
this
.
rootElement
,
'
search-mode
'
,
!!
this
.
searchResultModel
);
DOM
.
removeClass
(
this
.
rootElement
,
'
search-mode
'
);
if
(
this
.
configurationService
.
getValue
(
'
workbench.settings.settingsSearchTocBehavior
'
)
===
'
hide
'
)
{
DOM
.
toggleClass
(
this
.
rootElement
,
'
search-mode
'
,
!!
this
.
searchResultModel
);
}
}
private
onConfigUpdate
():
TPromise
<
void
>
{
...
...
src/vs/workbench/parts/preferences/browser/tocTree.ts
浏览文件 @
b31c338c
...
...
@@ -8,10 +8,12 @@ import { TPromise } from 'vs/base/common/winjs.base';
import
{
IDataSource
,
IRenderer
,
ITree
}
from
'
vs/base/parts/tree/browser/tree
'
;
import
{
SearchResultModel
,
SettingsTreeElement
,
SettingsTreeGroupElement
,
SettingsTreeSettingElement
}
from
'
vs/workbench/parts/preferences/browser/settingsTree
'
;
import
{
ISetting
}
from
'
vs/workbench/services/preferences/common/preferences
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
const
$
=
DOM
.
$
;
export
class
TOCTreeModel
{
private
_currentSearchModel
:
SearchResultModel
;
private
_settingsTreeRoot
:
SettingsTreeGroupElement
;
...
...
@@ -67,6 +69,11 @@ export class TOCTreeModel {
export
type
TOCTreeElement
=
SettingsTreeGroupElement
|
TOCTreeModel
;
export
class
TOCDataSource
implements
IDataSource
{
constructor
(
@
IConfigurationService
private
configService
:
IConfigurationService
)
{
}
getId
(
tree
:
ITree
,
element
:
SettingsTreeGroupElement
):
string
{
return
element
.
id
;
}
...
...
@@ -77,7 +84,18 @@ export class TOCDataSource implements IDataSource {
}
getChildren
(
tree
:
ITree
,
element
:
TOCTreeElement
):
TPromise
<
SettingsTreeElement
[],
any
>
{
return
TPromise
.
as
(
<
SettingsTreeElement
[]
>
element
.
children
);
return
TPromise
.
as
(
this
.
_getChildren
(
element
));
}
private
_getChildren
(
element
:
TOCTreeElement
):
SettingsTreeElement
[]
{
if
(
this
.
configService
.
getValue
(
'
workbench.settings.settingsSearchTocBehavior
'
)
===
'
filter
'
)
{
const
children
=
element
.
children
as
SettingsTreeElement
[];
// ????
return
children
.
filter
(
group
=>
{
return
(
<
any
>
group
).
count
!==
0
;
});
}
return
element
.
children
;
}
getParent
(
tree
:
ITree
,
element
:
TOCTreeElement
):
TPromise
<
any
,
any
>
{
...
...
@@ -96,6 +114,11 @@ interface ITOCEntryTemplate {
}
export
class
TOCRenderer
implements
IRenderer
{
constructor
(
@
IConfigurationService
private
configService
:
IConfigurationService
)
{
}
getHeight
(
tree
:
ITree
,
element
:
SettingsTreeElement
):
number
{
return
22
;
}
...
...
@@ -115,7 +138,10 @@ export class TOCRenderer implements IRenderer {
`
${
element
.
label
}
(
${(
<
any
>
element
).
count
}
)`
:
element
.
label
;
DOM
.
toggleClass
(
template
.
element
,
'
no-results
'
,
(
<
any
>
element
).
count
===
0
);
if
(
this
.
configService
.
getValue
(
'
workbench.settings.settingsSearchTocBehavior
'
)
===
'
show
'
)
{
DOM
.
toggleClass
(
template
.
element
,
'
no-results
'
,
(
<
any
>
element
).
count
===
0
);
}
template
.
element
.
textContent
=
label
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录