Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
b208494b
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,发现更多精彩内容 >>
提交
b208494b
编写于
7月 26, 2017
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #31409
上级
c1a169b9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
63 addition
and
3 deletion
+63
-3
src/vs/workbench/parts/preferences/browser/media/preferences.css
...workbench/parts/preferences/browser/media/preferences.css
+1
-1
src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
...rkbench/parts/preferences/browser/preferencesRenderers.ts
+62
-2
未找到文件。
src/vs/workbench/parts/preferences/browser/media/preferences.css
浏览文件 @
b208494b
...
...
@@ -211,7 +211,7 @@
background
:
url('edit_inverse.svg')
center
center
no-repeat
;
}
.monaco-editor
.
invalidSetting
{
.monaco-editor
.
dim-configuration
{
color
:
#b1b1b1
;
}
...
...
src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
浏览文件 @
b208494b
...
...
@@ -31,6 +31,7 @@ import { IMessageService, Severity } from 'vs/platform/message/common/message';
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
ICursorPositionChangedEvent
}
from
'
vs/editor/common/controller/cursorEvents
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/textModelWithDecorations
'
;
import
{
IWorkspaceContextService
}
from
"
vs/platform/workspace/common/workspace
"
;
export
interface
IPreferencesRenderer
<
T
>
extends
IDisposable
{
preferencesModel
:
IPreferencesEditorModel
<
T
>
;
...
...
@@ -171,6 +172,7 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
export
class
WorkspaceSettingsRenderer
extends
UserSettingsRenderer
implements
IPreferencesRenderer
<
ISetting
>
{
private
untrustedSettingRenderer
:
UnsupportedWorkspaceSettingsRenderer
;
private
workspaceConfigurationRenderer
:
WorkspaceConfigurationRenderer
;
constructor
(
editor
:
ICodeEditor
,
preferencesModel
:
SettingsEditorModel
,
associatedPreferencesModel
:
IPreferencesEditorModel
<
ISetting
>
,
@
IPreferencesService
preferencesService
:
IPreferencesService
,
...
...
@@ -182,6 +184,7 @@ export class WorkspaceSettingsRenderer extends UserSettingsRenderer implements I
)
{
super
(
editor
,
preferencesModel
,
associatedPreferencesModel
,
preferencesService
,
telemetryService
,
textFileService
,
configurationEditingService
,
messageService
,
instantiationService
);
this
.
untrustedSettingRenderer
=
this
.
_register
(
instantiationService
.
createInstance
(
UnsupportedWorkspaceSettingsRenderer
,
editor
,
preferencesModel
));
this
.
workspaceConfigurationRenderer
=
this
.
_register
(
instantiationService
.
createInstance
(
WorkspaceConfigurationRenderer
,
editor
,
preferencesModel
));
}
protected
createHeader
():
void
{
...
...
@@ -191,6 +194,7 @@ export class WorkspaceSettingsRenderer extends UserSettingsRenderer implements I
public
render
():
void
{
super
.
render
();
this
.
untrustedSettingRenderer
.
render
();
this
.
workspaceConfigurationRenderer
.
render
();
}
}
...
...
@@ -975,7 +979,6 @@ class UnsupportedWorkbenchSettingsRenderer extends Disposable {
constructor
(
private
editor
:
editorCommon
.
ICommonCodeEditor
,
private
workspaceSettingsEditorModel
:
SettingsEditorModel
,
@
IWorkspaceConfigurationService
private
configurationService
:
IWorkspaceConfigurationService
,
@
IMarkerService
private
markerService
:
IMarkerService
)
{
super
();
this
.
_register
(
this
.
configurationService
.
onDidUpdateConfiguration
(()
=>
this
.
render
()));
...
...
@@ -1006,7 +1009,7 @@ class UnsupportedWorkbenchSettingsRenderer extends Disposable {
private
static
_INVALID_SETTING_
=
ModelDecorationOptions
.
register
({
stickiness
:
editorCommon
.
TrackedRangeStickiness
.
NeverGrowsWhenTypingAtEdges
,
inlineClassName
:
'
invalidSetting
'
,
inlineClassName
:
'
dim-configuration
'
,
hoverMessage
:
nls
.
localize
(
'
unsupportedWorkbenchSetting
'
,
"
Setting is dimmed because it cannot be configured for folder resources.
"
)
});
...
...
@@ -1017,6 +1020,63 @@ class UnsupportedWorkbenchSettingsRenderer extends Disposable {
};
}
public
dispose
():
void
{
if
(
this
.
decorationIds
)
{
this
.
decorationIds
=
this
.
editor
.
changeDecorations
(
changeAccessor
=>
{
return
changeAccessor
.
deltaDecorations
(
this
.
decorationIds
,
[]);
});
}
super
.
dispose
();
}
}
class
WorkspaceConfigurationRenderer
extends
Disposable
{
private
decorationIds
:
string
[]
=
[];
private
renderingDelayer
:
Delayer
<
void
>
=
new
Delayer
<
void
>
(
200
);
constructor
(
private
editor
:
editorCommon
.
ICommonCodeEditor
,
private
workspaceSettingsEditorModel
:
SettingsEditorModel
,
@
IWorkspaceContextService
private
workspaceContextService
:
IWorkspaceContextService
)
{
super
();
this
.
_register
(
this
.
editor
.
getModel
().
onDidChangeContent
(()
=>
this
.
renderingDelayer
.
trigger
(()
=>
this
.
render
())));
}
public
render
():
void
{
if
(
this
.
workspaceContextService
.
hasMultiFolderWorkspace
())
{
this
.
editor
.
changeDecorations
(
changeAccessor
=>
this
.
decorationIds
=
changeAccessor
.
deltaDecorations
(
this
.
decorationIds
,
[]));
const
ranges
:
IRange
[]
=
[];
for
(
const
settingsGroup
of
this
.
workspaceSettingsEditorModel
.
settingsGroups
)
{
for
(
const
section
of
settingsGroup
.
sections
)
{
for
(
const
setting
of
section
.
settings
)
{
if
(
setting
.
key
!==
'
settings
'
)
{
ranges
.
push
({
startLineNumber
:
setting
.
keyRange
.
startLineNumber
,
startColumn
:
setting
.
keyRange
.
startColumn
-
1
,
endLineNumber
:
setting
.
valueRange
.
endLineNumber
,
endColumn
:
setting
.
valueRange
.
endColumn
});
}
}
}
}
this
.
editor
.
changeDecorations
(
changeAccessor
=>
this
.
decorationIds
=
changeAccessor
.
deltaDecorations
(
this
.
decorationIds
,
ranges
.
map
(
range
=>
this
.
createDecoration
(
range
,
this
.
editor
.
getModel
()))));
}
}
private
static
_DIM_CONFIGURATION_
=
ModelDecorationOptions
.
register
({
stickiness
:
editorCommon
.
TrackedRangeStickiness
.
NeverGrowsWhenTypingAtEdges
,
inlineClassName
:
'
dim-configuration
'
});
private
createDecoration
(
range
:
IRange
,
model
:
editorCommon
.
IModel
):
editorCommon
.
IModelDeltaDecoration
{
return
{
range
,
options
:
WorkspaceConfigurationRenderer
.
_DIM_CONFIGURATION_
};
}
public
dispose
():
void
{
if
(
this
.
decorationIds
)
{
this
.
decorationIds
=
this
.
editor
.
changeDecorations
(
changeAccessor
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录