Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
b2a9d4dd
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,发现更多精彩内容 >>
提交
b2a9d4dd
编写于
3月 25, 2020
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Serialize collections on ext host
上级
b41b85d2
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
34 addition
and
10 deletion
+34
-10
src/vs/workbench/api/common/extHost.protocol.ts
src/vs/workbench/api/common/extHost.protocol.ts
+1
-6
src/vs/workbench/api/common/extHostTerminalService.ts
src/vs/workbench/api/common/extHostTerminalService.ts
+1
-0
src/vs/workbench/api/node/extHostTerminalService.ts
src/vs/workbench/api/node/extHostTerminalService.ts
+25
-3
src/vs/workbench/contrib/terminal/common/environmentVariable.ts
.../workbench/contrib/terminal/common/environmentVariable.ts
+7
-1
未找到文件。
src/vs/workbench/api/common/extHost.protocol.ts
浏览文件 @
b2a9d4dd
...
@@ -54,6 +54,7 @@ import { revive } from 'vs/base/common/marshalling';
...
@@ -54,6 +54,7 @@ import { revive } from 'vs/base/common/marshalling';
import
{
INotebookMimeTypeSelector
,
IOutput
,
INotebookDisplayOrder
,
NotebookCellMetadata
,
NotebookDocumentMetadata
}
from
'
vs/workbench/contrib/notebook/common/notebookCommon
'
;
import
{
INotebookMimeTypeSelector
,
IOutput
,
INotebookDisplayOrder
,
NotebookCellMetadata
,
NotebookDocumentMetadata
}
from
'
vs/workbench/contrib/notebook/common/notebookCommon
'
;
import
{
CallHierarchyItem
}
from
'
vs/workbench/contrib/callHierarchy/common/callHierarchy
'
;
import
{
CallHierarchyItem
}
from
'
vs/workbench/contrib/callHierarchy/common/callHierarchy
'
;
import
{
Dto
}
from
'
vs/base/common/types
'
;
import
{
Dto
}
from
'
vs/base/common/types
'
;
import
{
EnvironmentVariableMutatorType
}
from
'
vs/workbench/contrib/terminal/common/environmentVariable
'
;
export
interface
IEnvironment
{
export
interface
IEnvironment
{
isExtensionDevelopmentDebug
:
boolean
;
isExtensionDevelopmentDebug
:
boolean
;
...
@@ -426,12 +427,6 @@ export interface TerminalLaunchConfig {
...
@@ -426,12 +427,6 @@ export interface TerminalLaunchConfig {
isExtensionTerminal
?:
boolean
;
isExtensionTerminal
?:
boolean
;
}
}
export
enum
EnvironmentVariableMutatorType
{
Replace
=
1
,
Append
=
2
,
Prepend
=
3
}
export
interface
IEnvironmentVariableCollectionDto
{
export
interface
IEnvironmentVariableCollectionDto
{
extensionIdentifier
:
string
;
extensionIdentifier
:
string
;
variables
:
string
[];
variables
:
string
[];
...
...
src/vs/workbench/api/common/extHostTerminalService.ts
浏览文件 @
b2a9d4dd
...
@@ -674,6 +674,7 @@ export class WorkerExtHostTerminalService extends BaseExtHostTerminalService {
...
@@ -674,6 +674,7 @@ export class WorkerExtHostTerminalService extends BaseExtHostTerminalService {
}
}
public
getEnvironmentVariableCollection
(
extension
:
IExtensionDescription
,
persistent
?:
boolean
):
vscode
.
EnvironmentVariableCollection
{
public
getEnvironmentVariableCollection
(
extension
:
IExtensionDescription
,
persistent
?:
boolean
):
vscode
.
EnvironmentVariableCollection
{
// This is not implemented so worker ext host extensions cannot influence terminal envs
throw
new
Error
(
'
Not implemented
'
);
throw
new
Error
(
'
Not implemented
'
);
}
}
}
}
src/vs/workbench/api/node/extHostTerminalService.ts
浏览文件 @
b2a9d4dd
...
@@ -9,7 +9,7 @@ import * as os from 'os';
...
@@ -9,7 +9,7 @@ import * as os from 'os';
import
{
URI
,
UriComponents
}
from
'
vs/base/common/uri
'
;
import
{
URI
,
UriComponents
}
from
'
vs/base/common/uri
'
;
import
*
as
platform
from
'
vs/base/common/platform
'
;
import
*
as
platform
from
'
vs/base/common/platform
'
;
import
*
as
terminalEnvironment
from
'
vs/workbench/contrib/terminal/common/terminalEnvironment
'
;
import
*
as
terminalEnvironment
from
'
vs/workbench/contrib/terminal/common/terminalEnvironment
'
;
import
{
IShellLaunchConfigDto
,
IShellDefinitionDto
,
IShellAndArgsDto
}
from
'
vs/workbench/api/common/extHost.protocol
'
;
import
{
IShellLaunchConfigDto
,
IShellDefinitionDto
,
IShellAndArgsDto
,
IEnvironmentVariableCollectionDto
}
from
'
vs/workbench/api/common/extHost.protocol
'
;
import
{
ExtHostConfiguration
,
ExtHostConfigProvider
,
IExtHostConfiguration
}
from
'
vs/workbench/api/common/extHostConfiguration
'
;
import
{
ExtHostConfiguration
,
ExtHostConfigProvider
,
IExtHostConfiguration
}
from
'
vs/workbench/api/common/extHostConfiguration
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
IShellLaunchConfig
,
ITerminalEnvironment
}
from
'
vs/workbench/contrib/terminal/common/terminal
'
;
import
{
IShellLaunchConfig
,
ITerminalEnvironment
}
from
'
vs/workbench/contrib/terminal/common/terminal
'
;
...
@@ -287,13 +287,35 @@ export class ExtHostTerminalService extends BaseExtHostTerminalService {
...
@@ -287,13 +287,35 @@ export class ExtHostTerminalService extends BaseExtHostTerminalService {
}
else
{
}
else
{
collection
=
new
EnvironmentVariableCollection
();
collection
=
new
EnvironmentVariableCollection
();
}
}
collection
.
onDidChangeCollection
(()
=>
this
.
_updateEnvironmentVariableCollection
());
collection
.
onDidChangeCollection
(()
=>
this
.
_updateEnvironmentVariableCollection
s
());
this
.
_environmentVariableCollection
.
set
(
extension
.
identifier
.
value
,
collection
);
this
.
_environmentVariableCollection
.
set
(
extension
.
identifier
.
value
,
collection
);
return
collection
;
return
collection
;
}
}
@
debounce
(
1000
)
@
debounce
(
1000
)
private
_updateEnvironmentVariableCollection
()
{
private
_updateEnvironmentVariableCollections
():
void
{
const
dtos
:
IEnvironmentVariableCollectionDto
[]
=
[];
this
.
_environmentVariableCollection
.
forEach
((
collection
,
extensionIdenfitier
)
=>
{
dtos
.
push
(
this
.
_serializeEnvironmentVariableCollection
(
extensionIdenfitier
,
collection
));
});
// TODO: Send updates back to renderer
// TODO: Send updates back to renderer
}
}
private
_serializeEnvironmentVariableCollection
(
extensionIdentifier
:
string
,
collection
:
vscode
.
EnvironmentVariableCollection
):
IEnvironmentVariableCollectionDto
{
const
variables
:
string
[]
=
[];
const
values
:
string
[]
=
[];
const
types
:
EnvironmentVariableMutatorType
[]
=
[];
collection
.
forEach
((
variable
,
mutator
)
=>
{
variables
.
push
(
variable
);
values
.
push
(
mutator
.
value
);
types
.
push
(
mutator
.
type
);
});
return
{
extensionIdentifier
,
variables
,
values
,
types
};
}
}
}
src/vs/workbench/contrib/terminal/common/environmentVariable.ts
浏览文件 @
b2a9d4dd
...
@@ -7,9 +7,15 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
...
@@ -7,9 +7,15 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
export
const
IEnvironmentVariableService
=
createDecorator
<
IEnvironmentVariableService
>
(
'
environmentVariableService
'
);
export
const
IEnvironmentVariableService
=
createDecorator
<
IEnvironmentVariableService
>
(
'
environmentVariableService
'
);
export
enum
EnvironmentVariableMutatorType
{
Replace
=
1
,
Append
=
2
,
Prepend
=
3
}
export
interface
IEnvironmentVariableMutator
{
export
interface
IEnvironmentVariableMutator
{
readonly
value
:
string
;
readonly
value
:
string
;
readonly
type
:
'
replace
'
|
'
append
'
|
'
prepend
'
;
readonly
type
:
EnvironmentVariableMutatorType
;
}
}
export
interface
IEnvironmentVariableCollection
{
export
interface
IEnvironmentVariableCollection
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录