Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c7915785
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,发现更多精彩内容 >>
提交
c7915785
编写于
6月 14, 2019
作者:
A
Alex Ross
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove use of win32 from terminal task system
Part of #69113
上级
a5109d24
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
49 addition
and
2 deletion
+49
-2
src/vs/workbench/contrib/tasks/electron-browser/terminalTaskSystem.ts
...ench/contrib/tasks/electron-browser/terminalTaskSystem.ts
+49
-2
未找到文件。
src/vs/workbench/contrib/tasks/electron-browser/terminalTaskSystem.ts
浏览文件 @
c7915785
...
...
@@ -9,6 +9,7 @@ import * as Objects from 'vs/base/common/objects';
import
*
as
Types
from
'
vs/base/common/types
'
;
import
*
as
Platform
from
'
vs/base/common/platform
'
;
import
*
as
Async
from
'
vs/base/common/async
'
;
import
*
as
resources
from
'
vs/base/common/resources
'
;
import
{
IStringDictionary
,
values
}
from
'
vs/base/common/collections
'
;
import
{
LinkedMap
,
Touch
}
from
'
vs/base/common/map
'
;
import
Severity
from
'
vs/base/common/severity
'
;
...
...
@@ -16,7 +17,6 @@ import { Event, Emitter } from 'vs/base/common/event';
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
isUNC
}
from
'
vs/base/common/extpath
'
;
import
{
win32
}
from
'
vs/base/node/processes
'
;
import
{
IFileService
}
from
'
vs/platform/files/common/files
'
;
import
{
IMarkerService
,
MarkerSeverity
}
from
'
vs/platform/markers/common/markers
'
;
import
{
IWorkspaceContextService
,
WorkbenchState
,
IWorkspaceFolder
}
from
'
vs/platform/workspace/common/workspace
'
;
...
...
@@ -434,7 +434,7 @@ export class TerminalTaskSystem implements ITaskSystem {
if
(
isProcess
)
{
let
processVarValue
:
string
;
if
(
Platform
.
isWindows
)
{
processVarValue
=
await
win32
.
findExecutable
(
processVarValue
=
await
this
.
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
...
...
@@ -1362,4 +1362,51 @@ export class TerminalTaskSystem implements ITaskSystem {
outputChannel
.
append
(
output
);
}
}
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
))
{
return
command
;
}
if
(
cwd
===
undefined
)
{
cwd
=
process
.
cwd
();
}
const
dir
=
path
.
dirname
(
command
);
if
(
dir
!==
'
.
'
)
{
// We have a directory and the directory is relative (see above). Make the path absolute
// to the current working directory.
return
path
.
join
(
cwd
,
command
);
}
if
(
paths
===
undefined
&&
Types
.
isString
(
process
.
env
.
PATH
))
{
paths
=
process
.
env
.
PATH
.
split
(
path
.
delimiter
);
}
// No PATH environment. Make path absolute to the cwd.
if
(
paths
===
undefined
||
paths
.
length
===
0
)
{
return
path
.
join
(
cwd
,
command
);
}
// 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
)
{
// The path entry is absolute.
let
fullPath
:
string
;
if
(
path
.
isAbsolute
(
pathEntry
))
{
fullPath
=
path
.
join
(
pathEntry
,
command
);
}
else
{
fullPath
=
path
.
join
(
cwd
,
pathEntry
,
command
);
}
if
(
await
this
.
fileService
.
exists
(
resources
.
toLocalResource
(
URI
.
from
({
scheme
:
Schemas
.
file
,
path
:
fullPath
}),
this
.
environmentService
.
configuration
.
remoteAuthority
)))
{
return
fullPath
;
}
let
withExtension
=
fullPath
+
'
.com
'
;
if
(
await
this
.
fileService
.
exists
(
resources
.
toLocalResource
(
URI
.
from
({
scheme
:
Schemas
.
file
,
path
:
withExtension
}),
this
.
environmentService
.
configuration
.
remoteAuthority
)))
{
return
withExtension
;
}
withExtension
=
fullPath
+
'
.exe
'
;
if
(
await
this
.
fileService
.
exists
(
resources
.
toLocalResource
(
URI
.
from
({
scheme
:
Schemas
.
file
,
path
:
withExtension
}),
this
.
environmentService
.
configuration
.
remoteAuthority
)))
{
return
withExtension
;
}
}
return
path
.
join
(
cwd
,
command
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录