Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
907de42b
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,发现更多精彩内容 >>
提交
907de42b
编写于
10月 16, 2017
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix tests
上级
3f1ffd14
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
17 addition
and
16 deletion
+17
-16
src/vs/platform/configuration/common/configuration.ts
src/vs/platform/configuration/common/configuration.ts
+7
-0
src/vs/platform/configuration/node/configurationService.ts
src/vs/platform/configuration/node/configurationService.ts
+1
-9
src/vs/platform/configuration/test/common/testConfigurationService.ts
...orm/configuration/test/common/testConfigurationService.ts
+3
-2
src/vs/workbench/services/configuration/node/configurationService.ts
...bench/services/configuration/node/configurationService.ts
+4
-3
src/vs/workbench/services/configuration/test/node/configurationService.test.ts
...ices/configuration/test/node/configurationService.test.ts
+2
-2
未找到文件。
src/vs/platform/configuration/common/configuration.ts
浏览文件 @
907de42b
...
@@ -15,6 +15,13 @@ import { IConfigurationRegistry, Extensions } from 'vs/platform/configuration/co
...
@@ -15,6 +15,13 @@ import { IConfigurationRegistry, Extensions } from 'vs/platform/configuration/co
export
const
IConfigurationService
=
createDecorator
<
IConfigurationService
>
(
'
configurationService
'
);
export
const
IConfigurationService
=
createDecorator
<
IConfigurationService
>
(
'
configurationService
'
);
export
function
isConfigurationOverrides
(
thing
:
any
):
thing
is
IConfigurationOverrides
{
return
thing
&&
typeof
thing
===
'
object
'
&&
(
!
thing
.
overrideIdentifier
||
typeof
thing
.
overrideIdentifier
===
'
string
'
)
&&
(
!
thing
.
resource
||
thing
.
resource
instanceof
URI
);
}
export
interface
IConfigurationOverrides
{
export
interface
IConfigurationOverrides
{
overrideIdentifier
?:
string
;
overrideIdentifier
?:
string
;
resource
?:
URI
;
resource
?:
URI
;
...
...
src/vs/platform/configuration/node/configurationService.ts
浏览文件 @
907de42b
...
@@ -8,23 +8,15 @@ import { ConfigWatcher } from 'vs/base/node/config';
...
@@ -8,23 +8,15 @@ import { ConfigWatcher } from 'vs/base/node/config';
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
IConfigurationRegistry
,
Extensions
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
IConfigurationRegistry
,
Extensions
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
IDisposable
,
Disposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
IDisposable
,
Disposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
IConfigurationService
,
IConfigurationChangeEvent
,
IConfigurationOverrides
,
ConfigurationTarget
,
compare
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IConfigurationService
,
IConfigurationChangeEvent
,
IConfigurationOverrides
,
ConfigurationTarget
,
compare
,
isConfigurationOverrides
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
CustomConfigurationModel
,
DefaultConfigurationModel
,
ConfigurationModel
,
Configuration
,
ConfigurationChangeEvent
}
from
'
vs/platform/configuration/common/configurationModels
'
;
import
{
CustomConfigurationModel
,
DefaultConfigurationModel
,
ConfigurationModel
,
Configuration
,
ConfigurationChangeEvent
}
from
'
vs/platform/configuration/common/configurationModels
'
;
import
Event
,
{
Emitter
}
from
'
vs/base/common/event
'
;
import
Event
,
{
Emitter
}
from
'
vs/base/common/event
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
onUnexpectedError
}
from
'
vs/base/common/errors
'
;
import
{
onUnexpectedError
}
from
'
vs/base/common/errors
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
equals
}
from
'
vs/base/common/objects
'
;
import
{
equals
}
from
'
vs/base/common/objects
'
;
import
{
IWorkspaceFolder
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IWorkspaceFolder
}
from
'
vs/platform/workspace/common/workspace
'
;
export
function
isConfigurationOverrides
(
thing
:
any
):
thing
is
IConfigurationOverrides
{
return
thing
&&
typeof
thing
===
'
object
'
&&
(
!
thing
.
overrideIdentifier
||
typeof
thing
.
overrideIdentifier
===
'
string
'
)
&&
(
!
thing
.
resource
||
thing
.
resource
instanceof
URI
);
}
export
class
ConfigurationService
extends
Disposable
implements
IConfigurationService
,
IDisposable
{
export
class
ConfigurationService
extends
Disposable
implements
IConfigurationService
,
IDisposable
{
_serviceBrand
:
any
;
_serviceBrand
:
any
;
...
...
src/vs/platform/configuration/test/common/testConfigurationService.ts
浏览文件 @
907de42b
...
@@ -9,7 +9,7 @@ import { TernarySearchTree } from 'vs/base/common/map';
...
@@ -9,7 +9,7 @@ import { TernarySearchTree } from 'vs/base/common/map';
import
URI
from
'
vs/base/common/uri
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
EventEmitter
}
from
'
vs/base/common/eventEmitter
'
;
import
{
EventEmitter
}
from
'
vs/base/common/eventEmitter
'
;
import
{
getConfigurationKeys
,
IConfigurationOverrides
,
IConfigurationService
,
getConfigurationValue
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
getConfigurationKeys
,
IConfigurationOverrides
,
IConfigurationService
,
getConfigurationValue
,
isConfigurationOverrides
}
from
'
vs/platform/configuration/common/configuration
'
;
export
class
TestConfigurationService
extends
EventEmitter
implements
IConfigurationService
{
export
class
TestConfigurationService
extends
EventEmitter
implements
IConfigurationService
{
public
_serviceBrand
:
any
;
public
_serviceBrand
:
any
;
...
@@ -22,7 +22,8 @@ export class TestConfigurationService extends EventEmitter implements IConfigura
...
@@ -22,7 +22,8 @@ export class TestConfigurationService extends EventEmitter implements IConfigura
return
TPromise
.
as
(
this
.
getConfiguration
());
return
TPromise
.
as
(
this
.
getConfiguration
());
}
}
public
getConfiguration
<
C
>
(
section
?:
any
,
overrides
?:
any
):
C
{
public
getConfiguration
<
C
>
(
arg1
?:
any
,
arg2
?:
any
):
C
{
const
overrides
=
isConfigurationOverrides
(
arg1
)
?
arg1
:
isConfigurationOverrides
(
arg2
)
?
arg2
:
void
0
;
if
(
overrides
&&
overrides
.
resource
)
{
if
(
overrides
&&
overrides
.
resource
)
{
const
configForResource
=
this
.
configurationByRoot
.
findSubstr
(
overrides
.
resource
.
fsPath
);
const
configForResource
=
this
.
configurationByRoot
.
findSubstr
(
overrides
.
resource
.
fsPath
);
return
configForResource
||
this
.
configuration
;
return
configForResource
||
this
.
configuration
;
...
...
src/vs/workbench/services/configuration/node/configurationService.ts
浏览文件 @
907de42b
...
@@ -24,10 +24,10 @@ import { isLinux } from 'vs/base/common/platform';
...
@@ -24,10 +24,10 @@ import { isLinux } from 'vs/base/common/platform';
import
{
ConfigWatcher
}
from
'
vs/base/node/config
'
;
import
{
ConfigWatcher
}
from
'
vs/base/node/config
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
CustomConfigurationModel
,
ConfigurationModel
,
ConfigurationChangeEvent
,
AllKeysConfigurationChangeEvent
}
from
'
vs/platform/configuration/common/configurationModels
'
;
import
{
CustomConfigurationModel
,
ConfigurationModel
,
ConfigurationChangeEvent
,
AllKeysConfigurationChangeEvent
}
from
'
vs/platform/configuration/common/configurationModels
'
;
import
{
IConfigurationChangeEvent
,
ConfigurationTarget
,
IConfigurationOverrides
,
keyFromOverrideIdentifier
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IConfigurationChangeEvent
,
ConfigurationTarget
,
IConfigurationOverrides
,
keyFromOverrideIdentifier
,
isConfigurationOverrides
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
WorkspaceConfigurationModel
,
ScopedConfigurationModel
,
FolderConfigurationModel
,
FolderSettingsModel
,
Configuration
,
WorkspaceConfigurationChangeEvent
}
from
'
vs/workbench/services/configuration/common/configurationModels
'
;
import
{
WorkspaceConfigurationModel
,
ScopedConfigurationModel
,
FolderConfigurationModel
,
FolderSettingsModel
,
Configuration
,
WorkspaceConfigurationChangeEvent
}
from
'
vs/workbench/services/configuration/common/configurationModels
'
;
import
{
IWorkspaceConfigurationService
,
WORKSPACE_CONFIG_FOLDER_DEFAULT_NAME
,
WORKSPACE_STANDALONE_CONFIGURATIONS
,
WORKSPACE_CONFIG_DEFAULT_PATH
,
TASKS_CONFIGURATION_KEY
,
LAUNCH_CONFIGURATION_KEY
,
defaultSettingsSchemaId
,
userSettingsSchemaId
,
workspaceSettingsSchemaId
,
folderSettingsSchemaId
}
from
'
vs/workbench/services/configuration/common/configuration
'
;
import
{
IWorkspaceConfigurationService
,
WORKSPACE_CONFIG_FOLDER_DEFAULT_NAME
,
WORKSPACE_STANDALONE_CONFIGURATIONS
,
WORKSPACE_CONFIG_DEFAULT_PATH
,
TASKS_CONFIGURATION_KEY
,
LAUNCH_CONFIGURATION_KEY
,
defaultSettingsSchemaId
,
userSettingsSchemaId
,
workspaceSettingsSchemaId
,
folderSettingsSchemaId
}
from
'
vs/workbench/services/configuration/common/configuration
'
;
import
{
ConfigurationService
as
GlobalConfigurationService
,
isConfigurationOverrides
}
from
'
vs/platform/configuration/node/configurationService
'
;
import
{
ConfigurationService
as
GlobalConfigurationService
}
from
'
vs/platform/configuration/node/configurationService
'
;
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
IConfigurationNode
,
IConfigurationRegistry
,
Extensions
,
ConfigurationScope
,
settingsSchema
,
resourceSettingsSchema
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
IConfigurationNode
,
IConfigurationRegistry
,
Extensions
,
ConfigurationScope
,
settingsSchema
,
resourceSettingsSchema
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
createHash
}
from
'
crypto
'
;
import
{
createHash
}
from
'
crypto
'
;
...
@@ -160,7 +160,8 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
...
@@ -160,7 +160,8 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
if
(
folder
)
{
if
(
folder
)
{
return
this
.
reloadWorkspaceFolderConfiguration
(
folder
,
key
);
return
this
.
reloadWorkspaceFolderConfiguration
(
folder
,
key
);
}
}
return
this
.
loadConfiguration
();
return
this
.
reloadUserConfiguration
()
.
then
(()
=>
this
.
loadConfiguration
());
}
}
inspect
<
T
>
(
key
:
string
,
overrides
?:
IConfigurationOverrides
):
{
inspect
<
T
>
(
key
:
string
,
overrides
?:
IConfigurationOverrides
):
{
...
...
src/vs/workbench/services/configuration/test/node/configurationService.test.ts
浏览文件 @
907de42b
...
@@ -178,7 +178,7 @@ suite('WorkspaceConfigurationService - Node', () => {
...
@@ -178,7 +178,7 @@ suite('WorkspaceConfigurationService - Node', () => {
return
createService
(
workspaceDir
,
globalSettingsFile
).
then
(
service
=>
{
return
createService
(
workspaceDir
,
globalSettingsFile
).
then
(
service
=>
{
fs
.
writeFileSync
(
globalSettingsFile
,
'
{ "testworkbench.editor.tabs": true }
'
);
fs
.
writeFileSync
(
globalSettingsFile
,
'
{ "testworkbench.editor.tabs": true }
'
);
service
.
reloadConfiguration
(
service
.
getWorkspace
().
folders
[
0
]
).
then
(()
=>
{
service
.
reloadConfiguration
().
then
(()
=>
{
const
config
=
service
.
getConfiguration
<
{
testworkbench
:
{
editor
:
{
tabs
:
boolean
}
}
}
>
();
const
config
=
service
.
getConfiguration
<
{
testworkbench
:
{
editor
:
{
tabs
:
boolean
}
}
}
>
();
assert
.
equal
(
config
.
testworkbench
.
editor
.
tabs
,
true
);
assert
.
equal
(
config
.
testworkbench
.
editor
.
tabs
,
true
);
...
@@ -263,7 +263,7 @@ suite('WorkspaceConfigurationService - Node', () => {
...
@@ -263,7 +263,7 @@ suite('WorkspaceConfigurationService - Node', () => {
fs
.
writeFileSync
(
globalSettingsFile
,
'
{ "testworkbench.editor.icons": false, "testworkbench.other.setting": true }
'
);
fs
.
writeFileSync
(
globalSettingsFile
,
'
{ "testworkbench.editor.icons": false, "testworkbench.other.setting": true }
'
);
fs
.
writeFileSync
(
path
.
join
(
workspaceDir
,
'
.vscode
'
,
'
settings.json
'
),
'
{ "testworkbench.editor.icons": true }
'
);
fs
.
writeFileSync
(
path
.
join
(
workspaceDir
,
'
.vscode
'
,
'
settings.json
'
),
'
{ "testworkbench.editor.icons": true }
'
);
service
.
reload
Workspace
Configuration
().
then
(()
=>
{
service
.
reloadConfiguration
().
then
(()
=>
{
const
config
=
service
.
getConfiguration
<
{
testworkbench
:
{
editor
:
{
icons
:
boolean
},
other
:
{
setting
:
string
}
}
}
>
();
const
config
=
service
.
getConfiguration
<
{
testworkbench
:
{
editor
:
{
icons
:
boolean
},
other
:
{
setting
:
string
}
}
}
>
();
assert
.
equal
(
config
.
testworkbench
.
editor
.
icons
,
true
);
assert
.
equal
(
config
.
testworkbench
.
editor
.
icons
,
true
);
assert
.
equal
(
config
.
testworkbench
.
other
.
setting
,
true
);
assert
.
equal
(
config
.
testworkbench
.
other
.
setting
,
true
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录