Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
3ce8963a
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,发现更多精彩内容 >>
提交
3ce8963a
编写于
7月 29, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Settings editor - TOC should only expand the section with a selected item
上级
643a15e5
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
38 addition
and
13 deletion
+38
-13
src/vs/base/parts/tree/browser/treeUtils.ts
src/vs/base/parts/tree/browser/treeUtils.ts
+23
-0
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
...vs/workbench/parts/preferences/browser/settingsEditor2.ts
+15
-9
src/vs/workbench/parts/preferences/browser/tocTree.ts
src/vs/workbench/parts/preferences/browser/tocTree.ts
+0
-4
未找到文件。
src/vs/base/parts/tree/browser/treeUtils.ts
0 → 100644
浏览文件 @
3ce8963a
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
*
as
_
from
'
vs/base/parts/tree/browser/tree
'
;
export
function
collapseAll
(
tree
:
_
.
ITree
):
void
{
const
nav
=
tree
.
getNavigator
();
let
cur
;
while
(
cur
=
nav
.
next
())
{
tree
.
collapse
(
cur
);
}
}
export
function
expandAll
(
tree
:
_
.
ITree
):
void
{
const
nav
=
tree
.
getNavigator
();
let
cur
;
while
(
cur
=
nav
.
next
())
{
tree
.
expand
(
cur
);
}
}
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
浏览文件 @
3ce8963a
...
...
@@ -4,6 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import
*
as
DOM
from
'
vs/base/browser/dom
'
;
import
{
Separator
}
from
'
vs/base/browser/ui/actionbar/actionbar
'
;
import
{
Button
}
from
'
vs/base/browser/ui/button/button
'
;
import
{
ToolBar
}
from
'
vs/base/browser/ui/toolbar/toolbar
'
;
import
{
Action
}
from
'
vs/base/common/actions
'
;
...
...
@@ -15,7 +16,8 @@ import { getErrorMessage, isPromiseCanceledError } from 'vs/base/common/errors';
import
URI
from
'
vs/base/common/uri
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
ITreeConfiguration
}
from
'
vs/base/parts/tree/browser/tree
'
;
import
{
OpenMode
,
DefaultTreestyler
}
from
'
vs/base/parts/tree/browser/treeDefaults
'
;
import
{
DefaultTreestyler
,
OpenMode
}
from
'
vs/base/parts/tree/browser/treeDefaults
'
;
import
{
collapseAll
,
expandAll
}
from
'
vs/base/parts/tree/browser/treeUtils
'
;
import
'
vs/css!./media/settingsEditor2
'
;
import
{
localize
}
from
'
vs/nls
'
;
import
{
ConfigurationTarget
,
IConfigurationOverrides
,
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
...
...
@@ -26,22 +28,21 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import
{
WorkbenchTree
,
WorkbenchTreeController
}
from
'
vs/platform/list/browser/listService
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
editorBackground
,
foreground
}
from
'
vs/platform/theme/common/colorRegistry
'
;
import
{
attachButtonStyler
,
attachStyler
}
from
'
vs/platform/theme/common/styler
'
;
import
{
IThemeService
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
BaseEditor
}
from
'
vs/workbench/browser/parts/editor/baseEditor
'
;
import
{
EditorOptions
,
IEditor
}
from
'
vs/workbench/common/editor
'
;
import
{
PreferencesEditor
}
from
'
vs/workbench/parts/preferences/browser/preferencesEditor
'
;
import
{
SearchWidget
,
SettingsTarget
,
SettingsTargetsWidget
}
from
'
vs/workbench/parts/preferences/browser/preferencesWidgets
'
;
import
{
commonlyUsedData
,
tocData
}
from
'
vs/workbench/parts/preferences/browser/settingsLayout
'
;
import
{
ISettingsEditorViewState
,
resolveExtensionsSettings
,
resolveSettingsTree
,
SearchResultIdx
,
SearchResultModel
,
SettingsRenderer
,
SettingsTree
,
SettingsTreeElement
,
SettingsTreeFilter
,
SettingsTreeGroupElement
,
SettingsTreeModel
,
SettingsTreeSettingElement
,
MODIFIED_SETTING_TAG
,
ONLINE_SERVICES_SETTING_TAG
}
from
'
vs/workbench/parts/preferences/browser/settingsTree
'
;
import
{
ISettingsEditorViewState
,
MODIFIED_SETTING_TAG
,
ONLINE_SERVICES_SETTING_TAG
,
resolveExtensionsSettings
,
resolveSettingsTree
,
SearchResultIdx
,
SearchResultModel
,
SettingsRenderer
,
SettingsTree
,
SettingsTreeElement
,
SettingsTreeFilter
,
SettingsTreeGroupElement
,
SettingsTreeModel
,
SettingsTreeSettingElement
}
from
'
vs/workbench/parts/preferences/browser/settingsTree
'
;
import
{
settingsHeaderForeground
}
from
'
vs/workbench/parts/preferences/browser/settingsWidgets
'
;
import
{
TOCDataSource
,
TOCRenderer
,
TOCTreeModel
}
from
'
vs/workbench/parts/preferences/browser/tocTree
'
;
import
{
CONTEXT_SETTINGS_EDITOR
,
CONTEXT_SETTINGS_FIRST_ROW_FOCUS
,
CONTEXT_SETTINGS_ROW_FOCUS
,
CONTEXT_SETTINGS_SEARCH_FOCUS
,
CONTEXT_TOC_ROW_FOCUS
,
IPreferencesSearchService
,
ISearchProvider
}
from
'
vs/workbench/parts/preferences/common/preferences
'
;
import
{
IPreferencesService
,
ISearchResult
,
ISettingsEditorModel
}
from
'
vs/workbench/services/preferences/common/preferences
'
;
import
{
SettingsEditor2Input
}
from
'
vs/workbench/services/preferences/common/preferencesEditorInput
'
;
import
{
DefaultSettingsEditorModel
}
from
'
vs/workbench/services/preferences/common/preferencesModels
'
;
import
{
editorBackground
,
foreground
}
from
'
vs/platform/theme/common/colorRegistry
'
;
import
{
settingsHeaderForeground
}
from
'
vs/workbench/parts/preferences/browser/settingsWidgets
'
;
import
{
Separator
}
from
'
vs/base/browser/ui/actionbar/actionbar
'
;
import
{
PreferencesEditor
}
from
'
vs/workbench/parts/preferences/browser/preferencesEditor
'
;
const
$
=
DOM
.
$
;
...
...
@@ -462,11 +463,15 @@ export class SettingsEditor2 extends BaseEditor {
null
;
if
(
element
&&
this
.
tocTree
.
getSelection
()[
0
]
!==
element
)
{
this
.
tocTree
.
reveal
(
element
);
const
elementTop
=
this
.
tocTree
.
getRelativeTop
(
element
);
collapseAll
(
this
.
tocTree
);
if
(
elementTop
<
0
)
{
this
.
tocTree
.
reveal
(
element
,
0
);
}
else
if
(
elementTop
>
1
)
{
this
.
tocTree
.
reveal
(
element
,
1
);
}
else
{
this
.
tocTree
.
reveal
(
element
,
elementTop
);
}
this
.
tocTree
.
setSelection
([
element
]);
...
...
@@ -701,9 +706,8 @@ export class SettingsEditor2 extends BaseEditor {
this
.
viewState
.
filterToCategory
=
null
;
this
.
tocTree
.
refresh
();
this
.
toggleSearchMode
();
this
.
settingsTree
.
setInput
(
this
.
settingsTreeModel
.
root
);
return
TPromise
.
wrap
(
null
);
collapseAll
(
this
.
tocTree
);
return
this
.
settingsTree
.
setInput
(
this
.
settingsTreeModel
.
root
);
}
}
...
...
@@ -776,6 +780,8 @@ export class SettingsEditor2 extends BaseEditor {
}
this
.
tocTreeModel
.
update
();
expandAll
(
this
.
tocTree
);
resolve
(
this
.
refreshTreeAndMaintainFocus
());
});
},
()
=>
{
...
...
src/vs/workbench/parts/preferences/browser/tocTree.ts
浏览文件 @
3ce8963a
...
...
@@ -102,10 +102,6 @@ export class TOCDataSource implements IDataSource {
getParent
(
tree
:
ITree
,
element
:
TOCTreeElement
):
TPromise
<
any
,
any
>
{
return
TPromise
.
wrap
(
element
instanceof
SettingsTreeGroupElement
&&
element
.
parent
);
}
shouldAutoexpand
()
{
return
true
;
}
}
const
TOC_ENTRY_TEMPLATE_ID
=
'
settings.toc.entry
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录