Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
e1d8493f
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,发现更多精彩内容 >>
提交
e1d8493f
编写于
1月 11, 2019
作者:
G
Gabriel DeBacker
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Implement creating a razzle terminal with approved API changes
上级
14ce5183
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
53 addition
and
25 deletion
+53
-25
src/vs/vscode.d.ts
src/vs/vscode.d.ts
+10
-0
src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts
...rkbench/api/electron-browser/mainThreadTerminalService.ts
+3
-2
src/vs/workbench/api/node/extHost.protocol.ts
src/vs/workbench/api/node/extHost.protocol.ts
+1
-1
src/vs/workbench/api/node/extHostTerminalService.ts
src/vs/workbench/api/node/extHostTerminalService.ts
+4
-3
src/vs/workbench/parts/terminal/common/terminal.ts
src/vs/workbench/parts/terminal/common/terminal.ts
+8
-0
src/vs/workbench/parts/terminal/electron-browser/terminalProcessManager.ts
...parts/terminal/electron-browser/terminalProcessManager.ts
+27
-19
未找到文件。
src/vs/vscode.d.ts
浏览文件 @
e1d8493f
...
...
@@ -6843,6 +6843,16 @@ declare module 'vscode' {
* Object with environment variables that will be added to the VS Code process.
*/
env
?:
{
[
key
:
string
]:
string
|
null
};
/**
* Whether the terminal process environment should be exactly as provided in
* `TerminalOptions.env`. When this is false (default), the environment will be based on the
* window's environment and also apply configured platform settings like
* `terminal.integrated.windows.env` on top.
* When this is true, the complete environment must be provided as nothing will be inherited from the process
* or any configuration.
*/
strictEnv
?:
boolean
;
}
/**
...
...
src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts
浏览文件 @
e1d8493f
...
...
@@ -55,7 +55,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
// when the extension host process goes down ?
}
public
$createTerminal
(
name
?:
string
,
shellPath
?:
string
,
shellArgs
?:
string
[],
cwd
?:
string
,
env
?:
{
[
key
:
string
]:
string
},
waitOnExit
?:
boolean
):
Promise
<
{
id
:
number
,
name
:
string
}
>
{
public
$createTerminal
(
name
?:
string
,
shellPath
?:
string
,
shellArgs
?:
string
[],
cwd
?:
string
,
env
?:
{
[
key
:
string
]:
string
},
waitOnExit
?:
boolean
,
strictEnv
?:
boolean
):
Promise
<
{
id
:
number
,
name
:
string
}
>
{
const
shellLaunchConfig
:
IShellLaunchConfig
=
{
name
,
executable
:
shellPath
,
...
...
@@ -63,7 +63,8 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
cwd
,
waitOnExit
,
ignoreConfigurationCwd
:
true
,
env
env
,
strictEnv
};
const
terminal
=
this
.
terminalService
.
createTerminal
(
shellLaunchConfig
);
return
Promise
.
resolve
({
...
...
src/vs/workbench/api/node/extHost.protocol.ts
浏览文件 @
e1d8493f
...
...
@@ -344,7 +344,7 @@ export interface MainThreadProgressShape extends IDisposable {
}
export
interface
MainThreadTerminalServiceShape
extends
IDisposable
{
$createTerminal
(
name
?:
string
,
shellPath
?:
string
,
shellArgs
?:
string
[],
cwd
?:
string
|
URI
,
env
?:
{
[
key
:
string
]:
string
},
waitOnExit
?:
boolean
):
Promise
<
{
id
:
number
,
name
:
string
}
>
;
$createTerminal
(
name
?:
string
,
shellPath
?:
string
,
shellArgs
?:
string
[],
cwd
?:
string
|
URI
,
env
?:
{
[
key
:
string
]:
string
},
waitOnExit
?:
boolean
,
strictEnv
?:
boolean
):
Promise
<
{
id
:
number
,
name
:
string
}
>
;
$createTerminalRenderer
(
name
:
string
):
Promise
<
number
>
;
$dispose
(
terminalId
:
number
):
void
;
$hide
(
terminalId
:
number
):
void
;
...
...
src/vs/workbench/api/node/extHostTerminalService.ts
浏览文件 @
e1d8493f
...
...
@@ -104,9 +104,10 @@ export class ExtHostTerminal extends BaseExtHostTerminal implements vscode.Termi
shellArgs
?:
string
[],
cwd
?:
string
|
URI
,
env
?:
{
[
key
:
string
]:
string
},
waitOnExit
?:
boolean
waitOnExit
?:
boolean
,
strictEnv
?:
boolean
):
void
{
this
.
_proxy
.
$createTerminal
(
this
.
_name
,
shellPath
,
shellArgs
,
cwd
,
env
,
waitOnExit
).
then
(
terminal
=>
{
this
.
_proxy
.
$createTerminal
(
this
.
_name
,
shellPath
,
shellArgs
,
cwd
,
env
,
waitOnExit
,
strictEnv
).
then
(
terminal
=>
{
this
.
_name
=
terminal
.
name
;
this
.
_runQueuedRequests
(
terminal
.
id
);
});
...
...
@@ -269,7 +270,7 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
public
createTerminalFromOptions
(
options
:
vscode
.
TerminalOptions
):
vscode
.
Terminal
{
const
terminal
=
new
ExtHostTerminal
(
this
.
_proxy
,
options
.
name
);
terminal
.
create
(
options
.
shellPath
,
options
.
shellArgs
,
options
.
cwd
,
options
.
env
/*, options.waitOnExit*/
);
terminal
.
create
(
options
.
shellPath
,
options
.
shellArgs
,
options
.
cwd
,
options
.
env
,
/*options.waitOnExit*/
undefined
,
options
.
strictEnv
);
this
.
_terminals
.
push
(
terminal
);
return
terminal
;
}
...
...
src/vs/workbench/parts/terminal/common/terminal.ts
浏览文件 @
e1d8493f
...
...
@@ -181,6 +181,14 @@ export interface IShellLaunchConfig {
* extensions full control over the terminal.
*/
isRendererOnly
?:
boolean
;
/**
* Whether the terminal process environment should be exactly as provided in
* `TerminalOptions.env`. When this is false (default), the environment will be based on the
* window's environment and also apply configured platform settings like
* `terminal.integrated.windows.env` on top.
*/
strictEnv
?:
boolean
;
}
export
interface
ITerminalService
{
...
...
src/vs/workbench/parts/terminal/electron-browser/terminalProcessManager.ts
浏览文件 @
e1d8493f
...
...
@@ -111,26 +111,34 @@ export class TerminalProcessManager implements ITerminalProcessManager {
const
activeWorkspaceRootUri
=
this
.
_historyService
.
getLastActiveWorkspaceRoot
(
Schemas
.
file
);
this
.
initialCwd
=
terminalEnvironment
.
getCwd
(
shellLaunchConfig
,
activeWorkspaceRootUri
,
this
.
_configHelper
.
config
.
cwd
);
// Resolve env vars from config and shell
const
lastActiveWorkspaceRoot
=
activeWorkspaceRootUri
?
this
.
_workspaceContextService
.
getWorkspaceFolder
(
activeWorkspaceRootUri
)
:
null
;
const
platformKey
=
platform
.
isWindows
?
'
windows
'
:
(
platform
.
isMacintosh
?
'
osx
'
:
'
linux
'
);
const
envFromConfig
=
terminalEnvironment
.
resolveConfigurationVariables
(
this
.
_configurationResolverService
,
{
...
this
.
_configHelper
.
config
.
env
[
platformKey
]
},
lastActiveWorkspaceRoot
);
const
envFromShell
=
terminalEnvironment
.
resolveConfigurationVariables
(
this
.
_configurationResolverService
,
{
...
shellLaunchConfig
.
env
},
lastActiveWorkspaceRoot
);
shellLaunchConfig
.
env
=
envFromShell
;
// Compell type system as process.env should not have any undefined entries
const
env
:
platform
.
IProcessEnvironment
=
{
...
process
.
env
}
as
any
;
// Merge process env with the env from config and from shellLaunchConfig
terminalEnvironment
.
mergeEnvironments
(
env
,
envFromConfig
);
terminalEnvironment
.
mergeEnvironments
(
env
,
shellLaunchConfig
.
env
);
// Sanitize the environment, removing any undesirable VS Code and Electron environment
// variables
terminalEnvironment
.
sanitizeEnvironment
(
env
);
// Adding other env keys necessary to create the process
terminalEnvironment
.
addTerminalEnvironmentKeys
(
env
,
platform
.
locale
,
this
.
_configHelper
.
config
.
setLocaleVariables
);
let
env
:
platform
.
IProcessEnvironment
=
{};
// When this is true, the caller must provide the complete environment as nothing will be inherited from the process
// or any configuration.
if
(
shellLaunchConfig
.
strictEnv
)
{
env
=
{
...
shellLaunchConfig
.
env
}
as
any
;
}
else
{
// Merge process env with the env from config and from shellLaunchConfig
env
=
{
...
process
.
env
}
as
any
;
// Resolve env vars from config and shell
const
lastActiveWorkspaceRoot
=
activeWorkspaceRootUri
?
this
.
_workspaceContextService
.
getWorkspaceFolder
(
activeWorkspaceRootUri
)
:
null
;
const
platformKey
=
platform
.
isWindows
?
'
windows
'
:
(
platform
.
isMacintosh
?
'
osx
'
:
'
linux
'
);
const
envFromConfig
=
terminalEnvironment
.
resolveConfigurationVariables
(
this
.
_configurationResolverService
,
{
...
this
.
_configHelper
.
config
.
env
[
platformKey
]
},
lastActiveWorkspaceRoot
);
const
envFromShell
=
terminalEnvironment
.
resolveConfigurationVariables
(
this
.
_configurationResolverService
,
{
...
shellLaunchConfig
.
env
},
lastActiveWorkspaceRoot
);
shellLaunchConfig
.
env
=
envFromShell
;
terminalEnvironment
.
mergeEnvironments
(
env
,
envFromConfig
);
terminalEnvironment
.
mergeEnvironments
(
env
,
shellLaunchConfig
.
env
);
// Sanitize the environment, removing any undesirable VS Code and Electron environment
// variables
terminalEnvironment
.
sanitizeEnvironment
(
env
);
// Adding other env keys necessary to create the process
terminalEnvironment
.
addTerminalEnvironmentKeys
(
env
,
platform
.
locale
,
this
.
_configHelper
.
config
.
setLocaleVariables
);
}
this
.
_logService
.
debug
(
`Terminal process launching`
,
shellLaunchConfig
,
this
.
initialCwd
,
cols
,
rows
,
env
);
this
.
_process
=
new
TerminalProcess
(
shellLaunchConfig
,
this
.
initialCwd
,
cols
,
rows
,
env
,
this
.
_configHelper
.
config
.
windowsEnableConpty
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录