Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
5a6e8dc0
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,发现更多精彩内容 >>
提交
5a6e8dc0
编写于
12月 15, 2017
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#40169 Remove usage of custom marshaller
上级
9a5e8b3a
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
19 addition
and
9 deletion
+19
-9
src/vs/workbench/api/electron-browser/mainThreadConfiguration.ts
...workbench/api/electron-browser/mainThreadConfiguration.ts
+16
-6
src/vs/workbench/api/node/extHost.protocol.ts
src/vs/workbench/api/node/extHost.protocol.ts
+3
-3
未找到文件。
src/vs/workbench/api/electron-browser/mainThreadConfiguration.ts
浏览文件 @
5a6e8dc0
...
...
@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
URI
,
{
UriComponents
}
from
'
vs/base/common/uri
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
...
...
@@ -13,7 +13,7 @@ import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/
import
{
IWorkspaceConfigurationService
}
from
'
vs/workbench/services/configuration/common/configuration
'
;
import
{
MainThreadConfigurationShape
,
MainContext
,
ExtHostContext
,
IExtHostContext
,
IWorkspaceConfigurationChangeEventData
}
from
'
../node/extHost.protocol
'
;
import
{
extHostNamedCustomer
}
from
'
vs/workbench/api/electron-browser/extHostCustomers
'
;
import
{
ConfigurationTarget
,
IConfigurationChangeEvent
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
ConfigurationTarget
,
IConfigurationChangeEvent
,
IConfigurationModel
}
from
'
vs/platform/configuration/common/configuration
'
;
@
extHostNamedCustomer
(
MainContext
.
MainThreadConfiguration
)
export
class
MainThreadConfiguration
implements
MainThreadConfigurationShape
{
...
...
@@ -36,11 +36,13 @@ export class MainThreadConfiguration implements MainThreadConfigurationShape {
this
.
_configurationListener
.
dispose
();
}
$updateConfigurationOption
(
target
:
ConfigurationTarget
,
key
:
string
,
value
:
any
,
resource
:
URI
):
TPromise
<
void
>
{
$updateConfigurationOption
(
target
:
ConfigurationTarget
,
key
:
string
,
value
:
any
,
resourceUriComponenets
:
UriComponents
):
TPromise
<
void
>
{
const
resource
=
resourceUriComponenets
?
URI
.
revive
(
resourceUriComponenets
)
:
null
;
return
this
.
writeConfiguration
(
target
,
key
,
value
,
resource
);
}
$removeConfigurationOption
(
target
:
ConfigurationTarget
,
key
:
string
,
resource
:
URI
):
TPromise
<
void
>
{
$removeConfigurationOption
(
target
:
ConfigurationTarget
,
key
:
string
,
resourceUriComponenets
:
UriComponents
):
TPromise
<
void
>
{
const
resource
=
resourceUriComponenets
?
URI
.
revive
(
resourceUriComponenets
)
:
null
;
return
this
.
writeConfiguration
(
target
,
key
,
undefined
,
resource
);
}
...
...
@@ -61,11 +63,19 @@ export class MainThreadConfiguration implements MainThreadConfigurationShape {
private
toConfigurationChangeEventData
(
event
:
IConfigurationChangeEvent
):
IWorkspaceConfigurationChangeEventData
{
return
{
changedConfiguration
:
event
.
changedConfiguration
,
changedConfiguration
:
this
.
toJSONConfiguration
(
event
.
changedConfiguration
)
,
changedConfigurationByResource
:
event
.
changedConfigurationByResource
.
keys
().
reduce
((
result
,
resource
)
=>
{
result
[
resource
.
toString
()]
=
event
.
changedConfigurationByResource
.
get
(
resource
);
result
[
resource
.
toString
()]
=
this
.
toJSONConfiguration
(
event
.
changedConfigurationByResource
.
get
(
resource
)
);
return
result
;
},
Object
.
create
({}))
};
}
private
toJSONConfiguration
({
contents
,
keys
,
overrides
}:
IConfigurationModel
=
{
contents
:
{},
keys
:
[],
overrides
:
[]
}):
IConfigurationModel
{
return
{
contents
,
keys
,
overrides
};
}
}
src/vs/workbench/api/node/extHost.protocol.ts
浏览文件 @
5a6e8dc0
...
...
@@ -109,8 +109,8 @@ export interface MainThreadCommandsShape extends IDisposable {
}
export
interface
MainThreadConfigurationShape
extends
IDisposable
{
$updateConfigurationOption
(
target
:
ConfigurationTarget
,
key
:
string
,
value
:
any
,
resource
:
U
RI
):
TPromise
<
void
>
;
$removeConfigurationOption
(
target
:
ConfigurationTarget
,
key
:
string
,
resource
:
U
RI
):
TPromise
<
void
>
;
$updateConfigurationOption
(
target
:
ConfigurationTarget
,
key
:
string
,
value
:
any
,
resource
:
U
riComponents
):
TPromise
<
void
>
;
$removeConfigurationOption
(
target
:
ConfigurationTarget
,
key
:
string
,
resource
:
U
riComponents
):
TPromise
<
void
>
;
}
export
interface
MainThreadDiagnosticsShape
extends
IDisposable
{
...
...
@@ -733,7 +733,7 @@ export interface ExtHostWindowShape {
export
const
MainContext
=
{
MainThreadCommands
:
<
ProxyIdentifier
<
MainThreadCommandsShape
>>
createMainId
<
MainThreadCommandsShape
>
(
'
MainThreadCommands
'
),
MainThreadConfiguration
:
createMainId
<
MainThreadConfigurationShape
>
(
'
MainThreadConfiguration
'
,
ProxyType
.
CustomMarshaller
),
MainThreadConfiguration
:
createMainId
<
MainThreadConfigurationShape
>
(
'
MainThreadConfiguration
'
),
MainThreadDebugService
:
createMainId
<
MainThreadDebugServiceShape
>
(
'
MainThreadDebugService
'
),
MainThreadDecorations
:
createMainId
<
MainThreadDecorationsShape
>
(
'
MainThreadDecorations
'
),
MainThreadDiagnostics
:
createMainId
<
MainThreadDiagnosticsShape
>
(
'
MainThreadDiagnostics
'
),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录