Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
8a67041e
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,发现更多精彩内容 >>
提交
8a67041e
编写于
10月 12, 2017
作者:
R
Ramya Achutha Rao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Pass env via extension api when creating terminal
上级
49e570e1
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
19 addition
and
14 deletion
+19
-14
src/vs/vscode.d.ts
src/vs/vscode.d.ts
+4
-0
src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts
...rkbench/api/electron-browser/mainThreadTerminalService.ts
+3
-2
src/vs/workbench/api/node/extHost.protocol.ts
src/vs/workbench/api/node/extHost.protocol.ts
+1
-1
src/vs/workbench/api/node/extHostTerminalService.ts
src/vs/workbench/api/node/extHostTerminalService.ts
+3
-2
src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
...kbench/parts/tasks/electron-browser/terminalTaskSystem.ts
+1
-8
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
...bench/parts/terminal/electron-browser/terminalInstance.ts
+7
-1
未找到文件。
src/vs/vscode.d.ts
浏览文件 @
8a67041e
...
...
@@ -4852,6 +4852,10 @@ declare module 'vscode' {
* Args for the custom shell executable, this does not work on Windows (see #8429)
*/
shellArgs
?:
string
[];
/**
* Object with environment variables that will be added to the VS Code process.
*/
env
?:
{
[
key
:
string
]:
string
};
}
/**
...
...
src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts
浏览文件 @
8a67041e
...
...
@@ -33,13 +33,14 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
// when the extension host process goes down ?
}
public
$createTerminal
(
name
?:
string
,
shellPath
?:
string
,
shellArgs
?:
string
[],
waitOnExit
?:
boolean
):
TPromise
<
number
>
{
public
$createTerminal
(
name
?:
string
,
shellPath
?:
string
,
shellArgs
?:
string
[],
env
?:
{
[
key
:
string
]:
string
},
waitOnExit
?:
boolean
):
TPromise
<
number
>
{
const
shellLaunchConfig
:
IShellLaunchConfig
=
{
name
,
executable
:
shellPath
,
args
:
shellArgs
,
waitOnExit
,
ignoreConfigurationCwd
:
true
ignoreConfigurationCwd
:
true
,
env
};
return
TPromise
.
as
(
this
.
terminalService
.
createInstance
(
shellLaunchConfig
).
id
);
}
...
...
src/vs/workbench/api/node/extHost.protocol.ts
浏览文件 @
8a67041e
...
...
@@ -280,7 +280,7 @@ export interface MainThreadProgressShape extends IDisposable {
}
export
interface
MainThreadTerminalServiceShape
extends
IDisposable
{
$createTerminal
(
name
?:
string
,
shellPath
?:
string
,
shellArgs
?:
string
[],
waitOnExit
?:
boolean
):
TPromise
<
number
>
;
$createTerminal
(
name
?:
string
,
shellPath
?:
string
,
shellArgs
?:
string
[],
env
?:
{
[
key
:
string
]:
string
},
waitOnExit
?:
boolean
):
TPromise
<
number
>
;
$dispose
(
terminalId
:
number
):
void
;
$hide
(
terminalId
:
number
):
void
;
$sendText
(
terminalId
:
number
,
text
:
string
,
addNewLine
:
boolean
):
void
;
...
...
src/vs/workbench/api/node/extHostTerminalService.ts
浏览文件 @
8a67041e
...
...
@@ -24,6 +24,7 @@ export class ExtHostTerminal implements vscode.Terminal {
name
?:
string
,
shellPath
?:
string
,
shellArgs
?:
string
[],
env
?:
{
[
key
:
string
]:
string
},
waitOnExit
?:
boolean
)
{
this
.
_name
=
name
;
...
...
@@ -32,7 +33,7 @@ export class ExtHostTerminal implements vscode.Terminal {
this
.
_pidPromise
=
new
TPromise
<
number
>
(
c
=>
{
this
.
_pidPromiseComplete
=
c
;
});
this
.
_proxy
.
$createTerminal
(
name
,
shellPath
,
shellArgs
,
waitOnExit
).
then
((
id
)
=>
{
this
.
_proxy
.
$createTerminal
(
name
,
shellPath
,
shellArgs
,
env
,
waitOnExit
).
then
((
id
)
=>
{
this
.
_id
=
id
;
this
.
_queuedRequests
.
forEach
((
r
)
=>
{
r
.
run
(
this
.
_proxy
,
this
.
_id
);
...
...
@@ -113,7 +114,7 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
}
public
createTerminalFromOptions
(
options
:
vscode
.
TerminalOptions
):
vscode
.
Terminal
{
let
terminal
=
new
ExtHostTerminal
(
this
.
_proxy
,
options
.
name
,
options
.
shellPath
,
options
.
shellArgs
/*, options.waitOnExit*/
);
let
terminal
=
new
ExtHostTerminal
(
this
.
_proxy
,
options
.
name
,
options
.
shellPath
,
options
.
shellArgs
,
options
.
env
/*, options.waitOnExit*/
);
this
.
_terminals
.
push
(
terminal
);
return
terminal
;
}
...
...
src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
浏览文件 @
8a67041e
...
...
@@ -549,14 +549,7 @@ export class TerminalTaskSystem extends EventEmitter implements ITaskSystem {
shellLaunchConfig
.
cwd
=
options
.
cwd
;
}
if
(
options
.
env
)
{
let
env
:
IStringDictionary
<
string
>
=
Object
.
create
(
null
);
Object
.
keys
(
process
.
env
).
forEach
((
key
)
=>
{
env
[
key
]
=
process
.
env
[
key
];
});
Object
.
keys
(
options
.
env
).
forEach
((
key
)
=>
{
env
[
key
]
=
options
.
env
[
key
];
});
shellLaunchConfig
.
env
=
env
;
shellLaunchConfig
.
env
=
options
.
env
;
}
let
prefersSameTerminal
=
task
.
command
.
presentation
.
panel
===
PanelKind
.
Dedicated
;
let
allowsSharedTerminal
=
task
.
command
.
presentation
.
panel
===
PanelKind
.
Shared
;
...
...
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
浏览文件 @
8a67041e
...
...
@@ -775,7 +775,13 @@ export class TerminalInstance implements ITerminalInstance {
// TODO: This should be private/protected
// TODO: locale should not be optional
public
static
createTerminalEnv
(
parentEnv
:
IStringDictionary
<
string
>
,
shell
:
IShellLaunchConfig
,
cwd
:
string
,
locale
?:
string
,
cols
?:
number
,
rows
?:
number
):
IStringDictionary
<
string
>
{
const
env
=
shell
.
env
?
shell
.
env
:
TerminalInstance
.
_cloneEnv
(
parentEnv
);
const
env
=
TerminalInstance
.
_cloneEnv
(
parentEnv
);
if
(
shell
.
env
)
{
Object
.
keys
(
shell
.
env
).
forEach
((
key
)
=>
{
env
[
key
]
=
shell
.
env
[
key
];
});
}
env
[
'
PTYPID
'
]
=
process
.
pid
.
toString
();
env
[
'
PTYSHELL
'
]
=
shell
.
executable
;
env
[
'
TERM_PROGRAM
'
]
=
'
vscode
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录