Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
799f31b5
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,发现更多精彩内容 >>
提交
799f31b5
编写于
6月 11, 2018
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #51358
上级
f0a82310
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
17 deletion
+12
-17
src/vs/workbench/api/electron-browser/mainThreadEditors.ts
src/vs/workbench/api/electron-browser/mainThreadEditors.ts
+12
-8
src/vs/workbench/services/editor/browser/editorService.ts
src/vs/workbench/services/editor/browser/editorService.ts
+0
-9
未找到文件。
src/vs/workbench/api/electron-browser/mainThreadEditors.ts
浏览文件 @
799f31b5
...
...
@@ -27,7 +27,6 @@ import { ExtHostContext, ExtHostEditorsShape, IExtHostContext, ITextDocumentShow
import
{
MainThreadDocumentsAndEditors
}
from
'
./mainThreadDocumentsAndEditors
'
;
import
{
MainThreadTextEditor
}
from
'
./mainThreadEditor
'
;
import
{
IOpenerService
}
from
'
vs/platform/opener/common/opener
'
;
import
{
IFileService
}
from
'
vs/platform/files/common/files
'
;
export
class
MainThreadTextEditors
implements
MainThreadTextEditorsShape
{
...
...
@@ -253,19 +252,24 @@ CommandsRegistry.registerCommand('_workbench.open', function (accessor: Services
const
editorService
=
accessor
.
get
(
IEditorService
);
const
editorGroupService
=
accessor
.
get
(
IEditorGroupsService
);
const
openerService
=
accessor
.
get
(
IOpenerService
);
const
fileService
=
accessor
.
get
(
IFileService
);
const
[
resource
,
options
,
position
]
=
args
;
if
(
fileService
.
canHandleResource
(
resource
))
{
return
editorService
.
openEditor
({
resource
,
options
},
viewColumnToEditorGroup
(
editorGroupService
,
position
)).
then
(()
=>
void
0
);
}
else
{
// http://, https://, command:id
//todo@ben make this proper
return
openerService
.
open
(
resource
).
then
(
_
=>
void
0
);
if
(
options
||
typeof
position
===
'
number
'
)
{
// use editor options or editor view column as a hint to use the editor service for opening
return
editorService
.
openEditor
({
resource
,
options
},
viewColumnToEditorGroup
(
editorGroupService
,
position
)).
then
(
_
=>
void
0
);
}
if
(
resource
&&
resource
.
scheme
===
'
command
'
)
{
// do not allow to execute commands from here
return
TPromise
.
as
(
void
0
);
}
// finally, delegate to opener service
return
openerService
.
open
(
resource
).
then
(
_
=>
void
0
);
});
CommandsRegistry
.
registerCommand
(
'
_workbench.diff
'
,
function
(
accessor
:
ServicesAccessor
,
args
:
[
URI
,
URI
,
string
,
string
,
IEditorOptions
,
EditorViewColumn
])
{
const
editorService
=
accessor
.
get
(
IEditorService
);
const
editorGroupService
=
accessor
.
get
(
IEditorGroupsService
);
...
...
src/vs/workbench/services/editor/browser/editorService.ts
浏览文件 @
799f31b5
...
...
@@ -235,15 +235,6 @@ export class EditorService extends Disposable implements EditorServiceImpl {
return
this
.
doOpenEditor
(
targetGroup
,
editor
,
editorOptions
);
}
// Throw error for well known foreign resources (such as a http link) (TODO@ben remove me after this has been adopted)
const
resourceInput
=
<
IResourceInput
>
editor
;
if
(
resourceInput
.
resource
instanceof
URI
)
{
const
schema
=
resourceInput
.
resource
.
scheme
;
if
(
schema
===
Schemas
.
http
||
schema
===
Schemas
.
https
)
{
return
TPromise
.
wrapError
(
new
Error
(
'
Invalid scheme http/https to open resource as editor. Use IOpenerService instead.
'
));
}
}
// Untyped Text Editor Support
const
textInput
=
<
IResourceEditor
>
editor
;
const
typedInput
=
this
.
createInput
(
textInput
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录