Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
f411f667
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,体验更适合开发者的 AI 搜索 >>
提交
f411f667
编写于
8月 16, 2019
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Scope new variable to a string
上级
db836839
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
8 addition
and
8 deletion
+8
-8
src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
.../workbench/contrib/terminal/common/terminalEnvironment.ts
+8
-8
未找到文件。
src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
浏览文件 @
f411f667
...
...
@@ -208,33 +208,33 @@ export function getDefaultShell(
if
(
!
maybeExecutable
)
{
maybeExecutable
=
getShellSetting
(
fetchSetting
,
isWorkspaceShellAllowed
,
'
shell
'
,
platformOverride
);
}
maybeExecutable
=
maybeExecutable
||
defaultShell
;
let
executable
:
string
=
maybeExecutable
||
defaultShell
;
// Change Sysnative to System32 if the OS is Windows but NOT WoW64. It's
// safe to assume that this was used by accident as Sysnative does not
// exist and will break the terminal in non-WoW64 environments.
if
((
platformOverride
===
platform
.
Platform
.
Windows
)
&&
!
isWoW64
&&
windir
)
{
const
sysnativePath
=
path
.
join
(
windir
,
'
Sysnative
'
).
replace
(
/
\/
/g
,
'
\\
'
).
toLowerCase
();
if
(
maybeExecutable
&&
maybeE
xecutable
.
toLowerCase
().
indexOf
(
sysnativePath
)
===
0
)
{
maybeExecutable
=
path
.
join
(
windir
,
'
System32
'
,
maybeE
xecutable
.
substr
(
sysnativePath
.
length
+
1
));
if
(
executable
&&
e
xecutable
.
toLowerCase
().
indexOf
(
sysnativePath
)
===
0
)
{
executable
=
path
.
join
(
windir
,
'
System32
'
,
e
xecutable
.
substr
(
sysnativePath
.
length
+
1
));
}
}
// Convert / to \ on Windows for convenience
if
(
maybeE
xecutable
&&
platformOverride
===
platform
.
Platform
.
Windows
)
{
maybeExecutable
=
maybeE
xecutable
.
replace
(
/
\/
/g
,
'
\\
'
);
if
(
e
xecutable
&&
platformOverride
===
platform
.
Platform
.
Windows
)
{
executable
=
e
xecutable
.
replace
(
/
\/
/g
,
'
\\
'
);
}
if
(
configurationResolverService
)
{
try
{
maybeExecutable
=
configurationResolverService
.
resolve
(
lastActiveWorkspace
,
maybeE
xecutable
);
executable
=
configurationResolverService
.
resolve
(
lastActiveWorkspace
,
e
xecutable
);
}
catch
(
e
)
{
logService
.
error
(
`Could not resolve shell`
,
e
);
maybeExecutable
=
maybeE
xecutable
;
executable
=
e
xecutable
;
}
}
return
maybeE
xecutable
;
return
e
xecutable
;
}
export
function
getDefaultShellArgs
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录