Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
12afb8de
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,发现更多精彩内容 >>
提交
12afb8de
编写于
6月 19, 2019
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Get workspace shell permissions correctly
上级
994bfe2d
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
9 addition
and
4 deletion
+9
-4
src/vs/workbench/contrib/terminal/electron-browser/terminalInstanceService.ts
...trib/terminal/electron-browser/terminalInstanceService.ts
+9
-4
未找到文件。
src/vs/workbench/contrib/terminal/electron-browser/terminalInstanceService.ts
浏览文件 @
12afb8de
...
...
@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import
{
ITerminalInstanceService
}
from
'
vs/workbench/contrib/terminal/browser/terminal
'
;
import
{
ITerminalInstance
,
IWindowsShellHelper
,
IShellLaunchConfig
,
ITerminalChildProcess
,
ITerminalConfigHelper
}
from
'
vs/workbench/contrib/terminal/common/terminal
'
;
import
{
ITerminalInstance
,
IWindowsShellHelper
,
IShellLaunchConfig
,
ITerminalChildProcess
,
ITerminalConfigHelper
,
IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY
}
from
'
vs/workbench/contrib/terminal/common/terminal
'
;
import
{
WindowsShellHelper
}
from
'
vs/workbench/contrib/terminal/node/windowsShellHelper
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IProcessEnvironment
,
Platform
,
isLinux
,
isMacintosh
,
isWindows
,
OperatingSystem
,
platform
}
from
'
vs/base/common/platform
'
;
...
...
@@ -17,6 +17,7 @@ import { readFile } from 'vs/base/node/pfs';
import
{
basename
}
from
'
vs/base/common/path
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
mergeDefaultShellPathAndArgs
,
getDefaultShell
,
getDefaultShellArgs
}
from
'
vs/workbench/contrib/terminal/common/terminalEnvironment
'
;
import
{
StorageScope
,
IStorageService
}
from
'
vs/platform/storage/common/storage
'
;
let
Terminal
:
typeof
XTermTerminal
;
let
WebLinksAddon
:
typeof
XTermWebLinksAddon
;
...
...
@@ -29,7 +30,8 @@ export class TerminalInstanceService implements ITerminalInstanceService {
constructor
(
@
IInstantiationService
private
readonly
_instantiationService
:
IInstantiationService
,
@
IConfigurationService
private
readonly
_configurationService
:
IConfigurationService
@
IConfigurationService
private
readonly
_configurationService
:
IConfigurationService
,
@
IStorageService
private
readonly
_storageService
:
IStorageService
)
{
}
...
...
@@ -62,6 +64,10 @@ export class TerminalInstanceService implements ITerminalInstanceService {
return
this
.
_instantiationService
.
createInstance
(
TerminalProcess
,
shellLaunchConfig
,
cwd
,
cols
,
rows
,
env
,
windowsEnableConpty
);
}
private
_isWorkspaceShellAllowed
():
boolean
{
return
this
.
_storageService
.
getBoolean
(
IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY
,
StorageScope
.
WORKSPACE
,
false
);
}
public
mergeDefaultShellPathAndArgs
(
shell
:
IShellLaunchConfig
,
defaultShell
:
string
,
configHelper
:
ITerminalConfigHelper
,
platformOverride
:
Platform
=
platform
):
void
{
const
isWorkspaceShellAllowed
=
configHelper
.
checkWorkspaceShellPermissions
(
platformOverride
===
Platform
.
Windows
?
OperatingSystem
.
Windows
:
(
platformOverride
===
Platform
.
Mac
?
OperatingSystem
.
Macintosh
:
OperatingSystem
.
Linux
));
mergeDefaultShellPathAndArgs
(
...
...
@@ -76,8 +82,7 @@ export class TerminalInstanceService implements ITerminalInstanceService {
}
public
getDefaultShellAndArgs
():
Promise
<
{
shell
:
string
,
args
:
string
[]
|
string
|
undefined
}
>
{
// TODO: Pull the workspace shell permissions setting
const
isWorkspaceShellAllowed
=
false
;
// configHelper.checkWorkspaceShellPermissions(platform);
const
isWorkspaceShellAllowed
=
this
.
_isWorkspaceShellAllowed
();
const
shell
=
getDefaultShell
(
(
key
)
=>
this
.
_configurationService
.
inspect
(
key
),
isWorkspaceShellAllowed
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录