Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
ee2de29c
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,发现更多精彩内容 >>
提交
ee2de29c
编写于
6月 15, 2017
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#28538 Implement resource overrides for settings
上级
00400d8f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
6 deletion
+7
-6
src/vs/platform/configuration/common/configuration.ts
src/vs/platform/configuration/common/configuration.ts
+5
-5
src/vs/workbench/browser/parts/editor/textEditor.ts
src/vs/workbench/browser/parts/editor/textEditor.ts
+1
-1
src/vs/workbench/services/configuration/node/configuration.ts
...vs/workbench/services/configuration/node/configuration.ts
+1
-0
未找到文件。
src/vs/platform/configuration/common/configuration.ts
浏览文件 @
ee2de29c
...
@@ -241,8 +241,8 @@ export class Configuration<T> {
...
@@ -241,8 +241,8 @@ export class Configuration<T> {
}
}
}
}
getValue
<
C
>
(
section
:
string
=
''
,
o
ption
s
:
IConfigurationOverrides
=
{}):
C
{
getValue
<
C
>
(
section
:
string
=
''
,
o
verride
s
:
IConfigurationOverrides
=
{}):
C
{
const
configModel
=
this
.
getConfigurationModel
(
o
ption
s
);
const
configModel
=
this
.
getConfigurationModel
(
o
verride
s
);
return
section
?
configModel
.
getContentsFor
<
C
>
(
section
)
:
configModel
.
contents
;
return
section
?
configModel
.
getContentsFor
<
C
>
(
section
)
:
configModel
.
contents
;
}
}
...
@@ -296,9 +296,9 @@ export class Configuration<T> {
...
@@ -296,9 +296,9 @@ export class Configuration<T> {
return
result
;
return
result
;
}
}
private
getConfigurationModel
<
C
>
(
o
ption
s
:
IConfigurationOverrides
):
ConfigurationModel
<
any
>
{
private
getConfigurationModel
<
C
>
(
o
verride
s
:
IConfigurationOverrides
):
ConfigurationModel
<
any
>
{
let
configurationModel
=
(
options
.
resource
?
this
.
_foldersConsolidated
.
get
(
options
.
resource
)
:
this
.
_workspace
)
||
new
ConfigurationModel
()
;
let
configurationModel
=
overrides
.
resource
?
this
.
_foldersConsolidated
.
get
(
overrides
.
resource
)
||
this
.
_workspace
:
this
.
_workspace
;
return
o
ptions
.
language
?
configurationModel
.
override
<
T
>
(
option
s
.
language
)
:
configurationModel
;
return
o
verrides
.
language
?
configurationModel
.
override
<
T
>
(
override
s
.
language
)
:
configurationModel
;
}
}
public
toData
():
IConfigurationData
<
any
>
{
public
toData
():
IConfigurationData
<
any
>
{
...
...
src/vs/workbench/browser/parts/editor/textEditor.ts
浏览文件 @
ee2de29c
...
@@ -119,7 +119,7 @@ export abstract class BaseTextEditor extends BaseEditor {
...
@@ -119,7 +119,7 @@ export abstract class BaseTextEditor extends BaseEditor {
const
overrides
=
{};
const
overrides
=
{};
const
resource
=
this
.
getResource
();
const
resource
=
this
.
getResource
();
if
(
resource
)
{
if
(
resource
)
{
objects
.
assign
(
overrides
,
this
.
configurationService
.
getConfiguration
<
IEditorConfiguration
>
(
'
editor
'
,
{
language
:
this
.
getLanguage
(),
/*resource: this.getResource(), */
}));
objects
.
assign
(
overrides
,
this
.
configurationService
.
getConfiguration
<
IEditorConfiguration
>
(
'
editor
'
,
{
language
:
this
.
getLanguage
(),
resource
:
this
.
getResource
()
}));
}
}
objects
.
assign
(
overrides
,
{
objects
.
assign
(
overrides
,
{
...
...
src/vs/workbench/services/configuration/node/configuration.ts
浏览文件 @
ee2de29c
...
@@ -202,6 +202,7 @@ export class WorkspaceConfigurationService extends Disposable implements IWorksp
...
@@ -202,6 +202,7 @@ export class WorkspaceConfigurationService extends Disposable implements IWorksp
}
}
public
getConfiguration
<
C
>
(
section
?:
string
,
overrides
?:
IConfigurationOverrides
):
C
{
public
getConfiguration
<
C
>
(
section
?:
string
,
overrides
?:
IConfigurationOverrides
):
C
{
overrides
=
overrides
&&
overrides
.
resource
?
{
...
overrides
,
resource
:
this
.
getRoot
(
overrides
.
resource
)
}
:
overrides
;
return
this
.
_configuration
.
getValue
<
C
>
(
section
,
overrides
);
return
this
.
_configuration
.
getValue
<
C
>
(
section
,
overrides
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录