Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
9dd69b3a
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,发现更多精彩内容 >>
未验证
提交
9dd69b3a
编写于
10月 22, 2020
作者:
R
Rob Lourens
提交者:
Alex Dima
10月 22, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Don't reconnect to task terminals
上级
cc33c911
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
2 deletion
+13
-2
src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
+3
-1
src/vs/workbench/contrib/terminal/browser/remoteTerminalService.ts
...rkbench/contrib/terminal/browser/remoteTerminalService.ts
+1
-0
src/vs/workbench/contrib/terminal/common/remoteTerminalChannel.ts
...orkbench/contrib/terminal/common/remoteTerminalChannel.ts
+3
-1
src/vs/workbench/contrib/terminal/common/terminal.ts
src/vs/workbench/contrib/terminal/common/terminal.ts
+6
-0
未找到文件。
src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
浏览文件 @
9dd69b3a
...
...
@@ -1085,6 +1085,7 @@ export class TerminalTaskSystem implements ITaskSystem {
if
(
options
.
env
)
{
shellLaunchConfig
.
env
=
options
.
env
;
}
shellLaunchConfig
.
isFeatureTerminal
=
true
;
return
shellLaunchConfig
;
}
...
...
@@ -1118,7 +1119,8 @@ export class TerminalTaskSystem implements ITaskSystem {
isExtensionTerminal
:
true
,
waitOnExit
,
name
:
this
.
createTerminalName
(
task
),
initialText
:
task
.
command
.
presentation
&&
task
.
command
.
presentation
.
echo
?
`\x1b[1m> Executing task:
${
task
.
_label
}
<\x1b[0m\n`
:
undefined
initialText
:
task
.
command
.
presentation
&&
task
.
command
.
presentation
.
echo
?
`\x1b[1m> Executing task:
${
task
.
_label
}
<\x1b[0m\n`
:
undefined
,
isFeatureTerminal
:
true
};
}
else
{
let
resolvedResult
:
{
command
:
CommandString
,
args
:
CommandString
[]
}
=
this
.
resolveCommandAndArgs
(
resolver
,
task
.
command
);
...
...
src/vs/workbench/contrib/terminal/browser/remoteTerminalService.ts
浏览文件 @
9dd69b3a
...
...
@@ -121,6 +121,7 @@ export class RemoteTerminalProcess extends Disposable implements ITerminalChildP
const
result
=
await
this
.
_remoteTerminalChannel
.
createTerminalProcess
(
shellLaunchConfigDto
,
this
.
_activeWorkspaceRootUri
,
!
this
.
_shellLaunchConfig
.
isFeatureTerminal
,
this
.
_cols
,
this
.
_rows
,
isWorkspaceShellAllowed
,
...
...
src/vs/workbench/contrib/terminal/common/remoteTerminalChannel.ts
浏览文件 @
9dd69b3a
...
...
@@ -71,6 +71,7 @@ export interface ICreateTerminalProcessArguments {
workspaceFolders
:
IWorkspaceFolderData
[];
activeWorkspaceFolder
:
IWorkspaceFolderData
|
null
;
activeFileResource
:
UriComponents
|
undefined
;
shouldPersistTerminal
:
boolean
;
cols
:
number
;
rows
:
number
;
isWorkspaceShellAllowed
:
boolean
;
...
...
@@ -205,7 +206,7 @@ export class RemoteTerminalChannelClient {
};
}
public
async
createTerminalProcess
(
shellLaunchConfig
:
IShellLaunchConfigDto
,
activeWorkspaceRootUri
:
URI
|
undefined
,
cols
:
number
,
rows
:
number
,
isWorkspaceShellAllowed
:
boolean
):
Promise
<
ICreateTerminalProcessResult
>
{
public
async
createTerminalProcess
(
shellLaunchConfig
:
IShellLaunchConfigDto
,
activeWorkspaceRootUri
:
URI
|
undefined
,
shouldPersistTerminal
:
boolean
,
cols
:
number
,
rows
:
number
,
isWorkspaceShellAllowed
:
boolean
):
Promise
<
ICreateTerminalProcessResult
>
{
const
terminalConfig
=
this
.
_configurationService
.
getValue
<
ITerminalConfiguration
>
(
TERMINAL_CONFIG_SECTION
);
const
configuration
:
ICompleteTerminalConfiguration
=
{
'
terminal.integrated.automationShell.windows
'
:
this
.
_readSingleTerminalConfiguration
(
'
terminal.integrated.automationShell.windows
'
),
...
...
@@ -272,6 +273,7 @@ export class RemoteTerminalChannelClient {
workspaceFolders
,
activeWorkspaceFolder
,
activeFileResource
,
shouldPersistTerminal
,
cols
,
rows
,
isWorkspaceShellAllowed
,
...
...
src/vs/workbench/contrib/terminal/common/terminal.ts
浏览文件 @
9dd69b3a
...
...
@@ -246,6 +246,12 @@ export interface IShellLaunchConfig {
* as normal.
*/
hideFromUser
?:
boolean
;
/**
* Whether this terminal is not a terminal that the user directly created and uses, but rather
* a terminal used to drive some VS Code feature.
*/
isFeatureTerminal
?:
boolean
;
}
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录