Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
ec0a503c
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,发现更多精彩内容 >>
提交
ec0a503c
编写于
2月 07, 2019
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Strict null work for terminalActions
上级
40c4d2b7
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
7 addition
and
7 deletion
+7
-7
src/vs/workbench/contrib/terminal/electron-browser/terminalActions.ts
...ench/contrib/terminal/electron-browser/terminalActions.ts
+7
-7
未找到文件。
src/vs/workbench/contrib/terminal/electron-browser/terminalActions.ts
浏览文件 @
ec0a503c
...
...
@@ -137,7 +137,7 @@ export class QuickKillTerminalAction extends Action {
if
(
instance
)
{
instance
.
dispose
(
true
);
}
return
Promise
.
resolve
(
timeout
(
50
)).
then
(
result
=>
this
.
quickOpenService
.
show
(
TERMINAL_PICKER_PREFIX
,
null
));
return
Promise
.
resolve
(
timeout
(
50
)).
then
(
result
=>
this
.
quickOpenService
.
show
(
TERMINAL_PICKER_PREFIX
,
undefined
));
}
}
...
...
@@ -291,7 +291,7 @@ export class SendSequenceTerminalCommand extends Command {
const
workspaceContextService
=
accessor
.
get
(
IWorkspaceContextService
);
const
historyService
=
accessor
.
get
(
IHistoryService
);
const
activeWorkspaceRootUri
=
historyService
.
getLastActiveWorkspaceRoot
(
Schemas
.
file
);
const
lastActiveWorkspaceRoot
=
activeWorkspaceRootUri
?
workspaceContextService
.
getWorkspaceFolder
(
activeWorkspaceRootUri
)
:
null
;
const
lastActiveWorkspaceRoot
=
activeWorkspaceRootUri
?
workspaceContextService
.
getWorkspaceFolder
(
activeWorkspaceRootUri
)
||
undefined
:
undefined
;
const
resolvedText
=
configurationResolverService
.
resolve
(
lastActiveWorkspaceRoot
,
args
.
text
);
terminalInstance
.
sendText
(
resolvedText
,
false
);
}
...
...
@@ -324,7 +324,7 @@ export class CreateNewTerminalAction extends Action {
}
}
let
instancePromise
:
Promise
<
ITerminalInstance
>
;
let
instancePromise
:
Promise
<
ITerminalInstance
|
null
>
;
if
(
folders
.
length
<=
1
)
{
// Allow terminal service to handle the path when there is only a
// single root
...
...
@@ -651,7 +651,7 @@ export class RunSelectedTextInTerminalAction extends Action {
return
Promise
.
resolve
(
undefined
);
}
let
editor
=
this
.
codeEditorService
.
getFocusedCodeEditor
();
if
(
!
editor
)
{
if
(
!
editor
||
!
editor
.
hasModel
()
)
{
return
Promise
.
resolve
(
undefined
);
}
let
selection
=
editor
.
getSelection
();
...
...
@@ -687,7 +687,7 @@ export class RunActiveFileInTerminalAction extends Action {
return
Promise
.
resolve
(
undefined
);
}
const
editor
=
this
.
codeEditorService
.
getActiveCodeEditor
();
if
(
!
editor
)
{
if
(
!
editor
||
!
editor
.
hasModel
()
)
{
return
Promise
.
resolve
(
undefined
);
}
const
uri
=
editor
.
getModel
().
uri
;
...
...
@@ -1050,7 +1050,7 @@ export class QuickOpenTermAction extends Action {
}
public
run
():
Promise
<
void
>
{
return
this
.
quickOpenService
.
show
(
TERMINAL_PICKER_PREFIX
,
null
);
return
this
.
quickOpenService
.
show
(
TERMINAL_PICKER_PREFIX
,
undefined
);
}
}
...
...
@@ -1071,7 +1071,7 @@ export class RenameTerminalQuickOpenAction extends RenameTerminalAction {
super
.
run
(
this
.
terminal
)
// This timeout is needed to make sure the previous quickOpen has time to close before we show the next one
.
then
(()
=>
timeout
(
50
))
.
then
(
result
=>
this
.
quickOpenService
.
show
(
TERMINAL_PICKER_PREFIX
,
null
));
.
then
(
result
=>
this
.
quickOpenService
.
show
(
TERMINAL_PICKER_PREFIX
,
undefined
));
return
Promise
.
resolve
(
null
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录