Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
a4da791b
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,发现更多精彩内容 >>
提交
a4da791b
编写于
3月 29, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #45908: Use idiomatic programming
上级
c8d61024
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
9 addition
and
38 deletion
+9
-38
src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
...rkbench/parts/preferences/browser/preferencesRenderers.ts
+9
-38
未找到文件。
src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
浏览文件 @
a4da791b
...
...
@@ -879,16 +879,12 @@ export class FilteredMatchesRenderer extends Disposable implements HiddenAreasPr
public
render
(
result
:
IFilterResult
,
allSettingsGroups
:
ISettingsGroup
[]):
void
{
const
model
=
this
.
editor
.
getModel
();
this
.
hiddenAreas
=
[];
this
.
editor
.
changeDecorations
(
changeAccessor
=>
{
this
.
decorationIds
=
changeAccessor
.
deltaDecorations
(
this
.
decorationIds
,
[]);
});
if
(
result
)
{
this
.
hiddenAreas
=
this
.
computeHiddenRanges
(
result
.
filteredGroups
,
result
.
allGroups
,
model
);
this
.
editor
.
changeDecorations
(
changeAccessor
=>
{
this
.
decorationIds
=
changeAccessor
.
deltaDecorations
(
this
.
decorationIds
,
result
.
matches
.
map
(
match
=>
this
.
createDecoration
(
match
,
model
)));
});
this
.
decorationIds
=
this
.
editor
.
deltaDecorations
(
this
.
decorationIds
,
result
.
matches
.
map
(
match
=>
this
.
createDecoration
(
match
,
model
)));
}
else
{
this
.
hiddenAreas
=
this
.
computeHiddenRanges
(
null
,
allSettingsGroups
,
model
);
this
.
decorationIds
=
this
.
editor
.
deltaDecorations
(
this
.
decorationIds
,
[]);
}
}
...
...
@@ -920,11 +916,7 @@ export class FilteredMatchesRenderer extends Disposable implements HiddenAreasPr
}
public
dispose
()
{
if
(
this
.
decorationIds
)
{
this
.
decorationIds
=
this
.
editor
.
changeDecorations
(
changeAccessor
=>
{
return
changeAccessor
.
deltaDecorations
(
this
.
decorationIds
,
[]);
});
}
this
.
decorationIds
=
this
.
editor
.
deltaDecorations
(
this
.
decorationIds
,
[]);
super
.
dispose
();
}
}
...
...
@@ -940,14 +932,7 @@ export class HighlightMatchesRenderer extends Disposable {
public
render
(
matches
:
IRange
[]):
void
{
const
model
=
this
.
editor
.
getModel
();
this
.
editor
.
changeDecorations
(
changeAccessor
=>
{
this
.
decorationIds
=
changeAccessor
.
deltaDecorations
(
this
.
decorationIds
,
[])
||
[];
});
if
(
matches
.
length
)
{
this
.
editor
.
changeDecorations
(
changeAccessor
=>
{
this
.
decorationIds
=
changeAccessor
.
deltaDecorations
(
this
.
decorationIds
,
matches
.
map
(
match
=>
this
.
createDecoration
(
match
,
model
)))
||
[];
});
}
this
.
decorationIds
=
this
.
editor
.
deltaDecorations
(
this
.
decorationIds
,
matches
.
map
(
match
=>
this
.
createDecoration
(
match
,
model
)));
}
private
static
readonly
_FIND_MATCH
=
ModelDecorationOptions
.
register
({
...
...
@@ -963,11 +948,7 @@ export class HighlightMatchesRenderer extends Disposable {
}
public
dispose
()
{
if
(
this
.
decorationIds
)
{
this
.
decorationIds
=
this
.
editor
.
changeDecorations
(
changeAccessor
=>
{
return
changeAccessor
.
deltaDecorations
(
this
.
decorationIds
,
[]);
})
||
[];
}
this
.
decorationIds
=
this
.
editor
.
deltaDecorations
(
this
.
decorationIds
,
[]);
super
.
dispose
();
}
}
...
...
@@ -1383,7 +1364,7 @@ class UnsupportedSettingsRenderer extends Disposable {
}
else
{
this
.
markerService
.
remove
(
'
preferencesEditor
'
,
[
this
.
settingsEditorModel
.
uri
]);
}
this
.
editor
.
changeDecorations
(
changeAccessor
=>
this
.
decorationIds
=
changeAccessor
.
deltaDecorations
(
this
.
decorationIds
,
ranges
.
map
(
range
=>
this
.
createDecoration
(
range
,
this
.
editor
.
getModel
()
))));
this
.
decorationIds
=
this
.
editor
.
deltaDecorations
(
this
.
decorationIds
,
ranges
.
map
(
range
=>
this
.
createDecoration
(
range
,
this
.
editor
.
getModel
(
))));
}
private
createDecoration
(
range
:
IRange
,
model
:
ITextModel
):
IModelDeltaDecoration
{
...
...
@@ -1404,11 +1385,7 @@ class UnsupportedSettingsRenderer extends Disposable {
public
dispose
():
void
{
this
.
markerService
.
remove
(
'
preferencesEditor
'
,
[
this
.
settingsEditorModel
.
uri
]);
if
(
this
.
decorationIds
)
{
this
.
decorationIds
=
this
.
editor
.
changeDecorations
(
changeAccessor
=>
{
return
changeAccessor
.
deltaDecorations
(
this
.
decorationIds
,
[]);
});
}
this
.
decorationIds
=
this
.
editor
.
deltaDecorations
(
this
.
decorationIds
,
[]);
super
.
dispose
();
}
...
...
@@ -1444,8 +1421,6 @@ class WorkspaceConfigurationRenderer extends Disposable {
this
.
associatedSettingsEditorModel
=
associatedSettingsEditorModel
;
// Dim other configurations in workspace configuration file only in the context of Settings Editor
if
(
this
.
associatedSettingsEditorModel
&&
this
.
workspaceContextService
.
getWorkbenchState
()
===
WorkbenchState
.
WORKSPACE
&&
this
.
workspaceSettingsEditorModel
instanceof
WorkspaceConfigurationEditorModel
)
{
this
.
editor
.
changeDecorations
(
changeAccessor
=>
this
.
decorationIds
=
changeAccessor
.
deltaDecorations
(
this
.
decorationIds
,
[]));
const
ranges
:
IRange
[]
=
[];
for
(
const
settingsGroup
of
this
.
workspaceSettingsEditorModel
.
configurationGroups
)
{
for
(
const
section
of
settingsGroup
.
sections
)
{
...
...
@@ -1461,7 +1436,7 @@ class WorkspaceConfigurationRenderer extends Disposable {
}
}
}
this
.
editor
.
changeDecorations
(
changeAccessor
=>
this
.
decorationIds
=
changeAccessor
.
deltaDecorations
(
this
.
decorationIds
,
ranges
.
map
(
range
=>
this
.
createDecoration
(
range
,
this
.
editor
.
getModel
()
))));
this
.
decorationIds
=
this
.
editor
.
deltaDecorations
(
this
.
decorationIds
,
ranges
.
map
(
range
=>
this
.
createDecoration
(
range
,
this
.
editor
.
getModel
(
))));
}
}
...
...
@@ -1478,11 +1453,7 @@ class WorkspaceConfigurationRenderer extends Disposable {
}
public
dispose
():
void
{
if
(
this
.
decorationIds
)
{
this
.
decorationIds
=
this
.
editor
.
changeDecorations
(
changeAccessor
=>
{
return
changeAccessor
.
deltaDecorations
(
this
.
decorationIds
,
[]);
});
}
this
.
decorationIds
=
this
.
editor
.
deltaDecorations
(
this
.
decorationIds
,
[]);
super
.
dispose
();
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录