Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
b7548886
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,发现更多精彩内容 >>
提交
b7548886
编写于
6月 14, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Settings editor - fix search results
上级
0abbd7e4
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
48 addition
and
30 deletion
+48
-30
src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
...bench/parts/preferences/browser/media/settingsEditor2.css
+5
-0
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
...vs/workbench/parts/preferences/browser/settingsEditor2.ts
+4
-2
src/vs/workbench/parts/preferences/browser/settingsTree.ts
src/vs/workbench/parts/preferences/browser/settingsTree.ts
+39
-28
未找到文件。
src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
浏览文件 @
b7548886
...
...
@@ -126,6 +126,11 @@
width
:
200px
;
}
.settings-editor
>
.settings-body
.settings-toc-container
.monaco-tree-row
.settings-toc-entry
{
overflow
:
hidden
;
text-overflow
:
ellipsis
;
}
.settings-editor
>
.settings-body
.settings-tree-container
{
flex
:
1
;
border-spacing
:
0
;
...
...
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
浏览文件 @
b7548886
...
...
@@ -239,8 +239,10 @@ export class SettingsEditor2 extends BaseEditor {
});
this
.
_register
(
this
.
tocTree
.
onDidChangeSelection
(
e
=>
{
const
element
=
this
.
settingsTreeModel
.
getElementById
(
e
.
selection
[
0
]
&&
e
.
selection
[
0
].
id
);
this
.
settingsTree
.
reveal
(
element
,
0
);
if
(
this
.
settingsTreeModel
)
{
const
element
=
this
.
settingsTreeModel
.
getElementById
(
e
.
selection
[
0
]
&&
e
.
selection
[
0
].
id
);
this
.
settingsTree
.
reveal
(
element
,
0
);
}
}));
}
...
...
src/vs/workbench/parts/preferences/browser/settingsTree.ts
浏览文件 @
b7548886
...
...
@@ -47,7 +47,7 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
export
abstract
class
SettingsTreeElement
{
id
:
string
;
parent
:
SettingsTreeElement
;
parent
:
any
;
// SearchResultModel or group element... TODO search should be more similar to the normal case
}
export
class
SettingsTreeGroupElement
extends
SettingsTreeElement
{
...
...
@@ -108,38 +108,43 @@ export class SettingsTreeModel {
}
private
createSettingsTreeSettingElement
(
setting
:
ISetting
,
parent
:
SettingsTreeGroupElement
):
SettingsTreeSettingElement
{
const
element
=
new
SettingsTreeSettingElement
();
element
.
id
=
setting
.
key
;
element
.
parent
=
parent
;
const
element
=
createSettingsTreeSettingElement
(
setting
,
parent
,
this
.
viewState
.
settingsTarget
,
this
.
configurationService
);
this
.
_treeElementsById
.
set
(
element
.
id
,
element
);
return
element
;
}
}
const
{
isConfigured
,
inspected
,
targetSelector
}
=
inspectSetting
(
setting
.
key
,
this
.
viewState
.
settingsTarget
,
this
.
configurationService
);
function
createSettingsTreeSettingElement
(
setting
:
ISetting
,
parent
:
any
,
settingsTarget
:
SettingsTarget
,
configurationService
:
IConfigurationService
):
SettingsTreeSettingElement
{
const
element
=
new
SettingsTreeSettingElement
();
element
.
id
=
setting
.
key
;
element
.
parent
=
parent
;
const
displayValue
=
isConfigured
?
inspected
[
targetSelector
]
:
inspected
.
default
;
const
overriddenScopeList
=
[];
if
(
targetSelector
===
'
user
'
&&
typeof
inspected
.
workspace
!==
'
undefined
'
)
{
overriddenScopeList
.
push
(
localize
(
'
workspace
'
,
"
Workspace
"
));
}
const
{
isConfigured
,
inspected
,
targetSelector
}
=
inspectSetting
(
setting
.
key
,
settingsTarget
,
configurationService
);
if
(
targetSelector
===
'
workspace
'
&&
typeof
inspected
.
user
!==
'
undefined
'
)
{
overriddenScopeList
.
push
(
localize
(
'
user
'
,
"
User
"
));
}
const
displayValue
=
isConfigured
?
inspected
[
targetSelector
]
:
inspected
.
default
;
const
overriddenScopeList
=
[];
if
(
targetSelector
===
'
user
'
&&
typeof
inspected
.
workspace
!==
'
undefined
'
)
{
overriddenScopeList
.
push
(
localize
(
'
workspace
'
,
"
Workspace
"
));
}
const
displayKeyFormat
=
settingKeyToDisplayFormat
(
setting
.
key
,
parent
.
id
);
element
.
setting
=
setting
;
element
.
displayLabel
=
displayKeyFormat
.
label
;
element
.
displayCategory
=
displayKeyFormat
.
category
;
element
.
isExpanded
=
false
;
if
(
targetSelector
===
'
workspace
'
&&
typeof
inspected
.
user
!==
'
undefined
'
)
{
overriddenScopeList
.
push
(
localize
(
'
user
'
,
"
User
"
));
}
element
.
value
=
displayValue
;
element
.
isConfigured
=
isConfigured
;
element
.
overriddenScopeList
=
overriddenScopeList
;
element
.
description
=
setting
.
description
.
join
(
'
\n
'
);
element
.
enum
=
setting
.
enum
;
element
.
valueType
=
setting
.
type
;
const
displayKeyFormat
=
settingKeyToDisplayFormat
(
setting
.
key
,
parent
.
id
);
element
.
setting
=
setting
;
element
.
displayLabel
=
displayKeyFormat
.
label
;
element
.
displayCategory
=
displayKeyFormat
.
category
;
element
.
isExpanded
=
false
;
this
.
_treeElementsById
.
set
(
element
.
id
,
element
);
return
element
;
}
element
.
value
=
displayValue
;
element
.
isConfigured
=
isConfigured
;
element
.
overriddenScopeList
=
overriddenScopeList
;
element
.
description
=
setting
.
description
.
join
(
'
\n
'
);
element
.
enum
=
setting
.
enum
;
element
.
valueType
=
setting
.
type
;
return
element
;
}
function
inspectSetting
(
key
:
string
,
target
:
SettingsTarget
,
configurationService
:
IConfigurationService
):
{
isConfigured
:
boolean
,
inspected
:
any
,
targetSelector
:
string
}
{
...
...
@@ -214,6 +219,12 @@ function getFlatSettings(settingsGroups: ISettingsGroup[]) {
export
class
SettingsDataSource
implements
IDataSource
{
constructor
(
private
viewState
:
ISettingsEditorViewState
,
@
IConfigurationService
private
configurationService
:
IConfigurationService
)
{
}
getId
(
tree
:
ITree
,
element
:
SettingsTreeElement
):
string
{
return
element
.
id
;
}
...
...
@@ -232,7 +243,7 @@ export class SettingsDataSource implements IDataSource {
private
getSearchResultChildren
(
searchResult
:
SearchResultModel
):
SettingsTreeSettingElement
[]
{
return
searchResult
.
getFlatSettings
()
.
map
(
s
=>
this
.
getSettingElement
(
s
,
searchResult
,
'
searchResult
'
));
.
map
(
s
=>
createSettingsTreeSettingElement
(
s
,
searchResult
,
this
.
viewState
.
settingsTarget
,
this
.
configurationService
));
}
getChildren
(
tree
:
ITree
,
element
:
SettingsTreeElement
):
TPromise
<
any
,
any
>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录