Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
e910e4e6
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,发现更多精彩内容 >>
提交
e910e4e6
编写于
1月 21, 2019
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
OpenerService#open should return a boolean
上级
1d4bed79
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
18 deletion
+23
-18
src/vs/editor/browser/services/openerService.ts
src/vs/editor/browser/services/openerService.ts
+22
-17
src/vs/platform/opener/common/opener.ts
src/vs/platform/opener/common/opener.ts
+1
-1
未找到文件。
src/vs/editor/browser/services/openerService.ts
浏览文件 @
e910e4e6
...
...
@@ -23,15 +23,24 @@ export class OpenerService implements IOpenerService {
//
}
open
(
resource
:
URI
,
options
?:
{
openToSide
?:
boolean
}):
Promise
<
any
>
{
open
(
resource
:
URI
,
options
?:
{
openToSide
?:
boolean
}):
Promise
<
boolean
>
{
const
{
scheme
,
path
,
query
,
fragment
}
=
resource
;
let
promise
:
Promise
<
any
>
|
undefined
=
undefined
;
if
(
scheme
===
Schemas
.
http
||
scheme
===
Schemas
.
https
||
scheme
===
Schemas
.
mailto
)
{
if
(
!
scheme
)
{
// no scheme ?!?
return
Promise
.
resolve
(
false
);
}
else
if
(
scheme
===
Schemas
.
http
||
scheme
===
Schemas
.
https
||
scheme
===
Schemas
.
mailto
)
{
// open http or default mail application
dom
.
windowOpenNoOpener
(
resource
.
toString
(
true
));
}
else
if
(
scheme
===
'
command
'
&&
CommandsRegistry
.
getCommand
(
path
))
{
return
Promise
.
resolve
(
true
);
}
else
if
(
scheme
===
Schemas
.
command
)
{
// run command or bail out if command isn't known
if
(
!
CommandsRegistry
.
getCommand
(
path
))
{
return
Promise
.
reject
(
`command '
${
path
}
' NOT known`
);
}
// execute as command
let
args
:
any
=
[];
try
{
...
...
@@ -42,13 +51,10 @@ export class OpenerService implements IOpenerService {
}
catch
(
e
)
{
//
}
promise
=
this
.
_commandService
.
executeCommand
(
path
,
...
args
);
return
this
.
_commandService
.
executeCommand
(
path
,
...
args
).
then
(()
=>
true
);
}
else
{
let
selection
:
{
startLineNumber
:
number
;
startColumn
:
number
;
}
|
undefined
=
undefined
;
let
selection
:
{
startLineNumber
:
number
;
startColumn
:
number
;
}
|
undefined
=
undefined
;
const
match
=
/^L
?(\d
+
)(?:
,
(\d
+
))?
/
.
exec
(
fragment
);
if
(
match
)
{
// support file:///some/file.js#73,84
...
...
@@ -61,16 +67,15 @@ export class OpenerService implements IOpenerService {
resource
=
resource
.
with
({
fragment
:
''
});
}
if
(
!
resource
.
scheme
)
{
// we cannot handle those
return
Promise
.
resolve
(
undefined
);
}
else
if
(
resource
.
scheme
===
Schemas
.
file
)
{
if
(
resource
.
scheme
===
Schemas
.
file
)
{
resource
=
resources
.
normalizePath
(
resource
);
// workaround for non-normalized paths (https://github.com/Microsoft/vscode/issues/12954)
}
promise
=
this
.
_editorService
.
openCodeEditor
({
resource
,
options
:
{
selection
,
}
},
this
.
_editorService
.
getFocusedCodeEditor
(),
options
&&
options
.
openToSide
);
}
return
Promise
.
resolve
(
promise
);
return
this
.
_editorService
.
openCodeEditor
(
{
resource
,
options
:
{
selection
,
}
},
this
.
_editorService
.
getFocusedCodeEditor
(),
options
&&
options
.
openToSide
).
then
(()
=>
true
);
}
}
}
src/vs/platform/opener/common/opener.ts
浏览文件 @
e910e4e6
...
...
@@ -18,7 +18,7 @@ export interface IOpenerService {
* @param resource A resource
* @return A promise that resolves when the opening is done.
*/
open
(
resource
:
URI
,
options
?:
{
openToSide
?:
boolean
}):
Promise
<
any
>
;
open
(
resource
:
URI
,
options
?:
{
openToSide
?:
boolean
}):
Promise
<
boolean
>
;
}
export
const
NullOpenerService
:
IOpenerService
=
Object
.
freeze
({
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录