Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
8283078f
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,发现更多精彩内容 >>
提交
8283078f
编写于
9月 23, 2019
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make sure window's opener service resolves uris instead of automatically resolving all uris
上级
578c4c0a
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
8 addition
and
8 deletion
+8
-8
src/vs/editor/browser/services/openerService.ts
src/vs/editor/browser/services/openerService.ts
+4
-5
src/vs/workbench/electron-browser/window.ts
src/vs/workbench/electron-browser/window.ts
+4
-3
未找到文件。
src/vs/editor/browser/services/openerService.ts
浏览文件 @
8283078f
...
...
@@ -58,18 +58,16 @@ export class OpenerService extends Disposable implements IOpenerService {
}
}
const
{
resolved
}
=
await
this
.
resolveExternalUri
(
resource
,
options
);
// check with contributed openers
for
(
const
opener
of
this
.
_openers
.
toArray
())
{
const
handled
=
await
opener
.
open
(
reso
lved
,
options
);
const
handled
=
await
opener
.
open
(
reso
urce
,
options
);
if
(
handled
)
{
return
true
;
}
}
// use default openers
return
this
.
_doOpen
(
reso
lved
,
options
);
return
this
.
_doOpen
(
reso
urce
,
options
);
}
public
async
resolveExternalUri
(
resource
:
URI
,
options
?:
{
readonly
allowTunneling
?:
boolean
}):
Promise
<
{
resolved
:
URI
,
dispose
():
void
}
>
{
...
...
@@ -138,7 +136,8 @@ export class OpenerService extends Disposable implements IOpenerService {
}
private
async
_doOpenExternal
(
resource
:
URI
,
options
:
OpenOptions
|
undefined
):
Promise
<
boolean
>
{
dom
.
windowOpenNoOpener
(
encodeURI
(
resource
.
toString
(
true
)));
const
{
resolved
}
=
await
this
.
resolveExternalUri
(
resource
,
options
);
dom
.
windowOpenNoOpener
(
encodeURI
(
resolved
.
toString
(
true
)));
return
Promise
.
resolve
(
true
);
}
...
...
src/vs/workbench/electron-browser/window.ts
浏览文件 @
8283078f
...
...
@@ -425,10 +425,11 @@ export class ElectronWindow extends Disposable {
// we handle this resource by delegating the opening to
// the main process to prevent window focus issues.
if
(
this
.
shouldOpenExternal
(
resource
,
options
))
{
const
success
=
await
this
.
windowsService
.
openExternal
(
encodeURI
(
resource
.
toString
(
true
)));
if
(
!
success
&&
resource
.
scheme
===
Schemas
.
file
)
{
const
{
resolved
}
=
await
this
.
openerService
.
resolveExternalUri
(
resource
);
const
success
=
await
this
.
windowsService
.
openExternal
(
encodeURI
(
resolved
.
toString
(
true
)));
if
(
!
success
&&
resolved
.
scheme
===
Schemas
.
file
)
{
// if opening failed, and this is a file, we can still try to reveal it
await
this
.
electronService
.
showItemInFolder
(
reso
urce
.
fsPath
);
await
this
.
electronService
.
showItemInFolder
(
reso
lved
.
fsPath
);
}
return
true
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录