Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
37404919
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,发现更多精彩内容 >>
提交
37404919
编写于
12月 12, 2016
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
use immortal references for inmemory resources
fixes #17008
上级
8e64404d
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
17 addition
and
12 deletion
+17
-12
src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
...ices/textmodelResolver/common/textModelResolverService.ts
+17
-12
未找到文件。
src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
浏览文件 @
37404919
...
@@ -23,8 +23,7 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo
...
@@ -23,8 +23,7 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo
private
providers
:
{
[
scheme
:
string
]:
ITextModelContentProvider
[]
}
=
Object
.
create
(
null
);
private
providers
:
{
[
scheme
:
string
]:
ITextModelContentProvider
[]
}
=
Object
.
create
(
null
);
constructor
(
constructor
(
@
IInstantiationService
private
instantiationService
:
IInstantiationService
,
@
IInstantiationService
private
instantiationService
:
IInstantiationService
@
IModelService
private
modelService
:
IModelService
)
{
)
{
super
();
super
();
}
}
...
@@ -32,7 +31,7 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo
...
@@ -32,7 +31,7 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo
createReferencedObject
(
key
:
string
):
TPromise
<
ITextEditorModel
>
{
createReferencedObject
(
key
:
string
):
TPromise
<
ITextEditorModel
>
{
const
resource
=
URI
.
parse
(
key
);
const
resource
=
URI
.
parse
(
key
);
return
this
.
resolveTextModelContent
(
this
.
modelService
,
key
)
return
this
.
resolveTextModelContent
(
key
)
.
then
(()
=>
this
.
instantiationService
.
createInstance
(
ResourceEditorModel
,
resource
));
.
then
(()
=>
this
.
instantiationService
.
createInstance
(
ResourceEditorModel
,
resource
));
}
}
...
@@ -67,15 +66,8 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo
...
@@ -67,15 +66,8 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo
});
});
}
}
private
resolveTextModelContent
(
modelService
:
IModelService
,
key
:
string
):
TPromise
<
IModel
>
{
private
resolveTextModelContent
(
key
:
string
):
TPromise
<
IModel
>
{
const
resource
=
URI
.
parse
(
key
);
const
resource
=
URI
.
parse
(
key
);
const
model
=
modelService
.
getModel
(
resource
);
if
(
model
)
{
// TODO@Joao this should never happen
return
TPromise
.
as
(
model
);
}
const
providers
=
this
.
providers
[
resource
.
scheme
]
||
[];
const
providers
=
this
.
providers
[
resource
.
scheme
]
||
[];
const
factories
=
providers
.
map
(
p
=>
()
=>
p
.
provideTextContent
(
resource
));
const
factories
=
providers
.
map
(
p
=>
()
=>
p
.
provideTextContent
(
resource
));
...
@@ -100,7 +92,8 @@ export class TextModelResolverService implements ITextModelResolverService {
...
@@ -100,7 +92,8 @@ export class TextModelResolverService implements ITextModelResolverService {
constructor
(
constructor
(
@
ITextFileService
private
textFileService
:
ITextFileService
,
@
ITextFileService
private
textFileService
:
ITextFileService
,
@
IUntitledEditorService
private
untitledEditorService
:
IUntitledEditorService
,
@
IUntitledEditorService
private
untitledEditorService
:
IUntitledEditorService
,
@
IInstantiationService
instantiationService
:
IInstantiationService
@
IInstantiationService
private
instantiationService
:
IInstantiationService
,
@
IModelService
private
modelService
:
IModelService
)
{
)
{
this
.
resourceModelCollection
=
instantiationService
.
createInstance
(
ResourceModelCollection
);
this
.
resourceModelCollection
=
instantiationService
.
createInstance
(
ResourceModelCollection
);
}
}
...
@@ -133,6 +126,18 @@ export class TextModelResolverService implements ITextModelResolverService {
...
@@ -133,6 +126,18 @@ export class TextModelResolverService implements ITextModelResolverService {
.
then
(
model
=>
new
ImmortalReference
(
model
));
.
then
(
model
=>
new
ImmortalReference
(
model
));
}
}
// InMemory Schema: go through model service cache
// TODO ImmortalReference is a hack
if
(
resource
.
scheme
===
'
inmemory
'
)
{
const
cachedModel
=
this
.
modelService
.
getModel
(
resource
);
if
(
!
cachedModel
)
{
return
TPromise
.
wrapError
(
'
Cant resolve inmemory resource
'
);
}
return
TPromise
.
as
(
new
ImmortalReference
(
this
.
instantiationService
.
createInstance
(
ResourceEditorModel
,
resource
)));
}
const
ref
=
this
.
resourceModelCollection
.
acquire
(
resource
.
toString
());
const
ref
=
this
.
resourceModelCollection
.
acquire
(
resource
.
toString
());
return
ref
.
object
.
then
(
model
=>
({
object
:
model
,
dispose
:
()
=>
ref
.
dispose
()
}));
return
ref
.
object
.
then
(
model
=>
({
object
:
model
,
dispose
:
()
=>
ref
.
dispose
()
}));
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录