Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
fefdc17d
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,发现更多精彩内容 >>
提交
fefdc17d
编写于
8月 28, 2019
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #79983
上级
fa7eba48
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
20 deletion
+18
-20
src/vs/platform/configuration/common/configurationRegistry.ts
...vs/platform/configuration/common/configurationRegistry.ts
+9
-0
src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
...bench/contrib/preferences/browser/preferencesRenderers.ts
+2
-2
src/vs/workbench/services/configuration/browser/configurationService.ts
...ch/services/configuration/browser/configurationService.ts
+7
-18
未找到文件。
src/vs/platform/configuration/common/configurationRegistry.ts
浏览文件 @
fefdc17d
...
@@ -140,6 +140,7 @@ type SettingProperties = { [key: string]: any };
...
@@ -140,6 +140,7 @@ type SettingProperties = { [key: string]: any };
export
const
allSettings
:
{
properties
:
SettingProperties
,
patternProperties
:
SettingProperties
}
=
{
properties
:
{},
patternProperties
:
{}
};
export
const
allSettings
:
{
properties
:
SettingProperties
,
patternProperties
:
SettingProperties
}
=
{
properties
:
{},
patternProperties
:
{}
};
export
const
applicationSettings
:
{
properties
:
SettingProperties
,
patternProperties
:
SettingProperties
}
=
{
properties
:
{},
patternProperties
:
{}
};
export
const
applicationSettings
:
{
properties
:
SettingProperties
,
patternProperties
:
SettingProperties
}
=
{
properties
:
{},
patternProperties
:
{}
};
export
const
machineSettings
:
{
properties
:
SettingProperties
,
patternProperties
:
SettingProperties
}
=
{
properties
:
{},
patternProperties
:
{}
};
export
const
machineSettings
:
{
properties
:
SettingProperties
,
patternProperties
:
SettingProperties
}
=
{
properties
:
{},
patternProperties
:
{}
};
export
const
machineOverridableSettings
:
{
properties
:
SettingProperties
,
patternProperties
:
SettingProperties
}
=
{
properties
:
{},
patternProperties
:
{}
};
export
const
windowSettings
:
{
properties
:
SettingProperties
,
patternProperties
:
SettingProperties
}
=
{
properties
:
{},
patternProperties
:
{}
};
export
const
windowSettings
:
{
properties
:
SettingProperties
,
patternProperties
:
SettingProperties
}
=
{
properties
:
{},
patternProperties
:
{}
};
export
const
resourceSettings
:
{
properties
:
SettingProperties
,
patternProperties
:
SettingProperties
}
=
{
properties
:
{},
patternProperties
:
{}
};
export
const
resourceSettings
:
{
properties
:
SettingProperties
,
patternProperties
:
SettingProperties
}
=
{
properties
:
{},
patternProperties
:
{}
};
...
@@ -213,6 +214,9 @@ class ConfigurationRegistry implements IConfigurationRegistry {
...
@@ -213,6 +214,9 @@ class ConfigurationRegistry implements IConfigurationRegistry {
case
ConfigurationScope
.
MACHINE
:
case
ConfigurationScope
.
MACHINE
:
delete
machineSettings
.
properties
[
key
];
delete
machineSettings
.
properties
[
key
];
break
;
break
;
case
ConfigurationScope
.
MACHINE_OVERRIDABLE
:
delete
machineOverridableSettings
.
properties
[
key
];
break
;
case
ConfigurationScope
.
WINDOW
:
case
ConfigurationScope
.
WINDOW
:
delete
windowSettings
.
properties
[
key
];
delete
windowSettings
.
properties
[
key
];
break
;
break
;
...
@@ -364,6 +368,9 @@ class ConfigurationRegistry implements IConfigurationRegistry {
...
@@ -364,6 +368,9 @@ class ConfigurationRegistry implements IConfigurationRegistry {
case
ConfigurationScope
.
MACHINE
:
case
ConfigurationScope
.
MACHINE
:
machineSettings
.
properties
[
key
]
=
properties
[
key
];
machineSettings
.
properties
[
key
]
=
properties
[
key
];
break
;
break
;
case
ConfigurationScope
.
MACHINE_OVERRIDABLE
:
machineOverridableSettings
.
properties
[
key
]
=
properties
[
key
];
break
;
case
ConfigurationScope
.
WINDOW
:
case
ConfigurationScope
.
WINDOW
:
windowSettings
.
properties
[
key
]
=
properties
[
key
];
windowSettings
.
properties
[
key
]
=
properties
[
key
];
break
;
break
;
...
@@ -402,6 +409,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {
...
@@ -402,6 +409,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {
delete
allSettings
.
patternProperties
[
this
.
overridePropertyPattern
];
delete
allSettings
.
patternProperties
[
this
.
overridePropertyPattern
];
delete
applicationSettings
.
patternProperties
[
this
.
overridePropertyPattern
];
delete
applicationSettings
.
patternProperties
[
this
.
overridePropertyPattern
];
delete
machineSettings
.
patternProperties
[
this
.
overridePropertyPattern
];
delete
machineSettings
.
patternProperties
[
this
.
overridePropertyPattern
];
delete
machineOverridableSettings
.
patternProperties
[
this
.
overridePropertyPattern
];
delete
windowSettings
.
patternProperties
[
this
.
overridePropertyPattern
];
delete
windowSettings
.
patternProperties
[
this
.
overridePropertyPattern
];
delete
resourceSettings
.
patternProperties
[
this
.
overridePropertyPattern
];
delete
resourceSettings
.
patternProperties
[
this
.
overridePropertyPattern
];
...
@@ -410,6 +418,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {
...
@@ -410,6 +418,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {
allSettings
.
patternProperties
[
this
.
overridePropertyPattern
]
=
patternProperties
;
allSettings
.
patternProperties
[
this
.
overridePropertyPattern
]
=
patternProperties
;
applicationSettings
.
patternProperties
[
this
.
overridePropertyPattern
]
=
patternProperties
;
applicationSettings
.
patternProperties
[
this
.
overridePropertyPattern
]
=
patternProperties
;
machineSettings
.
patternProperties
[
this
.
overridePropertyPattern
]
=
patternProperties
;
machineSettings
.
patternProperties
[
this
.
overridePropertyPattern
]
=
patternProperties
;
machineOverridableSettings
.
patternProperties
[
this
.
overridePropertyPattern
]
=
patternProperties
;
windowSettings
.
patternProperties
[
this
.
overridePropertyPattern
]
=
patternProperties
;
windowSettings
.
patternProperties
[
this
.
overridePropertyPattern
]
=
patternProperties
;
resourceSettings
.
patternProperties
[
this
.
overridePropertyPattern
]
=
patternProperties
;
resourceSettings
.
patternProperties
[
this
.
overridePropertyPattern
]
=
patternProperties
;
...
...
src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
浏览文件 @
fefdc17d
...
@@ -1017,12 +1017,12 @@ class UnsupportedSettingsRenderer extends Disposable {
...
@@ -1017,12 +1017,12 @@ class UnsupportedSettingsRenderer extends Disposable {
}
}
private
handleLocalUserConfiguration
(
setting
:
ISetting
,
configuration
:
IConfigurationNode
,
markerData
:
IMarkerData
[]):
void
{
private
handleLocalUserConfiguration
(
setting
:
ISetting
,
configuration
:
IConfigurationNode
,
markerData
:
IMarkerData
[]):
void
{
if
(
this
.
workbenchEnvironmentService
.
configuration
.
remote
&&
configuration
.
scope
===
ConfigurationScope
.
MACHINE
)
{
if
(
this
.
workbenchEnvironmentService
.
configuration
.
remote
Authority
&&
(
configuration
.
scope
===
ConfigurationScope
.
MACHINE
||
configuration
.
scope
===
ConfigurationScope
.
MACHINE_OVERRIDABLE
)
)
{
markerData
.
push
({
markerData
.
push
({
severity
:
MarkerSeverity
.
Hint
,
severity
:
MarkerSeverity
.
Hint
,
tags
:
[
MarkerTag
.
Unnecessary
],
tags
:
[
MarkerTag
.
Unnecessary
],
...
setting
.
range
,
...
setting
.
range
,
message
:
nls
.
localize
(
'
unsupportedRemoteMachineSetting
'
,
"
This setting can
be applied only in remote machine settings
"
)
message
:
nls
.
localize
(
'
unsupportedRemoteMachineSetting
'
,
"
This setting can
not be applied now. It will be applied when you open local window.
"
)
});
});
}
}
}
}
...
...
src/vs/workbench/services/configuration/browser/configurationService.ts
浏览文件 @
fefdc17d
...
@@ -16,7 +16,7 @@ import { IConfigurationChangeEvent, ConfigurationTarget, IConfigurationOverrides
...
@@ -16,7 +16,7 @@ import { IConfigurationChangeEvent, ConfigurationTarget, IConfigurationOverrides
import
{
Configuration
,
WorkspaceConfigurationChangeEvent
,
AllKeysConfigurationChangeEvent
}
from
'
vs/workbench/services/configuration/common/configurationModels
'
;
import
{
Configuration
,
WorkspaceConfigurationChangeEvent
,
AllKeysConfigurationChangeEvent
}
from
'
vs/workbench/services/configuration/common/configurationModels
'
;
import
{
FOLDER_CONFIG_FOLDER_NAME
,
defaultSettingsSchemaId
,
userSettingsSchemaId
,
workspaceSettingsSchemaId
,
folderSettingsSchemaId
,
IConfigurationCache
,
machineSettingsSchemaId
,
LOCAL_MACHINE_SCOPES
}
from
'
vs/workbench/services/configuration/common/configuration
'
;
import
{
FOLDER_CONFIG_FOLDER_NAME
,
defaultSettingsSchemaId
,
userSettingsSchemaId
,
workspaceSettingsSchemaId
,
folderSettingsSchemaId
,
IConfigurationCache
,
machineSettingsSchemaId
,
LOCAL_MACHINE_SCOPES
}
from
'
vs/workbench/services/configuration/common/configuration
'
;
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
IConfigurationRegistry
,
Extensions
,
allSettings
,
windowSettings
,
resourceSettings
,
applicationSettings
,
machineSettings
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
IConfigurationRegistry
,
Extensions
,
allSettings
,
windowSettings
,
resourceSettings
,
applicationSettings
,
machineSettings
,
machineOverridableSettings
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
IWorkspaceIdentifier
,
isWorkspaceIdentifier
,
IStoredWorkspaceFolder
,
isStoredWorkspaceFolder
,
IWorkspaceFolderCreationData
,
ISingleFolderWorkspaceIdentifier
,
isSingleFolderWorkspaceIdentifier
,
IWorkspaceInitializationPayload
,
isSingleFolderWorkspaceInitializationPayload
,
ISingleFolderWorkspaceInitializationPayload
,
IEmptyWorkspaceInitializationPayload
,
useSlashForPath
,
getStoredWorkspaceFolder
}
from
'
vs/platform/workspaces/common/workspaces
'
;
import
{
IWorkspaceIdentifier
,
isWorkspaceIdentifier
,
IStoredWorkspaceFolder
,
isStoredWorkspaceFolder
,
IWorkspaceFolderCreationData
,
ISingleFolderWorkspaceIdentifier
,
isSingleFolderWorkspaceIdentifier
,
IWorkspaceInitializationPayload
,
isSingleFolderWorkspaceInitializationPayload
,
ISingleFolderWorkspaceInitializationPayload
,
IEmptyWorkspaceInitializationPayload
,
useSlashForPath
,
getStoredWorkspaceFolder
}
from
'
vs/platform/workspaces/common/workspaces
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
ConfigurationEditingService
,
EditableConfigurationTarget
}
from
'
vs/workbench/services/configuration/common/configurationEditingService
'
;
import
{
ConfigurationEditingService
,
EditableConfigurationTarget
}
from
'
vs/workbench/services/configuration/common/configurationEditingService
'
;
...
@@ -491,6 +491,7 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
...
@@ -491,6 +491,7 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
if
(
this
.
workspace
)
{
if
(
this
.
workspace
)
{
this
.
_configuration
.
updateDefaultConfiguration
(
this
.
defaultConfiguration
);
this
.
_configuration
.
updateDefaultConfiguration
(
this
.
defaultConfiguration
);
if
(
this
.
remoteUserConfiguration
)
{
if
(
this
.
remoteUserConfiguration
)
{
this
.
_configuration
.
updateLocalUserConfiguration
(
this
.
localUserConfiguration
.
reprocess
());
this
.
_configuration
.
updateRemoteUserConfiguration
(
this
.
remoteUserConfiguration
.
reprocess
());
this
.
_configuration
.
updateRemoteUserConfiguration
(
this
.
remoteUserConfiguration
.
reprocess
());
}
}
if
(
this
.
getWorkbenchState
()
===
WorkbenchState
.
FOLDER
)
{
if
(
this
.
getWorkbenchState
()
===
WorkbenchState
.
FOLDER
)
{
...
@@ -506,29 +507,17 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
...
@@ -506,29 +507,17 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
private
registerConfigurationSchemas
():
void
{
private
registerConfigurationSchemas
():
void
{
if
(
this
.
workspace
)
{
if
(
this
.
workspace
)
{
const
jsonRegistry
=
Registry
.
as
<
IJSONContributionRegistry
>
(
JSONExtensions
.
JSONContribution
);
const
jsonRegistry
=
Registry
.
as
<
IJSONContributionRegistry
>
(
JSONExtensions
.
JSONContribution
);
const
convertToNotSuggestedProperties
=
(
properties
:
IJSONSchemaMap
):
IJSONSchemaMap
=>
{
return
Object
.
keys
(
properties
).
reduce
((
result
:
IJSONSchemaMap
,
property
)
=>
{
result
[
property
]
=
deepClone
(
properties
[
property
]);
result
[
property
].
doNotSuggest
=
true
;
return
result
;
},
{});
};
const
unsupportedApplicationSettings
=
convertToNotSuggestedProperties
(
applicationSettings
.
properties
);
const
unsupportedMachineSettings
=
convertToNotSuggestedProperties
(
machineSettings
.
properties
);
const
unsupportedRemoteMachineSettings
=
convertToNotSuggestedProperties
(
machineSettings
.
properties
);
const
allSettingsSchema
:
IJSONSchema
=
{
properties
:
allSettings
.
properties
,
patternProperties
:
allSettings
.
patternProperties
,
additionalProperties
:
true
};
const
allSettingsSchema
:
IJSONSchema
=
{
properties
:
allSettings
.
properties
,
patternProperties
:
allSettings
.
patternProperties
,
additionalProperties
:
true
};
const
userSettingsSchema
:
IJSONSchema
=
this
.
remoteUserConfiguration
?
{
properties
:
{
...
applicationSettings
.
properties
,
...
unsupportedRemoteMachineSettings
,
...
windowSettings
.
properties
,
...
resourceSettings
.
properties
},
patternProperties
:
allSettings
.
patternProperties
,
additionalProperties
:
true
}
:
allSettingsSchema
;
const
userSettingsSchema
:
IJSONSchema
=
this
.
remoteUserConfiguration
?
{
properties
:
{
...
applicationSettings
.
properties
,
...
windowSettings
.
properties
,
...
resourceSettings
.
properties
},
patternProperties
:
allSettings
.
patternProperties
,
additionalProperties
:
true
}
:
allSettingsSchema
;
const
machineSettingsSchema
:
IJSONSchema
=
{
properties
:
{
...
unsupportedApplicationSetting
s
,
...
windowSettings
.
properties
,
...
resourceSettings
.
properties
},
patternProperties
:
allSettings
.
patternProperties
,
additionalProperties
:
true
};
const
machineSettingsSchema
:
IJSONSchema
=
{
properties
:
{
...
machineSettings
.
properties
,
...
machineOverridableSettings
.
propertie
s
,
...
windowSettings
.
properties
,
...
resourceSettings
.
properties
},
patternProperties
:
allSettings
.
patternProperties
,
additionalProperties
:
true
};
const
workspaceSettingsSchema
:
IJSONSchema
=
{
properties
:
{
...
unsupportedApplicationSettings
,
...
unsupportedMachineSetting
s
,
...
windowSettings
.
properties
,
...
resourceSettings
.
properties
},
patternProperties
:
allSettings
.
patternProperties
,
additionalProperties
:
true
};
const
workspaceSettingsSchema
:
IJSONSchema
=
{
properties
:
{
...
machineOverridableSettings
.
propertie
s
,
...
windowSettings
.
properties
,
...
resourceSettings
.
properties
},
patternProperties
:
allSettings
.
patternProperties
,
additionalProperties
:
true
};
jsonRegistry
.
registerSchema
(
defaultSettingsSchemaId
,
allSettingsSchema
);
jsonRegistry
.
registerSchema
(
defaultSettingsSchemaId
,
allSettingsSchema
);
jsonRegistry
.
registerSchema
(
userSettingsSchemaId
,
userSettingsSchema
);
jsonRegistry
.
registerSchema
(
userSettingsSchemaId
,
userSettingsSchema
);
jsonRegistry
.
registerSchema
(
machineSettingsSchemaId
,
machineSettingsSchema
);
jsonRegistry
.
registerSchema
(
machineSettingsSchemaId
,
machineSettingsSchema
);
if
(
WorkbenchState
.
WORKSPACE
===
this
.
getWorkbenchState
())
{
if
(
WorkbenchState
.
WORKSPACE
===
this
.
getWorkbenchState
())
{
const
unsupportedWindowSettings
=
convertToNotSuggestedProperties
(
windowSettings
.
properties
);
const
folderSettingsSchema
:
IJSONSchema
=
{
properties
:
{
...
machineOverridableSettings
.
properties
,
...
resourceSettings
.
properties
},
patternProperties
:
allSettings
.
patternProperties
,
additionalProperties
:
true
};
const
folderSettingsSchema
:
IJSONSchema
=
{
properties
:
{
...
unsupportedApplicationSettings
,
...
unsupportedMachineSettings
,
...
unsupportedWindowSettings
,
...
resourceSettings
.
properties
},
patternProperties
:
allSettings
.
patternProperties
,
additionalProperties
:
true
};
jsonRegistry
.
registerSchema
(
workspaceSettingsSchemaId
,
workspaceSettingsSchema
);
jsonRegistry
.
registerSchema
(
workspaceSettingsSchemaId
,
workspaceSettingsSchema
);
jsonRegistry
.
registerSchema
(
folderSettingsSchemaId
,
folderSettingsSchema
);
jsonRegistry
.
registerSchema
(
folderSettingsSchemaId
,
folderSettingsSchema
);
}
else
{
}
else
{
...
@@ -724,4 +713,4 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
...
@@ -724,4 +713,4 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
}
}
return
null
;
return
null
;
}
}
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录