Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
4cc712b9
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,发现更多精彩内容 >>
提交
4cc712b9
编写于
10月 23, 2020
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Don't reattach to a terminal that is already attached
上级
9676646c
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
5 deletion
+10
-5
src/vs/workbench/contrib/terminal/browser/terminalService.ts
src/vs/workbench/contrib/terminal/browser/terminalService.ts
+10
-5
未找到文件。
src/vs/workbench/contrib/terminal/browser/terminalService.ts
浏览文件 @
4cc712b9
...
...
@@ -343,6 +343,10 @@ export class TerminalService implements ITerminalService {
}
}
private
isAttachedToTerminalWithPid
(
pid
:
number
):
boolean
{
return
this
.
terminalInstances
.
some
(
term
=>
term
.
processId
===
pid
);
}
public
async
initializeTerminals
():
Promise
<
void
>
{
const
enableRemoteAgentTerminals
=
this
.
_workspaceConfigurationService
.
getValue
<
boolean
|
undefined
>
(
'
terminal.integrated.serverSpawn
'
);
if
(
!!
this
.
_environmentService
.
remoteAuthority
&&
enableRemoteAgentTerminals
!==
false
)
{
...
...
@@ -350,6 +354,7 @@ export class TerminalService implements ITerminalService {
this
.
_terminalTabs
.
push
(
emptyTab
);
this
.
_onInstanceTitleChanged
.
fire
(
undefined
);
const
remoteTerms
=
await
this
.
_remoteTerminalService
.
listTerminals
();
const
unattachedRemoteTerms
=
remoteTerms
.
filter
(
term
=>
!
this
.
isAttachedToTerminalWithPid
(
term
.
pid
));
/* __GDPR__
"terminalReconnect" : {
...
...
@@ -357,13 +362,13 @@ export class TerminalService implements ITerminalService {
}
*/
const
data
=
{
count
:
r
emoteTerms
.
length
count
:
unattachedR
emoteTerms
.
length
};
this
.
_telemetryService
.
publicLog
(
'
terminalReconnection
'
,
data
);
if
(
r
emoteTerms
.
length
>
0
)
{
// Reattach to all remote terms
this
.
createTerminal
({
remoteAttach
:
r
emoteTerms
[
0
]
},
emptyTab
);
for
(
let
term
of
r
emoteTerms
.
slice
(
1
))
{
if
(
unattachedR
emoteTerms
.
length
>
0
)
{
// Reattach to all remote term
inal
s
this
.
createTerminal
({
remoteAttach
:
unattachedR
emoteTerms
[
0
]
},
emptyTab
);
for
(
let
term
of
unattachedR
emoteTerms
.
slice
(
1
))
{
this
.
createTerminal
({
remoteAttach
:
term
});
}
}
else
if
(
this
.
terminalInstances
.
length
===
0
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录