Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
5b0ad492
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,体验更适合开发者的 AI 搜索 >>
提交
5b0ad492
编写于
1月 15, 2021
作者:
S
SteVen Batten
提交者:
GitHub
1月 15, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
observe trust with startup tasks
上级
73f88166
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
4 deletion
+14
-4
src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
...vs/workbench/contrib/tasks/browser/abstractTaskService.ts
+3
-1
src/vs/workbench/contrib/tasks/browser/runAutomaticTasks.ts
src/vs/workbench/contrib/tasks/browser/runAutomaticTasks.ts
+11
-3
未找到文件。
src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
浏览文件 @
5b0ad492
...
...
@@ -80,6 +80,7 @@ import { isWorkspaceFolder, TaskQuickPickEntry, QUICKOPEN_DETAIL_CONFIG, TaskQui
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
once
}
from
'
vs/base/common/functional
'
;
import
{
ThemeIcon
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
ITrustedWorkspaceService
}
from
'
vs/platform/workspace/common/trustedWorkspace
'
;
const
QUICKOPEN_HISTORY_LIMIT_CONFIG
=
'
task.quickOpen.history
'
;
const
PROBLEM_MATCHER_NEVER_CONFIG
=
'
task.problemMatchers.neverPrompt
'
;
...
...
@@ -255,6 +256,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
@
ITextModelService
private
readonly
textModelResolverService
:
ITextModelService
,
@
IPreferencesService
private
readonly
preferencesService
:
IPreferencesService
,
@
IViewDescriptorService
private
readonly
viewDescriptorService
:
IViewDescriptorService
,
@
ITrustedWorkspaceService
private
readonly
trustedWorkspaceService
:
ITrustedWorkspaceService
,
@
ILogService
private
readonly
logService
:
ILogService
)
{
super
();
...
...
@@ -911,7 +913,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
}).
then
((
value
)
=>
{
if
(
runSource
===
TaskRunSource
.
User
)
{
this
.
getWorkspaceTasks
().
then
(
workspaceTasks
=>
{
RunAutomaticTasks
.
promptForPermission
(
this
,
this
.
storageService
,
this
.
notificationService
,
workspaceTasks
);
RunAutomaticTasks
.
promptForPermission
(
this
,
this
.
storageService
,
this
.
notificationService
,
this
.
trustedWorkspaceService
,
workspaceTasks
);
});
}
return
value
;
...
...
src/vs/workbench/contrib/tasks/browser/runAutomaticTasks.ts
浏览文件 @
5b0ad492
...
...
@@ -14,16 +14,19 @@ import { INotificationService, Severity } from 'vs/platform/notification/common/
import
{
IQuickPickItem
,
IQuickInputService
}
from
'
vs/platform/quickinput/common/quickInput
'
;
import
{
Action2
}
from
'
vs/platform/actions/common/actions
'
;
import
{
ServicesAccessor
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
ITrustedWorkspaceService
,
TrustState
}
from
'
vs/platform/workspace/common/trustedWorkspace
'
;
const
ARE_AUTOMATIC_TASKS_ALLOWED_IN_WORKSPACE
=
'
tasks.run.allowAutomatic
'
;
export
class
RunAutomaticTasks
extends
Disposable
implements
IWorkbenchContribution
{
constructor
(
@
ITaskService
private
readonly
taskService
:
ITaskService
,
@
IStorageService
storageService
:
IStorageService
)
{
@
IStorageService
storageService
:
IStorageService
,
@
ITrustedWorkspaceService
trustedWorkspaceService
:
ITrustedWorkspaceService
)
{
super
();
const
isFolderAutomaticAllowed
=
storageService
.
getBoolean
(
ARE_AUTOMATIC_TASKS_ALLOWED_IN_WORKSPACE
,
StorageScope
.
WORKSPACE
,
undefined
);
this
.
tryRunTasks
(
isFolderAutomaticAllowed
);
const
isTrustedWorkspace
=
trustedWorkspaceService
.
getWorkspaceTrustState
()
===
TrustState
.
Trusted
;
this
.
tryRunTasks
(
isFolderAutomaticAllowed
&&
isTrustedWorkspace
);
}
private
tryRunTasks
(
isAllowed
:
boolean
|
undefined
)
{
...
...
@@ -84,8 +87,13 @@ export class RunAutomaticTasks extends Disposable implements IWorkbenchContribut
return
{
tasks
,
taskNames
};
}
public
static
promptForPermission
(
taskService
:
ITaskService
,
storageService
:
IStorageService
,
notificationService
:
INotification
Service
,
public
static
async
promptForPermission
(
taskService
:
ITaskService
,
storageService
:
IStorageService
,
notificationService
:
INotificationService
,
trustedWorkspaceService
:
ITrustedWorkspace
Service
,
workspaceTaskResult
:
Map
<
string
,
WorkspaceFolderTaskResult
>
)
{
const
isTrustedWorkspace
=
await
trustedWorkspaceService
.
requireWorkspaceTrust
()
===
TrustState
.
Trusted
;
if
(
!
isTrustedWorkspace
)
{
return
;
}
const
isFolderAutomaticAllowed
=
storageService
.
getBoolean
(
ARE_AUTOMATIC_TASKS_ALLOWED_IN_WORKSPACE
,
StorageScope
.
WORKSPACE
,
undefined
);
if
(
isFolderAutomaticAllowed
!==
undefined
)
{
return
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录