Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
f68a4fcc
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,发现更多精彩内容 >>
提交
f68a4fcc
编写于
11月 18, 2016
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove need to resolve inmemory resources
上级
e87ab932
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
1 addition
and
62 deletion
+1
-62
src/vs/workbench/services/editor/browser/editorService.ts
src/vs/workbench/services/editor/browser/editorService.ts
+1
-50
src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
...ices/textmodelResolver/common/textModelResolverService.ts
+0
-12
未找到文件。
src/vs/workbench/services/editor/browser/editorService.ts
浏览文件 @
f68a4fcc
...
@@ -9,9 +9,6 @@ import URI from 'vs/base/common/uri';
...
@@ -9,9 +9,6 @@ import URI from 'vs/base/common/uri';
import
network
=
require
(
'
vs/base/common/network
'
);
import
network
=
require
(
'
vs/base/common/network
'
);
import
{
Registry
}
from
'
vs/platform/platform
'
;
import
{
Registry
}
from
'
vs/platform/platform
'
;
import
{
basename
,
dirname
}
from
'
vs/base/common/paths
'
;
import
{
basename
,
dirname
}
from
'
vs/base/common/paths
'
;
import
types
=
require
(
'
vs/base/common/types
'
);
import
{
IDiffEditor
,
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
ICommonCodeEditor
,
IModel
,
EditorType
,
IEditor
as
ICommonEditor
}
from
'
vs/editor/common/editorCommon
'
;
import
{
BaseEditor
}
from
'
vs/workbench/browser/parts/editor/baseEditor
'
;
import
{
BaseEditor
}
from
'
vs/workbench/browser/parts/editor/baseEditor
'
;
import
{
EditorInput
,
EditorOptions
,
IFileEditorInput
,
TextEditorOptions
,
IEditorRegistry
,
Extensions
}
from
'
vs/workbench/common/editor
'
;
import
{
EditorInput
,
EditorOptions
,
IFileEditorInput
,
TextEditorOptions
,
IEditorRegistry
,
Extensions
}
from
'
vs/workbench/common/editor
'
;
import
{
ResourceEditorInput
}
from
'
vs/workbench/common/editor/resourceEditorInput
'
;
import
{
ResourceEditorInput
}
from
'
vs/workbench/common/editor/resourceEditorInput
'
;
...
@@ -206,46 +203,9 @@ export class WorkbenchEditorService implements IWorkbenchEditorService {
...
@@ -206,46 +203,9 @@ export class WorkbenchEditorService implements IWorkbenchEditorService {
// Base Text Editor Support for inmemory resources
// Base Text Editor Support for inmemory resources
const
resourceInput
=
<
IResourceInput
>
input
;
const
resourceInput
=
<
IResourceInput
>
input
;
if
(
resourceInput
.
resource
instanceof
URI
&&
resourceInput
.
resource
.
scheme
===
network
.
Schemas
.
inMemory
)
{
// For in-memory resources we only support to resolve the input from the current active editor
// because the workbench does not track editor models by in memory URL. This concept is only
// being used in the code editor.
const
activeEditor
=
this
.
getActiveEditor
();
if
(
activeEditor
)
{
const
control
=
<
ICommonEditor
>
activeEditor
.
getControl
();
if
(
types
.
isFunction
(
control
.
getEditorType
))
{
// Single Editor: If code editor model matches, return input from editor
if
(
control
.
getEditorType
()
===
EditorType
.
ICodeEditor
)
{
const
codeEditor
=
<
ICodeEditor
>
control
;
const
model
=
this
.
findModel
(
codeEditor
,
input
);
if
(
model
)
{
return
TPromise
.
as
(
activeEditor
.
input
);
}
}
// Diff Editor: If left or right code editor model matches, return associated input
else
if
(
control
.
getEditorType
()
===
EditorType
.
IDiffEditor
)
{
const
diffInput
=
<
DiffEditorInput
>
activeEditor
.
input
;
const
diffCodeEditor
=
<
IDiffEditor
>
control
;
const
originalModel
=
this
.
findModel
(
diffCodeEditor
.
getOriginalEditor
(),
input
);
if
(
originalModel
)
{
return
TPromise
.
as
(
diffInput
.
originalInput
);
}
const
modifiedModel
=
this
.
findModel
(
diffCodeEditor
.
getModifiedEditor
(),
input
);
if
(
modifiedModel
)
{
return
TPromise
.
as
(
diffInput
.
modifiedInput
);
}
}
}
}
}
// Untitled file support
// Untitled file support
else
if
(
resourceInput
.
resource
instanceof
URI
&&
(
resourceInput
.
resource
.
scheme
===
UntitledEditorInput
.
SCHEMA
))
{
if
(
resourceInput
.
resource
instanceof
URI
&&
(
resourceInput
.
resource
.
scheme
===
UntitledEditorInput
.
SCHEMA
))
{
return
TPromise
.
as
<
EditorInput
>
(
this
.
untitledEditorService
.
createOrGet
(
resourceInput
.
resource
));
return
TPromise
.
as
<
EditorInput
>
(
this
.
untitledEditorService
.
createOrGet
(
resourceInput
.
resource
));
}
}
...
@@ -273,15 +233,6 @@ export class WorkbenchEditorService implements IWorkbenchEditorService {
...
@@ -273,15 +233,6 @@ export class WorkbenchEditorService implements IWorkbenchEditorService {
return
typedFileInput
;
return
typedFileInput
;
});
});
}
}
private
findModel
(
editor
:
ICommonCodeEditor
,
input
:
IResourceInput
):
IModel
{
const
model
=
editor
.
getModel
();
if
(
!
model
)
{
return
null
;
}
return
model
.
uri
.
toString
()
===
input
.
resource
.
toString
()
?
model
:
null
;
}
}
}
export
interface
IDelegatingWorkbenchEditorServiceHandler
{
export
interface
IDelegatingWorkbenchEditorServiceHandler
{
...
...
src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
浏览文件 @
f68a4fcc
...
@@ -19,7 +19,6 @@ import { ITextModelResolverService, ITextModelContentProvider } from 'vs/editor/
...
@@ -19,7 +19,6 @@ import { ITextModelResolverService, ITextModelContentProvider } from 'vs/editor/
import
{
IUntitledEditorService
}
from
'
vs/workbench/services/untitled/common/untitledEditorService
'
;
import
{
IUntitledEditorService
}
from
'
vs/workbench/services/untitled/common/untitledEditorService
'
;
import
{
UntitledEditorInput
}
from
'
vs/workbench/common/editor/untitledEditorInput
'
;
import
{
UntitledEditorInput
}
from
'
vs/workbench/common/editor/untitledEditorInput
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
EditorInput
}
from
'
vs/workbench/common/editor
'
;
export
class
TextModelResolverService
implements
ITextModelResolverService
{
export
class
TextModelResolverService
implements
ITextModelResolverService
{
...
@@ -49,17 +48,6 @@ export class TextModelResolverService implements ITextModelResolverService {
...
@@ -49,17 +48,6 @@ export class TextModelResolverService implements ITextModelResolverService {
return
this
.
untitledEditorService
.
createOrGet
(
resource
).
resolve
();
return
this
.
untitledEditorService
.
createOrGet
(
resource
).
resolve
();
}
}
// In Memory: only works on the active editor
if
(
resource
.
scheme
===
network
.
Schemas
.
inMemory
)
{
return
this
.
editorService
.
createInput
({
resource
}).
then
(
input
=>
{
if
(
input
instanceof
EditorInput
)
{
return
input
.
resolve
();
}
return
null
;
});
}
// Any other resource: use content provider registry
// Any other resource: use content provider registry
return
this
.
resolveTextModelContent
(
this
.
modelService
,
resource
).
then
(()
=>
this
.
instantiationService
.
createInstance
(
ResourceEditorModel
,
resource
));
return
this
.
resolveTextModelContent
(
this
.
modelService
,
resource
).
then
(()
=>
this
.
instantiationService
.
createInstance
(
ResourceEditorModel
,
resource
));
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录