Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
f3086a6e
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,发现更多精彩内容 >>
提交
f3086a6e
编写于
6月 05, 2019
作者:
A
Alex Ross
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove sync fs use in tasks
Fixes #70577
上级
19b4a018
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
7 deletion
+8
-7
src/vs/base/node/processes.ts
src/vs/base/node/processes.ts
+5
-4
src/vs/workbench/api/node/extHostTask.ts
src/vs/workbench/api/node/extHostTask.ts
+1
-1
src/vs/workbench/contrib/tasks/electron-browser/terminalTaskSystem.ts
...ench/contrib/tasks/electron-browser/terminalTaskSystem.ts
+2
-2
未找到文件。
src/vs/base/node/processes.ts
浏览文件 @
f3086a6e
...
...
@@ -5,6 +5,7 @@
import
*
as
path
from
'
vs/base/common/path
'
;
import
*
as
fs
from
'
fs
'
;
import
{
promisify
}
from
'
util
'
;
import
*
as
cp
from
'
child_process
'
;
import
*
as
nls
from
'
vs/nls
'
;
import
*
as
Types
from
'
vs/base/common/types
'
;
...
...
@@ -404,7 +405,7 @@ export function createQueuedSender(childProcess: cp.ChildProcess): IQueuedSender
}
export
namespace
win32
{
export
function
findExecutable
(
command
:
string
,
cwd
?:
string
,
paths
?:
string
[]):
string
{
export
async
function
findExecutable
(
command
:
string
,
cwd
?:
string
,
paths
?:
string
[]):
Promise
<
string
>
{
// If we have an absolute path then we take it.
if
(
path
.
isAbsolute
(
command
))
{
return
command
;
...
...
@@ -435,15 +436,15 @@ export namespace win32 {
}
else
{
fullPath
=
path
.
join
(
cwd
,
pathEntry
,
command
);
}
if
(
fs
.
existsSync
(
fullPath
))
{
if
(
await
promisify
(
fs
.
exists
)
(
fullPath
))
{
return
fullPath
;
}
let
withExtension
=
fullPath
+
'
.com
'
;
if
(
fs
.
existsSync
(
withExtension
))
{
if
(
await
promisify
(
fs
.
exists
)
(
withExtension
))
{
return
withExtension
;
}
withExtension
=
fullPath
+
'
.exe
'
;
if
(
fs
.
existsSync
(
withExtension
))
{
if
(
await
promisify
(
fs
.
exists
)
(
withExtension
))
{
return
withExtension
;
}
}
...
...
src/vs/workbench/api/node/extHostTask.ts
浏览文件 @
f3086a6e
...
...
@@ -712,7 +712,7 @@ export class ExtHostTask implements ExtHostTaskShape {
paths
[
i
]
=
resolver
.
resolve
(
ws
,
paths
[
i
]);
}
}
result
.
process
=
win32
.
findExecutable
(
result
.
process
=
await
win32
.
findExecutable
(
resolver
.
resolve
(
ws
,
toResolve
.
process
.
name
),
toResolve
.
process
.
cwd
!==
undefined
?
resolver
.
resolve
(
ws
,
toResolve
.
process
.
cwd
)
:
undefined
,
paths
...
...
src/vs/workbench/contrib/tasks/electron-browser/terminalTaskSystem.ts
浏览文件 @
f3086a6e
...
...
@@ -429,12 +429,12 @@ export class TerminalTaskSystem implements ITaskSystem {
variables
.
forEach
(
variable
=>
variablesArray
.
push
(
variable
));
return
new
Promise
((
resolve
,
reject
)
=>
{
this
.
configurationResolverService
.
resolveWithInteraction
(
workspaceFolder
,
variablesArray
,
'
tasks
'
).
then
(
resolvedVariablesMap
=>
{
this
.
configurationResolverService
.
resolveWithInteraction
(
workspaceFolder
,
variablesArray
,
'
tasks
'
).
then
(
async
resolvedVariablesMap
=>
{
if
(
resolvedVariablesMap
)
{
if
(
isProcess
)
{
let
processVarValue
:
string
;
if
(
Platform
.
isWindows
)
{
processVarValue
=
win32
.
findExecutable
(
processVarValue
=
await
win32
.
findExecutable
(
this
.
configurationResolverService
.
resolve
(
workspaceFolder
,
CommandString
.
value
(
task
.
command
.
name
!
)),
cwd
?
this
.
configurationResolverService
.
resolve
(
workspaceFolder
,
cwd
)
:
undefined
,
envPath
?
envPath
.
split
(
path
.
delimiter
).
map
(
p
=>
this
.
configurationResolverService
.
resolve
(
workspaceFolder
,
p
))
:
undefined
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录