Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
bedf5922
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,发现更多精彩内容 >>
未验证
提交
bedf5922
编写于
7月 28, 2021
作者:
A
Alex Ross
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix user tasks in single file mode
上级
62f7954a
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
26 addition
and
9 deletion
+26
-9
src/vs/workbench/api/node/extHostTask.ts
src/vs/workbench/api/node/extHostTask.ts
+25
-8
src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
...vs/workbench/contrib/tasks/browser/abstractTaskService.ts
+1
-1
未找到文件。
src/vs/workbench/api/node/extHostTask.ts
浏览文件 @
bedf5922
...
...
@@ -14,7 +14,7 @@ import * as tasks from '../common/shared/tasks';
import
{
ExtHostVariableResolverService
}
from
'
vs/workbench/api/common/extHostDebugService
'
;
import
{
IExtHostDocumentsAndEditors
}
from
'
vs/workbench/api/common/extHostDocumentsAndEditors
'
;
import
{
IExtHostConfiguration
}
from
'
vs/workbench/api/common/extHostConfiguration
'
;
import
{
IWorkspaceFolder
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IWorkspaceFolder
,
WorkspaceFolder
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IExtensionDescription
}
from
'
vs/platform/extensions/common/extensions
'
;
import
{
IExtHostTerminalService
}
from
'
vs/workbench/api/common/extHostTerminalService
'
;
import
{
IExtHostRpcService
}
from
'
vs/workbench/api/common/extHostRpcService
'
;
...
...
@@ -24,6 +24,8 @@ import { Schemas } from 'vs/base/common/network';
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
IExtHostApiDeprecationService
}
from
'
vs/workbench/api/common/extHostApiDeprecationService
'
;
import
{
IExtHostEditorTabs
}
from
'
vs/workbench/api/common/extHostEditorTabs
'
;
import
*
as
resources
from
'
vs/base/common/resources
'
;
import
{
homedir
}
from
'
os
'
;
export
class
ExtHostTask
extends
ExtHostTaskBase
{
private
_variableResolver
:
ExtHostVariableResolverService
|
undefined
;
...
...
@@ -37,7 +39,7 @@ export class ExtHostTask extends ExtHostTaskBase {
@
IExtHostTerminalService
extHostTerminalService
:
IExtHostTerminalService
,
@
ILogService
logService
:
ILogService
,
@
IExtHostApiDeprecationService
deprecationService
:
IExtHostApiDeprecationService
,
@
IExtHostEditorTabs
private
readonly
editorTabs
:
IExtHostEditorTabs
@
IExtHostEditorTabs
private
readonly
editorTabs
:
IExtHostEditorTabs
,
)
{
super
(
extHostRpc
,
initData
,
workspaceService
,
editorService
,
configurationService
,
extHostTerminalService
,
logService
,
deprecationService
);
if
(
initData
.
remote
.
isRemote
&&
initData
.
remote
.
authority
)
{
...
...
@@ -134,6 +136,22 @@ export class ExtHostTask extends ExtHostTaskBase {
return
this
.
_variableResolver
;
}
private
async
getAFolder
(
workspaceFolders
:
vscode
.
WorkspaceFolder
[]
|
undefined
):
Promise
<
IWorkspaceFolder
>
{
let
folder
=
(
workspaceFolders
&&
workspaceFolders
.
length
>
0
)
?
workspaceFolders
[
0
]
:
undefined
;
if
(
!
folder
)
{
const
userhome
=
URI
.
file
(
homedir
());
folder
=
new
WorkspaceFolder
({
uri
:
userhome
,
name
:
resources
.
basename
(
userhome
),
index
:
0
});
}
return
{
uri
:
folder
.
uri
,
name
:
folder
.
name
,
index
:
folder
.
index
,
toResource
:
()
=>
{
throw
new
Error
(
'
Not implemented
'
);
}
};
}
public
async
$resolveVariables
(
uriComponents
:
UriComponents
,
toResolve
:
{
process
?:
{
name
:
string
;
cwd
?:
string
;
path
?:
string
},
variables
:
string
[]
}):
Promise
<
{
process
?:
string
,
variables
:
{
[
key
:
string
]:
string
;
}
}
>
{
const
uri
:
URI
=
URI
.
revive
(
uriComponents
);
const
result
=
{
...
...
@@ -141,19 +159,18 @@ export class ExtHostTask extends ExtHostTaskBase {
variables
:
Object
.
create
(
null
)
};
const
workspaceFolder
=
await
this
.
_workspaceProvider
.
resolveWorkspaceFolder
(
uri
);
const
workspaceFolders
=
await
this
.
_workspaceProvider
.
getWorkspaceFolders2
();
if
(
!
workspaceFolders
||
!
workspaceFolder
)
{
throw
new
Error
(
'
Unexpected: Tasks can only be run in a workspace folder
'
);
}
const
workspaceFolders
=
(
await
this
.
_workspaceProvider
.
getWorkspaceFolders2
())
??
[];
const
resolver
=
await
this
.
getVariableResolver
(
workspaceFolders
);
const
ws
:
IWorkspaceFolder
=
{
const
ws
:
IWorkspaceFolder
=
workspaceFolder
?
{
uri
:
workspaceFolder
.
uri
,
name
:
workspaceFolder
.
name
,
index
:
workspaceFolder
.
index
,
toResource
:
()
=>
{
throw
new
Error
(
'
Not implemented
'
);
}
};
}
:
await
this
.
getAFolder
(
workspaceFolders
);
for
(
let
variable
of
toResolve
.
variables
)
{
result
.
variables
[
variable
]
=
await
resolver
.
resolveAsync
(
ws
,
variable
);
}
...
...
src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
浏览文件 @
bedf5922
...
...
@@ -2156,7 +2156,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
protected
getConfiguration
(
workspaceFolder
:
IWorkspaceFolder
,
source
?:
string
):
{
config
:
TaskConfig
.
ExternalTaskRunnerConfiguration
|
undefined
;
hasParseErrors
:
boolean
}
{
let
result
;
if
(
this
.
contextService
.
getWorkbenchState
()
===
WorkbenchState
.
EMPTY
)
{
if
(
(
source
!==
TaskSourceKind
.
User
)
&&
(
this
.
contextService
.
getWorkbenchState
()
===
WorkbenchState
.
EMPTY
)
)
{
result
=
undefined
;
}
else
{
const
wholeConfig
=
this
.
configurationService
.
inspect
<
TaskConfig
.
ExternalTaskRunnerConfiguration
>
(
'
tasks
'
,
{
resource
:
workspaceFolder
.
uri
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录