Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
e61d5b90
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,发现更多精彩内容 >>
未验证
提交
e61d5b90
编写于
11月 08, 2019
作者:
S
SteVen Batten
提交者:
GitHub
11月 08, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into misolori/dialog-polish
上级
b56e9a78
c1ffc0ec
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
3 addition
and
3 deletion
+3
-3
src/vs/editor/contrib/codeAction/codeActionUi.ts
src/vs/editor/contrib/codeAction/codeActionUi.ts
+2
-2
src/vs/workbench/contrib/url/common/trustedDomainsFileSystemProvider.ts
...ch/contrib/url/common/trustedDomainsFileSystemProvider.ts
+1
-1
未找到文件。
src/vs/editor/contrib/codeAction/codeActionUi.ts
浏览文件 @
e61d5b90
...
@@ -30,7 +30,7 @@ export class CodeActionUi extends Disposable {
...
@@ -30,7 +30,7 @@ export class CodeActionUi extends Disposable {
quickFixActionId
:
string
,
quickFixActionId
:
string
,
preferredFixActionId
:
string
,
preferredFixActionId
:
string
,
private
readonly
delegate
:
{
private
readonly
delegate
:
{
applyCodeAction
:
(
action
:
CodeAction
,
regtriggerAfterApply
:
boolean
)
=>
void
applyCodeAction
:
(
action
:
CodeAction
,
regtriggerAfterApply
:
boolean
)
=>
Promise
<
void
>
},
},
@
IContextMenuService
contextMenuService
:
IContextMenuService
,
@
IContextMenuService
contextMenuService
:
IContextMenuService
,
@
IKeybindingService
keybindingService
:
IKeybindingService
,
@
IKeybindingService
keybindingService
:
IKeybindingService
,
...
@@ -81,7 +81,7 @@ export class CodeActionUi extends Disposable {
...
@@ -81,7 +81,7 @@ export class CodeActionUi extends Disposable {
// Apply if we only have one action or requested autoApply
// Apply if we only have one action or requested autoApply
if
(
newState
.
trigger
.
autoApply
===
CodeActionAutoApply
.
First
||
(
newState
.
trigger
.
autoApply
===
CodeActionAutoApply
.
IfSingle
&&
actions
.
actions
.
length
===
1
))
{
if
(
newState
.
trigger
.
autoApply
===
CodeActionAutoApply
.
First
||
(
newState
.
trigger
.
autoApply
===
CodeActionAutoApply
.
IfSingle
&&
actions
.
actions
.
length
===
1
))
{
try
{
try
{
this
.
delegate
.
applyCodeAction
(
actions
.
actions
[
0
],
false
);
await
this
.
delegate
.
applyCodeAction
(
actions
.
actions
[
0
],
false
);
}
finally
{
}
finally
{
actions
.
dispose
();
actions
.
dispose
();
}
}
...
...
src/vs/workbench/contrib/url/common/trustedDomainsFileSystemProvider.ts
浏览文件 @
e61d5b90
...
@@ -107,7 +107,7 @@ export class TrustedDomainsFileSystemProvider implements IFileSystemProviderWith
...
@@ -107,7 +107,7 @@ export class TrustedDomainsFileSystemProvider implements IFileSystemProviderWith
writeFile
(
resource
:
URI
,
content
:
Uint8Array
,
opts
:
FileWriteOptions
):
Promise
<
void
>
{
writeFile
(
resource
:
URI
,
content
:
Uint8Array
,
opts
:
FileWriteOptions
):
Promise
<
void
>
{
try
{
try
{
const
trustedDomainsContent
=
content
.
toString
();
const
trustedDomainsContent
=
VSBuffer
.
wrap
(
content
)
.
toString
();
const
trustedDomains
=
parse
(
trustedDomainsContent
);
const
trustedDomains
=
parse
(
trustedDomainsContent
);
this
.
storageService
.
store
(
'
http.linkProtectionTrustedDomainsContent
'
,
trustedDomainsContent
,
StorageScope
.
GLOBAL
);
this
.
storageService
.
store
(
'
http.linkProtectionTrustedDomainsContent
'
,
trustedDomainsContent
,
StorageScope
.
GLOBAL
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录