Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
b09f1c43
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,发现更多精彩内容 >>
提交
b09f1c43
编写于
9月 21, 2017
作者:
D
Dirk Baeumer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #31133: Task output - show the folder in which a task is running #31133
上级
ba4f4db5
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
13 addition
and
3 deletion
+13
-3
src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
...kbench/parts/tasks/electron-browser/terminalTaskSystem.ts
+13
-3
未找到文件。
src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
浏览文件 @
b09f1c43
...
...
@@ -22,7 +22,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import
*
as
TPath
from
'
vs/base/common/paths
'
;
import
{
IMarkerService
}
from
'
vs/platform/markers/common/markers
'
;
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IWorkspaceContextService
,
WorkbenchState
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IModelService
}
from
'
vs/editor/common/services/modelService
'
;
import
{
ProblemMatcher
,
ProblemMatcherRegistry
/*, ProblemPattern, getResource */
}
from
'
vs/platform/markers/common/problemMatcher
'
;
...
...
@@ -440,6 +440,8 @@ export class TerminalTaskSystem extends EventEmitter implements ITaskSystem {
};
let
shellLaunchConfig
:
IShellLaunchConfig
=
undefined
;
let
isShellCommand
=
task
.
command
.
runtime
===
RuntimeType
.
Shell
;
let
workspaceFolder
=
Task
.
getWorkspaceFolder
(
task
);
let
needsFolderQualification
=
workspaceFolder
&&
this
.
contextService
.
getWorkbenchState
()
===
WorkbenchState
.
WORKSPACE
;
if
(
isShellCommand
)
{
if
(
Platform
.
isWindows
&&
((
options
.
cwd
&&
TPath
.
isUNC
(
options
.
cwd
))
||
(
!
options
.
cwd
&&
TPath
.
isUNC
(
process
.
cwd
()))))
{
throw
new
TaskError
(
Severity
.
Error
,
nls
.
localize
(
'
TerminalTaskSystem
'
,
'
Can
\'
t execute a shell command on an UNC drive.
'
),
TaskErrors
.
UnknownError
);
...
...
@@ -492,8 +494,12 @@ export class TerminalTaskSystem extends EventEmitter implements ITaskSystem {
shellArgs
.
push
(
commandLine
);
shellLaunchConfig
.
args
=
windowsShellArgs
?
shellArgs
.
join
(
'
'
)
:
shellArgs
;
if
(
task
.
command
.
presentation
.
echo
)
{
if
(
needsFolderQualification
)
{
shellLaunchConfig
.
initialText
=
`\x1b[1m> Executing task in folder
${
workspaceFolder
.
name
}
:
${
commandLine
}
<\x1b[0m\n`
;
}
else
{
shellLaunchConfig
.
initialText
=
`\x1b[1m> Executing task:
${
commandLine
}
<\x1b[0m\n`
;
}
}
}
else
{
let
cwd
=
options
&&
options
.
cwd
?
options
.
cwd
:
process
.
cwd
();
// On Windows executed process must be described absolute. Since we allowed command without an
...
...
@@ -515,9 +521,13 @@ export class TerminalTaskSystem extends EventEmitter implements ITaskSystem {
}
return
args
.
join
(
'
'
);
};
if
(
needsFolderQualification
)
{
shellLaunchConfig
.
initialText
=
`\x1b[1m> Executing task in folder
${
workspaceFolder
.
name
}
:
${
shellLaunchConfig
.
executable
}
${
getArgsToEcho
(
shellLaunchConfig
.
args
)}
<\x1b[0m\n`
;
}
else
{
shellLaunchConfig
.
initialText
=
`\x1b[1m> Executing task:
${
shellLaunchConfig
.
executable
}
${
getArgsToEcho
(
shellLaunchConfig
.
args
)}
<\x1b[0m\n`
;
}
}
}
if
(
options
.
cwd
)
{
shellLaunchConfig
.
cwd
=
options
.
cwd
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录