Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
9bc292a2
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,发现更多精彩内容 >>
提交
9bc292a2
编写于
10月 29, 2019
作者:
A
Alex Ross
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix findExecutable to check that the path is not a dir
Fixes #83509
上级
62b627ac
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
6 deletion
+22
-6
src/vs/base/node/processes.ts
src/vs/base/node/processes.ts
+11
-3
src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
+11
-3
未找到文件。
src/vs/base/node/processes.ts
浏览文件 @
9bc292a2
...
...
@@ -454,6 +454,14 @@ export namespace win32 {
if
(
paths
===
undefined
||
paths
.
length
===
0
)
{
return
path
.
join
(
cwd
,
command
);
}
async
function
fileExists
(
path
:
string
):
Promise
<
boolean
>
{
if
(
await
promisify
(
fs
.
exists
)(
path
))
{
return
!
((
await
promisify
(
fs
.
stat
)(
path
)).
isDirectory
);
}
return
false
;
}
// We have a simple file name. We get the path variable from the env
// and try to find the executable on the path.
for
(
let
pathEntry
of
paths
)
{
...
...
@@ -464,15 +472,15 @@ export namespace win32 {
}
else
{
fullPath
=
path
.
join
(
cwd
,
pathEntry
,
command
);
}
if
(
await
promisify
(
fs
.
exists
)
(
fullPath
))
{
if
(
await
fileExists
(
fullPath
))
{
return
fullPath
;
}
let
withExtension
=
fullPath
+
'
.com
'
;
if
(
await
promisify
(
fs
.
exists
)
(
withExtension
))
{
if
(
await
fileExists
(
withExtension
))
{
return
withExtension
;
}
withExtension
=
fullPath
+
'
.exe
'
;
if
(
await
promisify
(
fs
.
exists
)
(
withExtension
))
{
if
(
await
fileExists
(
withExtension
))
{
return
withExtension
;
}
}
...
...
src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
浏览文件 @
9bc292a2
...
...
@@ -1420,6 +1420,14 @@ export class TerminalTaskSystem implements ITaskSystem {
}
}
private
async
fileExists
(
path
:
string
):
Promise
<
boolean
>
{
const
uri
:
URI
=
resources
.
toLocalResource
(
URI
.
from
({
scheme
:
Schemas
.
file
,
path
:
path
}),
this
.
environmentService
.
configuration
.
remoteAuthority
);
if
(
await
this
.
fileService
.
exists
(
uri
))
{
return
!
((
await
this
.
fileService
.
resolve
(
uri
)).
isDirectory
);
}
return
false
;
}
private
async
findExecutable
(
command
:
string
,
cwd
?:
string
,
paths
?:
string
[]):
Promise
<
string
>
{
// If we have an absolute path then we take it.
if
(
path
.
isAbsolute
(
command
))
{
...
...
@@ -1452,15 +1460,15 @@ export class TerminalTaskSystem implements ITaskSystem {
fullPath
=
path
.
join
(
cwd
,
pathEntry
,
command
);
}
if
(
await
this
.
file
Service
.
exists
(
resources
.
toLocalResource
(
URI
.
from
({
scheme
:
Schemas
.
file
,
path
:
fullPath
}),
this
.
environmentService
.
configuration
.
remoteAuthority
)
))
{
if
(
await
this
.
file
Exists
(
fullPath
))
{
return
fullPath
;
}
let
withExtension
=
fullPath
+
'
.com
'
;
if
(
await
this
.
file
Service
.
exists
(
resources
.
toLocalResource
(
URI
.
from
({
scheme
:
Schemas
.
file
,
path
:
withExtension
}),
this
.
environmentService
.
configuration
.
remoteAuthority
)
))
{
if
(
await
this
.
file
Exists
(
withExtension
))
{
return
withExtension
;
}
withExtension
=
fullPath
+
'
.exe
'
;
if
(
await
this
.
file
Service
.
exists
(
resources
.
toLocalResource
(
URI
.
from
({
scheme
:
Schemas
.
file
,
path
:
withExtension
}),
this
.
environmentService
.
configuration
.
remoteAuthority
)
))
{
if
(
await
this
.
file
Exists
(
withExtension
))
{
return
withExtension
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录