Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
2ee023fe
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,发现更多精彩内容 >>
未验证
提交
2ee023fe
编写于
2月 11, 2020
作者:
D
Daniel Imms
提交者:
GitHub
2月 11, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into tyriar/75793
上级
74feae91
26510e7c
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
48 addition
and
52 deletion
+48
-52
src/vs/vscode.d.ts
src/vs/vscode.d.ts
+29
-0
src/vs/vscode.proposed.d.ts
src/vs/vscode.proposed.d.ts
+0
-32
src/vs/workbench/contrib/externalTerminal/node/externalTerminalService.ts
.../contrib/externalTerminal/node/externalTerminalService.ts
+19
-20
未找到文件。
src/vs/vscode.d.ts
浏览文件 @
2ee023fe
...
...
@@ -4930,6 +4930,21 @@ declare module 'vscode' {
*/
readonly
creationOptions
:
Readonly
<
TerminalOptions
|
ExtensionTerminalOptions
>
;
/**
* The exit status of the terminal, this will be undefined while the terminal is active.
*
* **Example:** Show a notification with the exit code when the terminal exits with a
* non-zero exit code.
* ```typescript
* window.onDidCloseTerminal(t => {
* if (t.exitStatus && t.exitStatus.code) {
* vscode.window.showInformationMessage(`Exit code: ${t.exitStatus.code}`);
* }
* });
* ```
*/
readonly
exitStatus
:
TerminalExitStatus
|
undefined
;
/**
* Send text to the terminal. The text is written to the stdin of the underlying pty process
* (shell) of the terminal.
...
...
@@ -7746,6 +7761,20 @@ declare module 'vscode' {
readonly
rows
:
number
;
}
/**
* Represents how a terminal exited.
*/
export
interface
TerminalExitStatus
{
/**
* The exit code that a terminal exited with, it can have the following values:
* - Zero: the terminal process or custom execution succeeded.
* - Non-zero: the terminal process or custom execution failed.
* - `undefined`: the user forcibly closed the terminal or a custom execution exited
* without providing an exit code.
*/
readonly
code
:
number
|
undefined
;
}
/**
* A location in the editor at which progress information can be shown. It depends on the
* location how progress is visually represented.
...
...
src/vs/vscode.proposed.d.ts
浏览文件 @
2ee023fe
...
...
@@ -1025,38 +1025,6 @@ declare module 'vscode' {
//#endregion
//#region Terminal exit status https://github.com/microsoft/vscode/issues/62103
export
interface
TerminalExitStatus
{
/**
* The exit code that a terminal exited with, it can have the following values:
* - Zero: the terminal process or custom execution succeeded.
* - Non-zero: the terminal process or custom execution failed.
* - `undefined`: the user forcibly closed the terminal or a custom execution exited
* without providing an exit code.
*/
readonly
code
:
number
|
undefined
;
}
export
interface
Terminal
{
/**
* The exit status of the terminal, this will be undefined while the terminal is active.
*
* **Example:** Show a notification with the exit code when the terminal exits with a
* non-zero exit code.
* ```typescript
* window.onDidCloseTerminal(t => {
* if (t.exitStatus && t.exitStatus.code) {
* vscode.window.showInformationMessage(`Exit code: ${t.exitStatus.code}`);
* }
* });
* ```
*/
readonly
exitStatus
:
TerminalExitStatus
|
undefined
;
}
//#endregion
//#region Terminal dimensions property and change event https://github.com/microsoft/vscode/issues/55718
/**
...
...
src/vs/workbench/contrib/externalTerminal/node/externalTerminalService.ts
浏览文件 @
2ee023fe
...
...
@@ -301,29 +301,28 @@ export class LinuxExternalTerminalService implements IExternalTerminalService {
private
static
_DEFAULT_TERMINAL_LINUX_READY
:
Promise
<
string
>
;
public
static
getDefaultTerminalLinuxReady
():
Promise
<
string
>
{
public
static
async
getDefaultTerminalLinuxReady
():
Promise
<
string
>
{
if
(
!
LinuxExternalTerminalService
.
_DEFAULT_TERMINAL_LINUX_READY
)
{
LinuxExternalTerminalService
.
_DEFAULT_TERMINAL_LINUX_READY
=
new
Promise
<
string
>
(
c
=>
{
LinuxExternalTerminalService
.
_DEFAULT_TERMINAL_LINUX_READY
=
new
Promise
(
async
r
=>
{
if
(
env
.
isLinux
)
{
Promise
.
all
([
pfs
.
exists
(
'
/etc/debian_version
'
),
Promise
.
resolve
(
process
.
lazyEnv
)
||
Promise
.
resolve
(
undefined
)]).
then
(([
isDebian
])
=>
{
const
isDebian
=
await
pfs
.
exists
(
'
/etc/debian_version
'
);
await
process
.
lazyEnv
;
if
(
isDebian
)
{
c
(
'
x-terminal-emulator
'
);
r
(
'
x-terminal-emulator
'
);
}
else
if
(
process
.
env
.
DESKTOP_SESSION
===
'
gnome
'
||
process
.
env
.
DESKTOP_SESSION
===
'
gnome-classic
'
)
{
c
(
'
gnome-terminal
'
);
r
(
'
gnome-terminal
'
);
}
else
if
(
process
.
env
.
DESKTOP_SESSION
===
'
kde-plasma
'
)
{
c
(
'
konsole
'
);
r
(
'
konsole
'
);
}
else
if
(
process
.
env
.
COLORTERM
)
{
c
(
process
.
env
.
COLORTERM
);
r
(
process
.
env
.
COLORTERM
);
}
else
if
(
process
.
env
.
TERM
)
{
c
(
process
.
env
.
TERM
);
r
(
process
.
env
.
TERM
);
}
else
{
c
(
'
xterm
'
);
r
(
'
xterm
'
);
}
});
r
eturn
;
}
else
{
r
(
'
xterm
'
)
;
}
c
(
'
xterm
'
);
});
}
return
LinuxExternalTerminalService
.
_DEFAULT_TERMINAL_LINUX_READY
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录