Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d93221d7
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,发现更多精彩内容 >>
提交
d93221d7
编写于
3月 04, 2019
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Strict null check contrib/terminal
Fixes #69686
上级
47977b99
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
13 addition
and
10 deletion
+13
-10
src/vs/workbench/contrib/terminal/common/terminal.ts
src/vs/workbench/contrib/terminal/common/terminal.ts
+1
-1
src/vs/workbench/contrib/terminal/common/terminalService.ts
src/vs/workbench/contrib/terminal/common/terminalService.ts
+1
-1
src/vs/workbench/contrib/terminal/electron-browser/terminalService.ts
...ench/contrib/terminal/electron-browser/terminalService.ts
+11
-8
未找到文件。
src/vs/workbench/contrib/terminal/common/terminal.ts
浏览文件 @
d93221d7
...
...
@@ -251,7 +251,7 @@ export interface ITerminalService {
findPrevious
():
void
;
setContainers
(
panelContainer
:
HTMLElement
,
terminalContainer
:
HTMLElement
):
void
;
selectDefaultWindowsShell
():
Promise
<
string
>
;
selectDefaultWindowsShell
():
Promise
<
string
|
undefined
>
;
setWorkspaceShellAllowed
(
isAllowed
:
boolean
):
void
;
requestExtHostProcess
(
proxy
:
ITerminalProcessExtHostProxy
,
shellLaunchConfig
:
IShellLaunchConfig
,
activeWorkspaceRootUri
:
URI
,
cols
:
number
,
rows
:
number
):
void
;
...
...
src/vs/workbench/contrib/terminal/common/terminalService.ts
浏览文件 @
d93221d7
...
...
@@ -92,7 +92,7 @@ export abstract class TerminalService implements ITerminalService {
public
abstract
createTerminalRenderer
(
name
:
string
):
ITerminalInstance
;
public
abstract
createInstance
(
terminalFocusContextKey
:
IContextKey
<
boolean
>
,
configHelper
:
ITerminalConfigHelper
,
container
:
HTMLElement
,
shellLaunchConfig
:
IShellLaunchConfig
,
doCreateProcess
:
boolean
):
ITerminalInstance
;
public
abstract
getActiveOrCreateInstance
(
wasNewTerminalAction
?:
boolean
):
ITerminalInstance
;
public
abstract
selectDefaultWindowsShell
():
Promise
<
string
>
;
public
abstract
selectDefaultWindowsShell
():
Promise
<
string
|
undefined
>
;
public
abstract
setContainers
(
panelContainer
:
HTMLElement
,
terminalContainer
:
HTMLElement
):
void
;
public
abstract
requestExtHostProcess
(
proxy
:
ITerminalProcessExtHostProxy
,
shellLaunchConfig
:
IShellLaunchConfig
,
activeWorkspaceRootUri
:
URI
,
cols
:
number
,
rows
:
number
):
void
;
...
...
src/vs/workbench/contrib/terminal/electron-browser/terminalService.ts
浏览文件 @
d93221d7
...
...
@@ -64,7 +64,10 @@ export class TerminalService extends AbstractTerminalService implements ITermina
if
(
request
.
termProgram
===
'
vscode
'
&&
request
.
filesToWait
)
{
pfs
.
whenDeleted
(
request
.
filesToWait
.
waitMarkerFilePath
).
then
(()
=>
{
if
(
this
.
terminalInstances
.
length
>
0
)
{
this
.
getActiveInstance
().
focus
();
const
terminal
=
this
.
getActiveInstance
();
if
(
terminal
)
{
terminal
.
focus
();
}
}
});
}
...
...
@@ -215,14 +218,14 @@ export class TerminalService extends AbstractTerminalService implements ITermina
);
}
public
selectDefaultWindowsShell
():
Promise
<
string
>
{
public
selectDefaultWindowsShell
():
Promise
<
string
|
undefined
>
{
return
this
.
_detectWindowsShells
().
then
(
shells
=>
{
const
options
:
IPickOptions
<
IQuickPickItem
>
=
{
placeHolder
:
nls
.
localize
(
'
terminal.integrated.chooseWindowsShell
'
,
"
Select your preferred terminal shell, you can change this later in your settings
"
)
};
return
this
.
_quickInputService
.
pick
(
shells
,
options
).
then
(
value
=>
{
if
(
!
value
)
{
return
null
;
return
undefined
;
}
const
shell
=
value
.
description
;
return
this
.
_configurationService
.
updateValue
(
'
terminal.integrated.shell.windows
'
,
shell
,
ConfigurationTarget
.
USER
).
then
(()
=>
shell
);
...
...
@@ -270,13 +273,13 @@ export class TerminalService extends AbstractTerminalService implements ITermina
});
}
private
_validateShellPaths
(
label
:
string
,
potentialPaths
:
string
[]):
Promise
<
[
string
,
string
]
>
{
const
current
=
potentialPaths
.
shift
();
return
pfs
.
fileExists
(
current
).
then
(
exists
=>
{
if
(
!
exists
)
{
private
_validateShellPaths
(
label
:
string
,
potentialPaths
:
string
[]):
Promise
<
[
string
,
string
]
|
null
>
{
if
(
potentialPaths
.
length
===
0
)
{
return
null
;
return
Promise
.
resolve
(
null
)
;
}
const
current
=
potentialPaths
.
shift
();
return
pfs
.
fileExists
(
current
!
).
then
(
exists
=>
{
if
(
!
exists
)
{
return
this
.
_validateShellPaths
(
label
,
potentialPaths
);
}
return
[
label
,
current
]
as
[
string
,
string
];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录