Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
387012da
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,发现更多精彩内容 >>
提交
387012da
编写于
5月 10, 2021
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove container from instance ctor
This wasn't being used anymore
上级
39c4261b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
6 addition
and
16 deletion
+6
-16
src/vs/workbench/contrib/terminal/browser/terminal.ts
src/vs/workbench/contrib/terminal/browser/terminal.ts
+1
-1
src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
+2
-2
src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
...vs/workbench/contrib/terminal/browser/terminalInstance.ts
+1
-10
src/vs/workbench/contrib/terminal/browser/terminalService.ts
src/vs/workbench/contrib/terminal/browser/terminalService.ts
+2
-3
未找到文件。
src/vs/workbench/contrib/terminal/browser/terminal.ts
浏览文件 @
387012da
...
...
@@ -117,7 +117,7 @@ export interface ITerminalService {
/**
* Creates a raw terminal instance, this should not be used outside of the terminal part.
*/
createInstance
(
container
:
HTMLElement
|
undefined
,
shellLaunchConfig
:
IShellLaunchConfig
):
ITerminalInstance
;
createInstance
(
shellLaunchConfig
:
IShellLaunchConfig
):
ITerminalInstance
;
getInstanceFromId
(
terminalId
:
number
):
ITerminalInstance
|
undefined
;
getInstanceFromIndex
(
terminalIndex
:
number
):
ITerminalInstance
;
getTabLabels
():
string
[];
...
...
src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
浏览文件 @
387012da
...
...
@@ -270,7 +270,7 @@ export class TerminalGroup extends Disposable implements ITerminalGroup {
if
(
'
instanceId
'
in
shellLaunchConfigOrInstance
)
{
instance
=
shellLaunchConfigOrInstance
;
}
else
{
instance
=
this
.
_terminalService
.
createInstance
(
undefined
,
shellLaunchConfigOrInstance
);
instance
=
this
.
_terminalService
.
createInstance
(
shellLaunchConfigOrInstance
);
}
this
.
_terminalInstances
.
push
(
instance
);
this
.
_initInstanceListeners
(
instance
);
...
...
@@ -438,7 +438,7 @@ export class TerminalGroup extends Disposable implements ITerminalGroup {
}
split
(
shellLaunchConfig
:
IShellLaunchConfig
):
ITerminalInstance
{
const
instance
=
this
.
_terminalService
.
createInstance
(
undefined
,
shellLaunchConfig
);
const
instance
=
this
.
_terminalService
.
createInstance
(
shellLaunchConfig
);
this
.
_terminalInstances
.
splice
(
this
.
_activeInstanceIndex
+
1
,
0
,
instance
);
this
.
_initInstanceListeners
(
instance
);
this
.
_setActiveInstance
(
instance
);
...
...
src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
浏览文件 @
387012da
...
...
@@ -103,6 +103,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
private
_skipTerminalCommands
:
string
[];
private
_shellType
:
TerminalShellType
;
private
_title
:
string
=
''
;
private
_container
:
HTMLElement
|
undefined
;
private
_wrapperElement
:
(
HTMLElement
&
{
xterm
?:
XTermTerminal
})
|
undefined
;
private
_xterm
:
XTermTerminal
|
undefined
;
private
_xtermCore
:
XTermCore
|
undefined
;
...
...
@@ -131,7 +132,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
private
_commandTrackerAddon
:
CommandTrackerAddon
|
undefined
;
private
_navigationModeAddon
:
INavigationMode
&
ITerminalAddon
|
undefined
;
private
_timeoutDimension
:
dom
.
Dimension
|
undefined
;
private
_lastLayoutDimensions
:
dom
.
Dimension
|
undefined
;
private
_hasHadInput
:
boolean
;
...
...
@@ -222,8 +222,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
private
readonly
_terminalShellTypeContextKey
:
IContextKey
<
string
>
,
private
readonly
_terminalAltBufferActiveContextKey
:
IContextKey
<
boolean
>
,
private
readonly
_configHelper
:
TerminalConfigHelper
,
// TODO: Remove this, it's never set in the ctor
private
_container
:
HTMLElement
|
undefined
,
private
_shellLaunchConfig
:
IShellLaunchConfig
,
@
ITerminalInstanceService
private
readonly
_terminalInstanceService
:
ITerminalInstanceService
,
@
ITerminalProfileResolverService
private
readonly
_terminalProfileResolverService
:
ITerminalProfileResolverService
,
...
...
@@ -280,11 +278,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
this
.
_xtermReadyPromise
.
then
(
async
()
=>
{
// Wait for a period to allow a container to be ready
await
this
.
_containerReadyBarrier
.
wait
();
// Only attach xterm.js to the DOM if the terminal panel has been opened before.
if
(
_container
)
{
this
.
_attachToElement
(
_container
);
}
this
.
_createProcess
();
});
...
...
@@ -1491,8 +1484,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
return
;
}
this
.
_timeoutDimension
=
new
dom
.
Dimension
(
dimension
.
width
,
dimension
.
height
);
if
(
this
.
_xterm
&&
this
.
_xterm
.
element
)
{
this
.
_xterm
.
element
.
style
.
width
=
terminalWidth
+
'
px
'
;
}
...
...
src/vs/workbench/contrib/terminal/browser/terminalService.ts
浏览文件 @
387012da
...
...
@@ -987,13 +987,12 @@ export class TerminalService implements ITerminalService {
return
{
label
,
description
:
profile
.
path
,
profile
,
buttons
};
}
createInstance
(
container
:
HTMLElement
|
undefined
,
shellLaunchConfig
:
IShellLaunchConfig
):
ITerminalInstance
{
createInstance
(
shellLaunchConfig
:
IShellLaunchConfig
):
ITerminalInstance
{
const
instance
=
this
.
_instantiationService
.
createInstance
(
TerminalInstance
,
this
.
_terminalFocusContextKey
,
this
.
_terminalShellTypeContextKey
,
this
.
_terminalAltBufferActiveContextKey
,
this
.
_configHelper
,
container
,
shellLaunchConfig
);
this
.
_onInstanceCreated
.
fire
(
instance
);
...
...
@@ -1039,7 +1038,7 @@ export class TerminalService implements ITerminalService {
throw
new
Error
(
'
Could not create terminal when process support is not registered
'
);
}
if
(
shellLaunchConfig
.
hideFromUser
)
{
const
instance
=
this
.
createInstance
(
undefined
,
shellLaunchConfig
);
const
instance
=
this
.
createInstance
(
shellLaunchConfig
);
this
.
_backgroundedTerminalInstances
.
push
(
instance
);
this
.
_initInstanceListeners
(
instance
);
return
instance
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录