Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
5e2f9635
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
5e2f9635
编写于
9月 10, 2021
作者:
M
Megan Rogge
提交者:
GitHub
9月 10, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix keys used to resolve terminal settings (#132868)
Co-authored-by:
N
IllusionMH
<
illusionmh@gmail.com
>
上级
20e76480
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
6 deletion
+6
-6
src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts
...ontrib/terminal/browser/terminalProfileResolverService.ts
+4
-4
src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
.../workbench/contrib/terminal/common/terminalEnvironment.ts
+2
-2
未找到文件。
src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts
浏览文件 @
5e2f9635
...
...
@@ -209,7 +209,7 @@ export abstract class BaseTerminalProfileResolverService implements ITerminalPro
}
private
_getUnresolvedRealDefaultProfile
(
os
:
OperatingSystem
):
ITerminalProfile
|
undefined
{
const
defaultProfileName
=
this
.
_configurationService
.
getValue
(
`
${
TerminalSettingPrefix
.
DefaultProfile
}
.
${
this
.
_getOsKey
(
os
)}
`
);
const
defaultProfileName
=
this
.
_configurationService
.
getValue
(
`
${
TerminalSettingPrefix
.
DefaultProfile
}${
this
.
_getOsKey
(
os
)}
`
);
if
(
defaultProfileName
&&
typeof
defaultProfileName
===
'
string
'
)
{
return
this
.
_terminalService
.
availableProfiles
.
find
(
e
=>
e
.
profileName
===
defaultProfileName
);
}
...
...
@@ -217,9 +217,9 @@ export abstract class BaseTerminalProfileResolverService implements ITerminalPro
}
private
async
_getUnresolvedShellSettingDefaultProfile
(
options
:
IShellLaunchConfigResolveOptions
):
Promise
<
ITerminalProfile
|
undefined
>
{
let
executable
=
this
.
_configurationService
.
getValue
<
string
>
(
`
${
TerminalSettingPrefix
.
Shell
}
.
${
this
.
_getOsKey
(
options
.
os
)}
`
);
let
executable
=
this
.
_configurationService
.
getValue
<
string
>
(
`
${
TerminalSettingPrefix
.
Shell
}${
this
.
_getOsKey
(
options
.
os
)}
`
);
if
(
!
this
.
_isValidShell
(
executable
))
{
const
shellArgs
=
this
.
_configurationService
.
inspect
(
`
${
TerminalSettingPrefix
.
ShellArgs
}
.
${
this
.
_getOsKey
(
options
.
os
)}
`
);
const
shellArgs
=
this
.
_configurationService
.
inspect
(
`
${
TerminalSettingPrefix
.
ShellArgs
}${
this
.
_getOsKey
(
options
.
os
)}
`
);
// && !this.getSafeConfigValue('shellArgs', options.os, false)) {
if
(
!
shellArgs
.
userValue
&&
!
shellArgs
.
workspaceValue
)
{
return
undefined
;
...
...
@@ -231,7 +231,7 @@ export abstract class BaseTerminalProfileResolverService implements ITerminalPro
}
let
args
:
string
|
string
[]
|
undefined
;
const
shellArgsSetting
=
this
.
_configurationService
.
getValue
(
`
${
TerminalSettingPrefix
.
ShellArgs
}
.
${
this
.
_getOsKey
(
options
.
os
)}
`
);
const
shellArgsSetting
=
this
.
_configurationService
.
getValue
(
`
${
TerminalSettingPrefix
.
ShellArgs
}${
this
.
_getOsKey
(
options
.
os
)}
`
);
if
(
this
.
_isValidShellArgs
(
shellArgsSetting
,
options
.
os
))
{
args
=
shellArgsSetting
;
}
...
...
src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
浏览文件 @
5e2f9635
...
...
@@ -326,7 +326,7 @@ export function getDefaultShellArgs(
}
const
platformKey
=
platformOverride
===
Platform
.
Windows
?
'
windows
'
:
platformOverride
===
Platform
.
Mac
?
'
osx
'
:
'
linux
'
;
let
args
=
fetchSetting
(
<
TerminalShellArgsSetting
>
`
${
TerminalSettingPrefix
.
ShellArgs
}
.
${
platformKey
}
`
);
let
args
=
fetchSetting
(
<
TerminalShellArgsSetting
>
`
${
TerminalSettingPrefix
.
ShellArgs
}${
platformKey
}
`
);
if
(
!
args
)
{
return
[];
}
...
...
@@ -339,7 +339,7 @@ export function getDefaultShellArgs(
try
{
resolvedArgs
.
push
(
variableResolver
(
arg
));
}
catch
(
e
)
{
logService
.
error
(
`Could not resolve
${
TerminalSettingPrefix
.
ShellArgs
}
.
${
platformKey
}
`
,
e
);
logService
.
error
(
`Could not resolve
${
TerminalSettingPrefix
.
ShellArgs
}${
platformKey
}
`
,
e
);
resolvedArgs
.
push
(
arg
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录