Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
dbceda7d
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,发现更多精彩内容 >>
提交
dbceda7d
编写于
1月 15, 2017
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Start of allowing terminals to be reused
上级
31fbedf0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
37 addition
and
8 deletion
+37
-8
src/vs/workbench/parts/terminal/common/terminal.ts
src/vs/workbench/parts/terminal/common/terminal.ts
+7
-0
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
...bench/parts/terminal/electron-browser/terminalInstance.ts
+30
-8
未找到文件。
src/vs/workbench/parts/terminal/common/terminal.ts
浏览文件 @
dbceda7d
...
...
@@ -265,4 +265,11 @@ export interface ITerminalInstance {
* null means the process was killed as a result of the ITerminalInstance being disposed.
*/
onExit
(
listener
:
(
exitCode
:
number
)
=>
void
):
void
;
/**
* Immediately kills the terminal's current pty process and launches a new one to replace it.
*
* @param shell The new launch configuration.
*/
reuseTerminal
(
shell
:
IShellLaunchConfig
):
void
;
}
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
浏览文件 @
dbceda7d
...
...
@@ -110,14 +110,7 @@ export class TerminalInstance implements ITerminalInstance {
});
this
.
_xterm
.
open
(
this
.
_xtermElement
);
this
.
_process
.
on
(
'
message
'
,
(
message
)
=>
{
if
(
!
this
.
_xterm
)
{
return
;
}
if
(
message
.
type
===
'
data
'
)
{
this
.
_xterm
.
write
(
message
.
content
);
}
});
this
.
_process
.
on
(
'
message
'
,
(
message
)
=>
this
.
_sendPtyDataToXterm
(
message
));
this
.
_xterm
.
on
(
'
data
'
,
(
data
)
=>
{
this
.
_process
.
send
({
event
:
'
input
'
,
...
...
@@ -371,6 +364,15 @@ export class TerminalInstance implements ITerminalInstance {
},
LAUNCHING_DURATION
);
}
private
_sendPtyDataToXterm
(
message
:
{
type
:
string
,
content
:
string
}):
void
{
if
(
!
this
.
_xterm
)
{
return
;
}
if
(
message
.
type
===
'
data
'
)
{
this
.
_xterm
.
write
(
message
.
content
);
}
}
private
_onPtyProcessExit
(
exitCode
:
number
):
void
{
// Prevent dispose functions being triggered multiple times
if
(
this
.
_isExiting
)
{
...
...
@@ -418,6 +420,26 @@ export class TerminalInstance implements ITerminalInstance {
}
}
public
reuseTerminal
(
shell
:
IShellLaunchConfig
):
void
{
if
(
this
.
_process
)
{
this
.
_process
.
removeAllListeners
(
'
exit
'
);
if
(
this
.
_process
.
connected
)
{
this
.
_process
.
kill
();
}
this
.
_process
=
null
;
}
// Ensure new processes' output starts at start of new line
this
.
_xterm
.
write
(
'
\n\
x1b[G
'
);
this
.
_createProcess
(
this
.
_contextService
.
getWorkspace
(),
shell
.
name
,
shell
);
this
.
_process
.
on
(
'
message
'
,
(
message
)
=>
this
.
_sendPtyDataToXterm
(
message
));
// TODO: Get rid of wait for any key listeners and any other listeners that are no longer valid
if
(
this
.
_isExiting
&&
this
.
_shellLaunchConfig
.
waitOnExit
)
{
this
.
_xterm
.
setOption
(
'
disableStdin
'
,
false
);
}
// Set the new shell launch config
this
.
_shellLaunchConfig
=
shell
;
}
// TODO: This should be private/protected
// TODO: locale should not be optional
public
static
createTerminalEnv
(
parentEnv
:
IStringDictionary
<
string
>
,
shell
:
IShellLaunchConfig
,
cwd
:
string
,
locale
?:
string
):
IStringDictionary
<
string
>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录