Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
509f4b38
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,发现更多精彩内容 >>
提交
509f4b38
编写于
7月 19, 2017
作者:
T
t-amqi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Reduce dependencies
上级
d8f2e3d0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
10 deletion
+12
-10
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
...bench/parts/terminal/electron-browser/terminalInstance.ts
+6
-2
src/vs/workbench/parts/terminal/electron-browser/windowsShellHelper.ts
...nch/parts/terminal/electron-browser/windowsShellHelper.ts
+6
-8
未找到文件。
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
浏览文件 @
509f4b38
...
...
@@ -141,7 +141,9 @@ export class TerminalInstance implements ITerminalInstance {
this
.
_createXterm
();
if
(
platform
.
isWindows
)
{
this
.
_windowsShellHelper
=
new
WindowsShellHelper
(
this
,
this
.
_shellLaunchConfig
.
executable
);
this
.
_processReady
.
then
(()
=>
{
this
.
_windowsShellHelper
=
new
WindowsShellHelper
(
this
.
_processId
,
this
.
_shellLaunchConfig
.
executable
);
});
}
// Only attach xterm.js to the DOM if the terminal panel has been opened before.
...
...
@@ -272,7 +274,9 @@ export class TerminalInstance implements ITerminalInstance {
}
if
(
platform
.
isWindows
&&
event
.
keyCode
===
13
/* ENTER */
&&
!
this
.
_messageTitleListener
)
{
this
.
_windowsShellHelper
.
updateShellName
();
this
.
_windowsShellHelper
.
updateShellName
().
then
(
result
=>
{
this
.
_title
=
result
;
});
}
return
undefined
;
...
...
src/vs/workbench/parts/terminal/electron-browser/windowsShellHelper.ts
浏览文件 @
509f4b38
...
...
@@ -6,7 +6,6 @@
import
*
as
cp
from
'
child_process
'
;
import
*
as
platform
from
'
vs/base/common/platform
'
;
import
*
as
path
from
'
path
'
;
import
{
ITerminalInstance
}
from
'
vs/workbench/parts/terminal/common/terminal
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
Emitter
,
debounceEvent
}
from
'
vs/base/common/event
'
;
...
...
@@ -16,12 +15,11 @@ const WAIT_AFTER_ENTER_TIME = 100;
export
class
WindowsShellHelper
{
private
_childProcessIdStack
:
number
[];
private
_onCheckWindowsShell
:
Emitter
<
string
>
;
private
_terminalInstance
:
ITerminalInstance
;
private
_rootShellExecutable
:
string
;
private
_processId
:
number
;
public
constructor
(
terminal
:
ITerminalInstance
,
rootShellName
:
string
)
{
public
constructor
(
pid
:
number
,
rootShellName
:
string
)
{
this
.
_childProcessIdStack
=
[];
this
.
_terminalInstance
=
terminal
;
this
.
_rootShellExecutable
=
rootShellName
;
if
(
!
platform
.
isWindows
)
{
throw
new
Error
(
`WindowsShellHelper cannot be instantiated on
${
platform
.
platform
}
`
);
...
...
@@ -88,13 +86,13 @@ export class WindowsShellHelper {
});
}
public
updateShellName
():
void
{
this
.
getShellName
(
this
.
_terminalInstance
.
processId
,
this
.
_rootShellExecutable
).
then
(
result
=>
{
public
updateShellName
():
TPromise
<
string
>
{
return
this
.
getShellName
(
this
.
_
processId
,
this
.
_rootShellExecutable
).
then
(
result
=>
{
if
(
result
)
{
console
.
log
(
result
);
const
fullPathName
=
result
.
split
(
'
.exe
'
)[
0
];
this
.
_terminalInstance
.
setTitle
(
path
.
basename
(
fullPathName
)
);
return
path
.
basename
(
fullPathName
);
}
return
this
.
_rootShellExecutable
;
});
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录