Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
7da67914
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,发现更多精彩内容 >>
提交
7da67914
编写于
4月 14, 2018
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Give cols/rows to createProcess
上级
ade7f5e8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
10 addition
and
8 deletion
+10
-8
src/vs/workbench/parts/terminal/common/terminal.ts
src/vs/workbench/parts/terminal/common/terminal.ts
+1
-1
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
...bench/parts/terminal/electron-browser/terminalInstance.ts
+3
-3
src/vs/workbench/parts/terminal/electron-browser/terminalProcessManager.ts
...parts/terminal/electron-browser/terminalProcessManager.ts
+6
-4
未找到文件。
src/vs/workbench/parts/terminal/common/terminal.ts
浏览文件 @
7da67914
...
...
@@ -473,7 +473,7 @@ export interface ITerminalProcessManager extends IDisposable {
initialCwd
:
string
;
addDisposable
(
disposable
:
IDisposable
);
createProcess
(
shellLaunchConfig
:
IShellLaunchConfig
);
createProcess
(
shellLaunchConfig
:
IShellLaunchConfig
,
cols
:
number
,
rows
:
number
);
write
(
data
:
string
):
void
;
}
...
...
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
浏览文件 @
7da67914
...
...
@@ -434,7 +434,7 @@ export class TerminalInstance implements ITerminalInstance {
}
}
get
selection
():
string
|
undefined
{
public
get
selection
():
string
|
undefined
{
return
this
.
hasSelection
()
?
this
.
_xterm
.
getSelection
()
:
undefined
;
}
...
...
@@ -591,9 +591,9 @@ export class TerminalInstance implements ITerminalInstance {
protected
_createProcess
():
void
{
// TODO: This should be injected in to the terminal instance (from service?)
this
.
_processManager
=
this
.
_instantiationService
.
createInstance
(
TerminalProcessManager
,
this
.
_configHelper
,
this
.
_cols
,
this
.
_rows
);
this
.
_processManager
=
this
.
_instantiationService
.
createInstance
(
TerminalProcessManager
,
this
.
_configHelper
);
this
.
_processManager
.
onShellProcessIdReady
(()
=>
this
.
_onProcessIdReady
.
fire
(
this
));
this
.
_processManager
.
createProcess
(
this
.
_shellLaunchConfig
);
this
.
_processManager
.
createProcess
(
this
.
_shellLaunchConfig
,
this
.
_cols
,
this
.
_rows
);
if
(
this
.
_shellLaunchConfig
.
name
)
{
this
.
setTitle
(
this
.
_shellLaunchConfig
.
name
,
false
);
...
...
src/vs/workbench/parts/terminal/electron-browser/terminalProcessManager.ts
浏览文件 @
7da67914
...
...
@@ -45,8 +45,6 @@ export class TerminalProcessManager implements ITerminalProcessManager {
constructor
(
private
_configHelper
:
ITerminalConfigHelper
,
private
_cols
:
number
,
private
_rows
:
number
,
@
IWorkspaceContextService
private
readonly
_workspaceContextService
:
IWorkspaceContextService
,
@
IHistoryService
private
readonly
_historyService
:
IHistoryService
,
@
IConfigurationResolverService
private
readonly
_configurationResolverService
:
IConfigurationResolverService
,
...
...
@@ -63,7 +61,11 @@ export class TerminalProcessManager implements ITerminalProcessManager {
this
.
_disposables
.
push
(
disposable
);
}
public
createProcess
(
shellLaunchConfig
:
IShellLaunchConfig
):
void
{
public
createProcess
(
shellLaunchConfig
:
IShellLaunchConfig
,
cols
:
number
,
rows
:
number
):
void
{
this
.
ptyProcessReady
=
new
TPromise
<
void
>
(
c
=>
{
this
.
onShellProcessIdReady
(()
=>
{
this
.
_logService
.
debug
(
`Terminal process ready (shellProcessId:
${
this
.
shellProcessId
}
)`
);
...
...
@@ -92,7 +94,7 @@ export class TerminalProcessManager implements ITerminalProcessManager {
// Continue env initialization, merging in the env from the launch
// config and adding keys that are needed to create the process
const
env
=
TerminalProcessManager
.
createTerminalEnv
(
parentEnv
,
shellLaunchConfig
,
this
.
initialCwd
,
locale
,
this
.
_cols
,
this
.
_
rows
);
const
env
=
TerminalProcessManager
.
createTerminalEnv
(
parentEnv
,
shellLaunchConfig
,
this
.
initialCwd
,
locale
,
cols
,
rows
);
const
cwd
=
Uri
.
parse
(
path
.
dirname
(
require
.
toUrl
(
'
../node/terminalProcess
'
))).
fsPath
;
const
options
=
{
env
,
cwd
};
this
.
_logService
.
debug
(
`Terminal process launching`
,
options
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录