Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
8018066b
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,发现更多精彩内容 >>
提交
8018066b
编写于
7月 17, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Settings editor - warn for core settings missing from settingsLayout.ts
上级
b4d366a7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
4 deletion
+24
-4
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
...vs/workbench/parts/preferences/browser/settingsEditor2.ts
+18
-2
src/vs/workbench/parts/preferences/browser/settingsTree.ts
src/vs/workbench/parts/preferences/browser/settingsTree.ts
+6
-2
未找到文件。
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
浏览文件 @
8018066b
...
...
@@ -87,6 +87,9 @@ export class SettingsEditor2 extends BaseEditor {
private
inSettingsEditorContextKey
:
IContextKey
<
boolean
>
;
private
searchFocusContextKey
:
IContextKey
<
boolean
>
;
/** Don't spam warnings */
private
hasWarnedMissingSettings
:
boolean
;
constructor
(
@
ITelemetryService
telemetryService
:
ITelemetryService
,
@
IConfigurationService
private
configurationService
:
IConfigurationService
,
...
...
@@ -607,9 +610,22 @@ export class SettingsEditor2 extends BaseEditor {
private
onConfigUpdate
():
TPromise
<
void
>
{
const
groups
=
this
.
defaultSettingsEditorModel
.
settingsGroups
.
slice
(
1
);
// Without commonlyUsed
const
dividedGroups
=
collections
.
groupBy
(
groups
,
g
=>
g
.
contributedByExtension
?
'
extension
'
:
'
core
'
);
const
resolvedSettingsRoot
=
resolveSettingsTree
(
tocData
,
dividedGroups
.
core
);
const
settingsResult
=
resolveSettingsTree
(
tocData
,
dividedGroups
.
core
);
const
resolvedSettingsRoot
=
settingsResult
.
tree
;
// Warn for settings not included in layout
if
(
settingsResult
.
leftoverSettings
.
size
&&
!
this
.
hasWarnedMissingSettings
)
{
let
settingKeyList
=
[];
settingsResult
.
leftoverSettings
.
forEach
(
s
=>
{
settingKeyList
.
push
(
s
.
key
);
});
this
.
logService
.
warn
(
`SettingsEditor2: Settings not included in settingsLayout.ts:
${
settingKeyList
.
join
(
'
,
'
)}
`
);
this
.
hasWarnedMissingSettings
=
true
;
}
const
commonlyUsed
=
resolveSettingsTree
(
commonlyUsedData
,
dividedGroups
.
core
);
resolvedSettingsRoot
.
children
.
unshift
(
commonlyUsed
);
resolvedSettingsRoot
.
children
.
unshift
(
commonlyUsed
.
tree
);
resolvedSettingsRoot
.
children
.
push
(
resolveExtensionsSettings
(
dividedGroups
.
extension
||
[]));
...
...
src/vs/workbench/parts/preferences/browser/settingsTree.ts
浏览文件 @
8018066b
...
...
@@ -236,8 +236,12 @@ function inspectSetting(key: string, target: SettingsTarget, configurationServic
return
{
isConfigured
,
inspected
,
targetSelector
};
}
export
function
resolveSettingsTree
(
tocData
:
ITOCEntry
,
coreSettingsGroups
:
ISettingsGroup
[]):
ITOCEntry
{
return
_resolveSettingsTree
(
tocData
,
getFlatSettings
(
coreSettingsGroups
));
export
function
resolveSettingsTree
(
tocData
:
ITOCEntry
,
coreSettingsGroups
:
ISettingsGroup
[]):
{
tree
:
ITOCEntry
,
leftoverSettings
:
Set
<
ISetting
>
}
{
const
allSettings
=
getFlatSettings
(
coreSettingsGroups
);
return
{
tree
:
_resolveSettingsTree
(
tocData
,
allSettings
),
leftoverSettings
:
allSettings
};
}
export
function
resolveExtensionsSettings
(
groups
:
ISettingsGroup
[]):
ITOCEntry
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录