Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
0b788756
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,发现更多精彩内容 >>
提交
0b788756
编写于
2月 12, 2018
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Create split vertical command
上级
b10ccf74
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
62 addition
and
3 deletion
+62
-3
src/vs/workbench/parts/terminal/common/terminal.ts
src/vs/workbench/parts/terminal/common/terminal.ts
+3
-1
src/vs/workbench/parts/terminal/common/terminalService.ts
src/vs/workbench/parts/terminal/common/terminalService.ts
+33
-0
src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
.../parts/terminal/electron-browser/terminal.contribution.ts
+2
-1
src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
...kbench/parts/terminal/electron-browser/terminalActions.ts
+21
-0
src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts
.../workbench/parts/terminal/electron-browser/terminalTab.ts
+3
-1
未找到文件。
src/vs/workbench/parts/terminal/common/terminal.ts
浏览文件 @
0b788756
...
...
@@ -165,6 +165,7 @@ export interface ITerminalService {
setActiveInstanceToNext
():
void
;
setActiveInstanceToPrevious
():
void
;
getActiveOrCreateInstance
(
wasNewTerminalAction
?:
boolean
):
ITerminalInstance
;
splitInstanceVertically
(
instance
:
ITerminalInstance
):
void
;
showPanel
(
focus
?:
boolean
):
TPromise
<
void
>
;
hidePanel
():
void
;
...
...
@@ -181,12 +182,13 @@ export interface ITerminalService {
export
interface
ITerminalTab
{
terminalInstances
:
ITerminalInstance
[];
title
:
string
;
onDisposed
:
Event
<
ITerminalTab
>
;
attachToElement
(
element
:
HTMLElement
):
void
;
setVisible
(
visible
:
boolean
):
void
;
layout
(
width
:
number
,
height
:
number
):
void
;
addDisposable
(
disposable
:
IDisposable
):
void
;
split
(
terminalFocusContextKey
:
IContextKey
<
boolean
>
,
configHelper
:
ITerminalConfigHelper
,
shellLaunchConfig
:
IShellLaunchConfig
):
void
;
split
(
terminalFocusContextKey
:
IContextKey
<
boolean
>
,
configHelper
:
ITerminalConfigHelper
,
shellLaunchConfig
:
IShellLaunchConfig
):
ITerminalInstance
;
}
export
interface
ITerminalInstance
{
...
...
src/vs/workbench/parts/terminal/common/terminalService.ts
浏览文件 @
0b788756
...
...
@@ -221,6 +221,39 @@ export abstract class TerminalService implements ITerminalService {
this
.
setActiveInstanceByIndex
(
newIndex
);
}
public
splitInstanceVertically
(
instanceToSplit
:
ITerminalInstance
):
void
{
const
tab
=
this
.
_getTabForInstance
(
instanceToSplit
);
if
(
!
tab
)
{
return
;
}
const
instance
=
tab
.
split
(
this
.
_terminalFocusContextKey
,
this
.
configHelper
,
{});
// TOOD: The below should be shared with ITerminalService.createInstance
tab
.
addDisposable
(
tab
.
onDisposed
(
this
.
_onTabDisposed
.
fire
,
this
.
_onTabDisposed
));
instance
.
addDisposable
(
instance
.
onDisposed
(
this
.
_onInstanceDisposed
.
fire
,
this
.
_onInstanceDisposed
));
instance
.
addDisposable
(
instance
.
onTitleChanged
(
this
.
_onInstanceTitleChanged
.
fire
,
this
.
_onInstanceTitleChanged
));
instance
.
addDisposable
(
instance
.
onProcessIdReady
(
this
.
_onInstanceProcessIdReady
.
fire
,
this
.
_onInstanceProcessIdReady
));
this
.
_onInstancesChanged
.
fire
();
// TODO: This shouldn't be needed
tab
.
setVisible
(
true
);
}
private
_getTabForInstance
(
instance
:
ITerminalInstance
):
ITerminalTab
{
let
instanceIndex
=
this
.
_activeTabIndex
;
let
currentTabIndex
=
0
;
while
(
instanceIndex
>=
0
&&
currentTabIndex
<
this
.
_terminalTabs
.
length
)
{
const
tab
=
this
.
_terminalTabs
[
currentTabIndex
];
const
count
=
tab
.
terminalInstances
.
length
;
if
(
instanceIndex
<
count
)
{
return
tab
;
}
if
(
instanceIndex
>
count
)
{
instanceIndex
-=
count
;
}
}
return
null
;
}
public
showPanel
(
focus
?:
boolean
):
TPromise
<
void
>
{
return
new
TPromise
<
void
>
((
complete
)
=>
{
let
panel
=
this
.
_panelService
.
getActivePanel
();
...
...
src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
浏览文件 @
0b788756
...
...
@@ -18,7 +18,7 @@ import { TERMINAL_DEFAULT_SHELL_UNIX_LIKE, TERMINAL_DEFAULT_SHELL_WINDOWS } from
import
{
IWorkbenchActionRegistry
,
Extensions
as
ActionExtensions
}
from
'
vs/workbench/common/actions
'
;
import
{
KeyCode
,
KeyMod
}
from
'
vs/base/common/keyCodes
'
;
import
{
ContextKeyExpr
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
KillTerminalAction
,
CopyTerminalSelectionAction
,
CreateNewTerminalAction
,
CreateNewInActiveWorkspaceTerminalAction
,
FocusActiveTerminalAction
,
FocusNextTerminalAction
,
FocusPreviousTerminalAction
,
SelectDefaultShellWindowsTerminalAction
,
RunSelectedTextInTerminalAction
,
RunActiveFileInTerminalAction
,
ScrollDownTerminalAction
,
ScrollDownPageTerminalAction
,
ScrollToBottomTerminalAction
,
ScrollUpTerminalAction
,
ScrollUpPageTerminalAction
,
ScrollToTopTerminalAction
,
TerminalPasteAction
,
ToggleTerminalAction
,
ClearTerminalAction
,
AllowWorkspaceShellTerminalCommand
,
DisallowWorkspaceShellTerminalCommand
,
RenameTerminalAction
,
SelectAllTerminalAction
,
FocusTerminalFindWidgetAction
,
HideTerminalFindWidgetAction
,
ShowNextFindTermTerminalFindWidgetAction
,
ShowPreviousFindTermTerminalFindWidgetAction
,
DeleteWordLeftTerminalAction
,
DeleteWordRightTerminalAction
,
QuickOpenActionTermContributor
,
QuickOpenTermAction
,
TERMINAL_PICKER_PREFIX
,
MoveToLineStartTerminalAction
,
MoveToLineEndTerminalAction
}
from
'
vs/workbench/parts/terminal/electron-browser/terminalActions
'
;
import
{
KillTerminalAction
,
CopyTerminalSelectionAction
,
CreateNewTerminalAction
,
CreateNewInActiveWorkspaceTerminalAction
,
FocusActiveTerminalAction
,
FocusNextTerminalAction
,
FocusPreviousTerminalAction
,
SelectDefaultShellWindowsTerminalAction
,
RunSelectedTextInTerminalAction
,
RunActiveFileInTerminalAction
,
ScrollDownTerminalAction
,
ScrollDownPageTerminalAction
,
ScrollToBottomTerminalAction
,
ScrollUpTerminalAction
,
ScrollUpPageTerminalAction
,
ScrollToTopTerminalAction
,
TerminalPasteAction
,
ToggleTerminalAction
,
ClearTerminalAction
,
AllowWorkspaceShellTerminalCommand
,
DisallowWorkspaceShellTerminalCommand
,
RenameTerminalAction
,
SelectAllTerminalAction
,
FocusTerminalFindWidgetAction
,
HideTerminalFindWidgetAction
,
ShowNextFindTermTerminalFindWidgetAction
,
ShowPreviousFindTermTerminalFindWidgetAction
,
DeleteWordLeftTerminalAction
,
DeleteWordRightTerminalAction
,
QuickOpenActionTermContributor
,
QuickOpenTermAction
,
TERMINAL_PICKER_PREFIX
,
MoveToLineStartTerminalAction
,
MoveToLineEndTerminalAction
,
SplitVerticalTerminalAction
}
from
'
vs/workbench/parts/terminal/electron-browser/terminalActions
'
;
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
ShowAllCommandsAction
}
from
'
vs/workbench/parts/quickopen/browser/commandsHandler
'
;
import
{
SyncActionDescriptor
}
from
'
vs/platform/actions/common/actions
'
;
...
...
@@ -409,6 +409,7 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(MoveToLineEndTer
primary
:
null
,
mac
:
{
primary
:
KeyMod
.
CtrlCmd
|
KeyCode
.
RightArrow
}
},
KEYBINDING_CONTEXT_TERMINAL_FOCUS
),
'
Terminal: Move To Line End
'
,
category
);
actionRegistry
.
registerWorkbenchAction
(
new
SyncActionDescriptor
(
SplitVerticalTerminalAction
,
SplitVerticalTerminalAction
.
ID
,
SplitVerticalTerminalAction
.
LABEL
),
'
Terminal: Split Vertically
'
,
category
);
terminalCommands
.
setup
();
...
...
src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
浏览文件 @
0b788756
...
...
@@ -296,6 +296,27 @@ export class CreateNewInActiveWorkspaceTerminalAction extends Action {
}
}
export
class
SplitVerticalTerminalAction
extends
Action
{
public
static
readonly
ID
=
'
workbench.action.terminal.splitVertical
'
;
public
static
readonly
LABEL
=
nls
.
localize
(
'
workbench.action.terminal.splitVertical
'
,
"
Split the terminal vertically
"
);
constructor
(
id
:
string
,
label
:
string
,
@
ITerminalService
private
_terminalService
:
ITerminalService
)
{
super
(
id
,
label
);
}
public
run
(
event
?:
any
):
TPromise
<
any
>
{
const
instance
=
this
.
_terminalService
.
getActiveInstance
();
if
(
!
instance
)
{
return
TPromise
.
as
(
void
0
);
}
this
.
_terminalService
.
splitInstanceVertically
(
instance
);
return
this
.
_terminalService
.
showPanel
(
true
);
}
}
export
class
FocusActiveTerminalAction
extends
Action
{
public
static
readonly
ID
=
'
workbench.action.terminal.focus
'
;
...
...
src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts
浏览文件 @
0b788756
...
...
@@ -291,7 +291,7 @@ export class TerminalTab extends Disposable implements ITerminalTab {
terminalFocusContextKey
:
IContextKey
<
boolean
>
,
configHelper
:
TerminalConfigHelper
,
shellLaunchConfig
:
IShellLaunchConfig
):
void
{
):
ITerminalInstance
{
const
instance
=
this
.
_instantiationService
.
createInstance
(
TerminalInstance
,
terminalFocusContextKey
,
configHelper
,
...
...
@@ -304,6 +304,8 @@ export class TerminalTab extends Disposable implements ITerminalTab {
this
.
_rootSplitPane
.
split
(
instance
);
// TOOD: Set this correctly
this
.
_activeInstanceIndex
=
1
;
return
instance
;
}
public
addDisposable
(
disposable
:
IDisposable
):
void
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录