Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
0eda23e1
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,发现更多精彩内容 >>
提交
0eda23e1
编写于
10月 23, 2020
作者:
A
Alex Ross
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix tasks when one of the exthosts is webworker
上级
d166de9a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
12 deletion
+18
-12
src/vs/workbench/api/browser/mainThreadTask.ts
src/vs/workbench/api/browser/mainThreadTask.ts
+0
-1
src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
...vs/workbench/contrib/tasks/browser/abstractTaskService.ts
+18
-10
src/vs/workbench/contrib/tasks/common/taskService.ts
src/vs/workbench/contrib/tasks/common/taskService.ts
+0
-1
未找到文件。
src/vs/workbench/api/browser/mainThreadTask.ts
浏览文件 @
0eda23e1
...
...
@@ -434,7 +434,6 @@ export class MainThreadTask implements MainThreadTaskShape {
this
.
_proxy
.
$OnDidEndTask
(
TaskExecutionDTO
.
from
(
task
.
getTaskExecution
()));
}
});
this
.
_taskService
.
setJsonTasksSupported
(
Promise
.
resolve
(
this
.
_proxy
.
$jsonTasksSupported
()));
}
public
dispose
():
void
{
...
...
src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
浏览文件 @
0eda23e1
...
...
@@ -213,7 +213,6 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
protected
_taskSystemInfos
:
Map
<
string
,
TaskSystemInfo
>
;
protected
_workspaceTasksPromise
?:
Promise
<
Map
<
string
,
WorkspaceFolderTaskResult
>>
;
protected
_areJsonTasksSupportedPromise
:
Promise
<
boolean
>
=
Promise
.
resolve
(
false
);
protected
_taskSystem
?:
ITaskSystem
;
protected
_taskSystemListener
?:
IDisposable
;
...
...
@@ -543,7 +542,16 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
}
public
registerTaskSystem
(
key
:
string
,
info
:
TaskSystemInfo
):
void
{
this
.
_taskSystemInfos
.
set
(
key
,
info
);
if
(
!
this
.
_taskSystemInfos
.
has
(
key
)
||
info
.
platform
!==
Platform
.
Platform
.
Web
)
{
this
.
_taskSystemInfos
.
set
(
key
,
info
);
}
}
private
getTaskSystemInfo
(
key
:
string
):
TaskSystemInfo
|
undefined
{
if
(
this
.
environmentService
.
remoteAuthority
)
{
return
this
.
_taskSystemInfos
.
get
(
key
);
}
return
undefined
;
}
public
extensionCallbackTaskComplete
(
task
:
Task
,
result
:
number
):
Promise
<
void
>
{
...
...
@@ -1588,7 +1596,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
this
.
pathService
,
this
.
viewDescriptorService
,
this
.
logService
,
(
workspaceFolder
:
IWorkspaceFolder
|
undefined
)
=>
{
if
(
workspaceFolder
)
{
return
this
.
_taskSystemInfos
.
get
(
workspaceFolder
.
uri
.
scheme
);
return
this
.
getTaskSystemInfo
(
workspaceFolder
.
uri
.
scheme
);
}
else
if
(
this
.
_taskSystemInfos
.
size
>
0
)
{
return
this
.
_taskSystemInfos
.
values
().
next
().
value
;
}
else
{
...
...
@@ -1883,8 +1891,8 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
}
}
p
ublic
setJsonTasksSupported
(
areSupported
:
Promise
<
boolean
>
)
{
this
.
_areJsonTasksSupportedPromise
=
areSupported
;
p
rivate
get
jsonTasksSupported
():
boolean
{
return
!!
ShellExecutionSupportedContext
.
getValue
(
this
.
contextKeyService
)
&&
!!
ProcessExecutionSupportedContext
.
getValue
(
this
.
contextKeyService
)
;
}
private
computeWorkspaceFolderTasks
(
workspaceFolder
:
IWorkspaceFolder
,
runSource
:
TaskRunSource
=
TaskRunSource
.
User
):
Promise
<
WorkspaceFolderTaskResult
>
{
...
...
@@ -1896,7 +1904,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
return
Promise
.
resolve
({
workspaceFolder
,
set
:
undefined
,
configurations
:
undefined
,
hasErrors
:
workspaceFolderConfiguration
?
workspaceFolderConfiguration
.
hasErrors
:
false
});
}
return
ProblemMatcherRegistry
.
onReady
().
then
(
async
():
Promise
<
WorkspaceFolderTaskResult
>
=>
{
let
taskSystemInfo
:
TaskSystemInfo
|
undefined
=
this
.
_taskSystemInfos
.
get
(
workspaceFolder
.
uri
.
scheme
);
let
taskSystemInfo
:
TaskSystemInfo
|
undefined
=
this
.
getTaskSystemInfo
(
workspaceFolder
.
uri
.
scheme
);
let
problemReporter
=
new
ProblemReporter
(
this
.
_outputChannel
);
let
parseResult
=
TaskConfig
.
parse
(
workspaceFolder
,
undefined
,
taskSystemInfo
?
taskSystemInfo
.
platform
:
Platform
.
platform
,
workspaceFolderConfiguration
.
config
!
,
problemReporter
,
TaskConfig
.
TaskConfigSource
.
TasksJson
,
this
.
contextKeyService
);
let
hasErrors
=
false
;
...
...
@@ -1917,10 +1925,10 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
customizedTasks
.
byIdentifier
[
task
.
configures
.
_key
]
=
task
;
}
}
if
(
!
(
await
this
.
_areJsonTasksSupportedPromise
)
&&
(
parseResult
.
custom
.
length
>
0
))
{
if
(
!
this
.
jsonTasksSupported
&&
(
parseResult
.
custom
.
length
>
0
))
{
console
.
warn
(
'
Custom workspace tasks are not supported.
'
);
}
return
{
workspaceFolder
,
set
:
{
tasks
:
await
this
.
_areJsonTasksSupportedPromise
?
parseResult
.
custom
:
[]
},
configurations
:
customizedTasks
,
hasErrors
};
return
{
workspaceFolder
,
set
:
{
tasks
:
this
.
jsonTasksSupported
?
parseResult
.
custom
:
[]
},
configurations
:
customizedTasks
,
hasErrors
};
});
});
}
...
...
@@ -1993,7 +2001,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
if
(
!
config
)
{
return
false
;
}
let
taskSystemInfo
:
TaskSystemInfo
|
undefined
=
workspaceFolder
?
this
.
_taskSystemInfos
.
get
(
workspaceFolder
.
uri
.
scheme
)
:
undefined
;
let
taskSystemInfo
:
TaskSystemInfo
|
undefined
=
workspaceFolder
?
this
.
getTaskSystemInfo
(
workspaceFolder
.
uri
.
scheme
)
:
undefined
;
let
problemReporter
=
new
ProblemReporter
(
this
.
_outputChannel
);
let
parseResult
=
TaskConfig
.
parse
(
workspaceFolder
,
this
.
_workspace
,
taskSystemInfo
?
taskSystemInfo
.
platform
:
Platform
.
platform
,
config
,
problemReporter
,
source
,
this
.
contextKeyService
,
isRecentTask
);
let
hasErrors
=
false
;
...
...
@@ -2010,7 +2018,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
customized
[
task
.
configures
.
_key
]
=
task
;
}
}
if
(
!
(
await
this
.
_areJsonTasksSupportedPromise
)
&&
(
parseResult
.
custom
.
length
>
0
))
{
if
(
!
this
.
jsonTasksSupported
&&
(
parseResult
.
custom
.
length
>
0
))
{
console
.
warn
(
'
Custom workspace tasks are not supported.
'
);
}
else
{
for
(
let
task
of
parseResult
.
custom
)
{
...
...
src/vs/workbench/contrib/tasks/common/taskService.ts
浏览文件 @
0eda23e1
...
...
@@ -96,7 +96,6 @@ export interface ITaskService {
registerTaskSystem
(
scheme
:
string
,
taskSystemInfo
:
TaskSystemInfo
):
void
;
registerSupportedExecutions
(
custom
?:
boolean
,
shell
?:
boolean
,
process
?:
boolean
):
void
;
setJsonTasksSupported
(
areSuppored
:
Promise
<
boolean
>
):
void
;
extensionCallbackTaskComplete
(
task
:
Task
,
result
:
number
|
undefined
):
Promise
<
void
>
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录