Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
0927be89
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,发现更多精彩内容 >>
提交
0927be89
编写于
7月 24, 2019
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Tweak names, make shellLaunchConfig readonly again
上级
11e63ac0
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
15 addition
and
16 deletion
+15
-16
src/vs/workbench/api/browser/mainThreadTerminalService.ts
src/vs/workbench/api/browser/mainThreadTerminalService.ts
+1
-1
src/vs/workbench/api/common/extHost.protocol.ts
src/vs/workbench/api/common/extHost.protocol.ts
+1
-1
src/vs/workbench/api/node/extHostTerminalService.ts
src/vs/workbench/api/node/extHostTerminalService.ts
+0
-1
src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
...vs/workbench/contrib/terminal/browser/terminalInstance.ts
+2
-2
src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
...kbench/contrib/terminal/browser/terminalProcessManager.ts
+3
-3
src/vs/workbench/contrib/terminal/common/terminal.ts
src/vs/workbench/contrib/terminal/common/terminal.ts
+4
-4
src/vs/workbench/contrib/terminal/common/terminalProcessExtHostProxy.ts
...ch/contrib/terminal/common/terminalProcessExtHostProxy.ts
+4
-4
未找到文件。
src/vs/workbench/api/browser/mainThreadTerminalService.ts
浏览文件 @
0927be89
...
...
@@ -326,7 +326,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
public
$sendResolvedLaunchConfig
(
terminalId
:
number
,
shellLaunchConfig
:
IShellLaunchConfig
):
void
{
const
instance
=
this
.
_terminalService
.
getInstanceFromId
(
terminalId
);
if
(
instance
)
{
this
.
_getTerminalProcess
(
terminalId
).
then
(
e
=>
e
.
emit
Override
ShellLaunchConfig
(
shellLaunchConfig
));
this
.
_getTerminalProcess
(
terminalId
).
then
(
e
=>
e
.
emit
Resolved
ShellLaunchConfig
(
shellLaunchConfig
));
}
}
...
...
src/vs/workbench/api/common/extHost.protocol.ts
浏览文件 @
0927be89
...
...
@@ -407,9 +407,9 @@ export interface MainThreadTerminalServiceShape extends IDisposable {
$sendProcessData
(
terminalId
:
number
,
data
:
string
):
void
;
$sendProcessReady
(
terminalId
:
number
,
pid
:
number
,
cwd
:
string
):
void
;
$sendProcessExit
(
terminalId
:
number
,
exitCode
:
number
):
void
;
$sendOverrideDimensions
(
terminalId
:
number
,
dimensions
:
ITerminalDimensions
|
undefined
):
void
;
$sendProcessInitialCwd
(
terminalId
:
number
,
cwd
:
string
):
void
;
$sendProcessCwd
(
terminalId
:
number
,
initialCwd
:
string
):
void
;
$sendOverrideDimensions
(
terminalId
:
number
,
dimensions
:
ITerminalDimensions
|
undefined
):
void
;
$sendResolvedLaunchConfig
(
terminalId
:
number
,
shellLaunchConfig
:
IShellLaunchConfig
):
void
;
// Renderer
...
...
src/vs/workbench/api/node/extHostTerminalService.ts
浏览文件 @
0927be89
...
...
@@ -319,7 +319,6 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
const
terminal
=
new
ExtHostTerminal
(
this
.
_proxy
,
name
);
terminal
.
create
(
shellPath
,
shellArgs
);
this
.
_terminals
.
push
(
terminal
);
return
terminal
;
}
...
...
src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
浏览文件 @
0927be89
...
...
@@ -968,7 +968,7 @@ export class TerminalInstance implements ITerminalInstance {
this
.
_processManager
.
onProcessExit
(
exitCode
=>
this
.
_onProcessExit
(
exitCode
));
this
.
_processManager
.
onProcessData
(
data
=>
this
.
_onData
.
fire
(
data
));
this
.
_processManager
.
onProcessOverrideDimensions
(
e
=>
this
.
setDimensions
(
e
));
this
.
_processManager
.
onProcess
OverrideShellLaunchConfig
(
e
=>
this
.
set
ShellLaunchConfig
(
e
));
this
.
_processManager
.
onProcess
ResolvedShellLaunchConfig
(
e
=>
this
.
_setResolved
ShellLaunchConfig
(
e
));
if
(
this
.
_shellLaunchConfig
.
name
)
{
this
.
setTitle
(
this
.
_shellLaunchConfig
.
name
,
false
);
...
...
@@ -1380,7 +1380,7 @@ export class TerminalInstance implements ITerminalInstance {
this
.
_resize
();
}
private
set
ShellLaunchConfig
(
shellLaunchConfig
:
IShellLaunchConfig
):
void
{
private
_setResolved
ShellLaunchConfig
(
shellLaunchConfig
:
IShellLaunchConfig
):
void
{
this
.
_shellLaunchConfig
.
args
=
shellLaunchConfig
.
args
;
this
.
_shellLaunchConfig
.
cwd
=
shellLaunchConfig
.
cwd
;
this
.
_shellLaunchConfig
.
executable
=
shellLaunchConfig
.
executable
;
...
...
src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
浏览文件 @
0927be89
...
...
@@ -71,7 +71,7 @@ export class TerminalProcessManager implements ITerminalProcessManager {
private
readonly
_onProcessOverrideDimensions
=
new
Emitter
<
ITerminalDimensions
|
undefined
>
();
public
get
onProcessOverrideDimensions
():
Event
<
ITerminalDimensions
|
undefined
>
{
return
this
.
_onProcessOverrideDimensions
.
event
;
}
private
readonly
_onProcessOverrideShellLaunchConfig
=
new
Emitter
<
IShellLaunchConfig
>
();
public
get
onProcess
Override
ShellLaunchConfig
():
Event
<
IShellLaunchConfig
>
{
return
this
.
_onProcessOverrideShellLaunchConfig
.
event
;
}
public
get
onProcess
Resolved
ShellLaunchConfig
():
Event
<
IShellLaunchConfig
>
{
return
this
.
_onProcessOverrideShellLaunchConfig
.
event
;
}
constructor
(
private
readonly
_terminalId
:
number
,
...
...
@@ -172,8 +172,8 @@ export class TerminalProcessManager implements ITerminalProcessManager {
if
(
this
.
_process
.
onProcessOverrideDimensions
)
{
this
.
_process
.
onProcessOverrideDimensions
(
e
=>
this
.
_onProcessOverrideDimensions
.
fire
(
e
));
}
if
(
this
.
_process
.
onProcess
OverrideShelll
aunchConfig
)
{
this
.
_process
.
onProcess
OverrideShelll
aunchConfig
(
e
=>
this
.
_onProcessOverrideShellLaunchConfig
.
fire
(
e
));
if
(
this
.
_process
.
onProcess
ResolvedShellL
aunchConfig
)
{
this
.
_process
.
onProcess
ResolvedShellL
aunchConfig
(
e
=>
this
.
_onProcessOverrideShellLaunchConfig
.
fire
(
e
));
}
setTimeout
(()
=>
{
...
...
src/vs/workbench/contrib/terminal/common/terminal.ts
浏览文件 @
0927be89
...
...
@@ -468,7 +468,7 @@ export interface ITerminalInstance {
/**
* The shell launch config used to launch the shell.
*/
shellLaunchConfig
:
IShellLaunchConfig
;
readonly
shellLaunchConfig
:
IShellLaunchConfig
;
/**
* Whether to disable layout for the terminal. This is useful when the size of the terminal is
...
...
@@ -709,7 +709,7 @@ export interface ITerminalProcessManager extends IDisposable {
readonly
onProcessTitle
:
Event
<
string
>
;
readonly
onProcessExit
:
Event
<
number
>
;
readonly
onProcessOverrideDimensions
:
Event
<
ITerminalDimensions
|
undefined
>
;
readonly
onProcess
Override
ShellLaunchConfig
:
Event
<
IShellLaunchConfig
>
;
readonly
onProcess
Resolved
ShellLaunchConfig
:
Event
<
IShellLaunchConfig
>
;
dispose
(
immediate
?:
boolean
):
void
;
createProcess
(
shellLaunchConfig
:
IShellLaunchConfig
,
cols
:
number
,
rows
:
number
,
isScreenReaderModeEnabled
:
boolean
):
Promise
<
void
>
;
...
...
@@ -748,7 +748,7 @@ export interface ITerminalProcessExtHostProxy extends IDisposable {
emitReady
(
pid
:
number
,
cwd
:
string
):
void
;
emitExit
(
exitCode
:
number
):
void
;
emitOverrideDimensions
(
dimensions
:
ITerminalDimensions
|
undefined
):
void
;
emit
Override
ShellLaunchConfig
(
shellLaunchConfig
:
IShellLaunchConfig
):
void
;
emit
Resolved
ShellLaunchConfig
(
shellLaunchConfig
:
IShellLaunchConfig
):
void
;
emitInitialCwd
(
initialCwd
:
string
):
void
;
emitCwd
(
cwd
:
string
):
void
;
emitLatency
(
latency
:
number
):
void
;
...
...
@@ -804,7 +804,7 @@ export interface ITerminalChildProcess {
onProcessReady
:
Event
<
{
pid
:
number
,
cwd
:
string
}
>
;
onProcessTitleChanged
:
Event
<
string
>
;
onProcessOverrideDimensions
?:
Event
<
ITerminalDimensions
|
undefined
>
;
onProcess
OverrideShelll
aunchConfig
?:
Event
<
IShellLaunchConfig
>
;
onProcess
ResolvedShellL
aunchConfig
?:
Event
<
IShellLaunchConfig
>
;
/**
* Shutdown the terminal process.
...
...
src/vs/workbench/contrib/terminal/common/terminalProcessExtHostProxy.ts
浏览文件 @
0927be89
...
...
@@ -24,8 +24,8 @@ export class TerminalProcessExtHostProxy extends Disposable implements ITerminal
public
readonly
onProcessTitleChanged
:
Event
<
string
>
=
this
.
_onProcessTitleChanged
.
event
;
private
readonly
_onProcessOverrideDimensions
=
new
Emitter
<
ITerminalDimensions
|
undefined
>
();
public
get
onProcessOverrideDimensions
():
Event
<
ITerminalDimensions
|
undefined
>
{
return
this
.
_onProcessOverrideDimensions
.
event
;
}
private
readonly
_onProcess
Override
ShellLaunchConfig
=
new
Emitter
<
IShellLaunchConfig
>
();
public
get
onProcess
OverrideShelllaunchConfig
():
Event
<
IShellLaunchConfig
>
{
return
this
.
_onProcessOverride
ShellLaunchConfig
.
event
;
}
private
readonly
_onProcess
Resolved
ShellLaunchConfig
=
new
Emitter
<
IShellLaunchConfig
>
();
public
get
onProcess
ResolvedShellLaunchConfig
():
Event
<
IShellLaunchConfig
>
{
return
this
.
_onProcessResolved
ShellLaunchConfig
.
event
;
}
private
readonly
_onInput
=
this
.
_register
(
new
Emitter
<
string
>
());
public
readonly
onInput
:
Event
<
string
>
=
this
.
_onInput
.
event
;
...
...
@@ -95,8 +95,8 @@ export class TerminalProcessExtHostProxy extends Disposable implements ITerminal
this
.
_onProcessOverrideDimensions
.
fire
(
dimensions
);
}
public
emit
Override
ShellLaunchConfig
(
shellLaunchConfig
:
IShellLaunchConfig
):
void
{
this
.
_onProcess
Override
ShellLaunchConfig
.
fire
(
shellLaunchConfig
);
public
emit
Resolved
ShellLaunchConfig
(
shellLaunchConfig
:
IShellLaunchConfig
):
void
{
this
.
_onProcess
Resolved
ShellLaunchConfig
.
fire
(
shellLaunchConfig
);
}
public
emitInitialCwd
(
initialCwd
:
string
):
void
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录