Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
346b230f
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,发现更多精彩内容 >>
提交
346b230f
编写于
12月 10, 2018
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove TPromise.wrapError
related to #63897
上级
a1d8f25b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
15 deletion
+13
-15
src/vs/editor/common/services/resolverService.ts
src/vs/editor/common/services/resolverService.ts
+1
-2
src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
...ices/textmodelResolver/common/textModelResolverService.ts
+12
-13
未找到文件。
src/vs/editor/common/services/resolverService.ts
浏览文件 @
346b230f
...
...
@@ -5,7 +5,6 @@
import
{
IDisposable
,
IReference
}
from
'
vs/base/common/lifecycle
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
ITextModel
}
from
'
vs/editor/common/model
'
;
import
{
IEditorModel
}
from
'
vs/platform/editor/common/editor
'
;
import
{
createDecorator
}
from
'
vs/platform/instantiation/common/instantiation
'
;
...
...
@@ -19,7 +18,7 @@ export interface ITextModelService {
* Provided a resource URI, it will return a model reference
* which should be disposed once not needed anymore.
*/
createModelReference
(
resource
:
URI
):
T
Promis
e
<
IReference
<
ITextEditorModel
>>
;
createModelReference
(
resource
:
URI
):
T
henabl
e
<
IReference
<
ITextEditorModel
>>
;
/**
* Registers a specific `scheme` content provider.
...
...
src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
浏览文件 @
346b230f
...
...
@@ -3,7 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
first
}
from
'
vs/base/common/async
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
...
...
@@ -18,7 +17,7 @@ import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/un
import
{
TextFileEditorModel
}
from
'
vs/workbench/services/textfile/common/textFileEditorModel
'
;
import
{
IFileService
}
from
'
vs/platform/files/common/files
'
;
class
ResourceModelCollection
extends
ReferenceCollection
<
T
Promis
e
<
ITextEditorModel
>>
{
class
ResourceModelCollection
extends
ReferenceCollection
<
T
henabl
e
<
ITextEditorModel
>>
{
private
providers
:
{
[
scheme
:
string
]:
ITextModelContentProvider
[]
}
=
Object
.
create
(
null
);
private
modelsToDispose
=
new
Set
<
string
>
();
...
...
@@ -31,7 +30,7 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo
super
();
}
createReferencedObject
(
key
:
string
,
skipActivateProvider
?:
boolean
):
T
Promis
e
<
ITextEditorModel
>
{
createReferencedObject
(
key
:
string
,
skipActivateProvider
?:
boolean
):
T
henabl
e
<
ITextEditorModel
>
{
this
.
modelsToDispose
.
delete
(
key
);
const
resource
=
URI
.
parse
(
key
);
...
...
@@ -51,10 +50,10 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo
return
this
.
fileService
.
activateProvider
(
resource
.
scheme
).
then
(()
=>
this
.
createReferencedObject
(
key
,
true
));
}
return
TPromise
.
wrapError
<
ITextEditorModel
>
(
new
Error
(
'
resource is not available
'
));
return
Promise
.
reject
(
new
Error
(
'
resource is not available
'
));
}
destroyReferencedObject
(
key
:
string
,
modelPromise
:
T
Promis
e
<
ITextEditorModel
>
):
void
{
destroyReferencedObject
(
key
:
string
,
modelPromise
:
T
henabl
e
<
ITextEditorModel
>
):
void
{
this
.
modelsToDispose
.
add
(
key
);
modelPromise
.
then
(
model
=>
{
...
...
@@ -97,14 +96,14 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo
});
}
private
resolveTextModelContent
(
key
:
string
):
T
Promis
e
<
ITextModel
>
{
private
resolveTextModelContent
(
key
:
string
):
T
henabl
e
<
ITextModel
>
{
const
resource
=
URI
.
parse
(
key
);
const
providers
=
this
.
providers
[
resource
.
scheme
]
||
[];
const
factories
=
providers
.
map
(
p
=>
()
=>
TPromise
.
wrap
(
p
.
provideTextContent
(
resource
)));
const
factories
=
providers
.
map
(
p
=>
()
=>
Promise
.
resolve
(
p
.
provideTextContent
(
resource
)));
return
first
(
factories
).
then
(
model
=>
{
if
(
!
model
)
{
return
TPromise
.
wrapError
<
ITextModel
>
(
new
Error
(
'
resource is not available
'
));
return
Promise
.
reject
(
new
Error
(
'
resource is not available
'
));
}
return
model
;
...
...
@@ -126,11 +125,11 @@ export class TextModelResolverService implements ITextModelService {
this
.
resourceModelCollection
=
instantiationService
.
createInstance
(
ResourceModelCollection
);
}
createModelReference
(
resource
:
URI
):
T
Promis
e
<
IReference
<
ITextEditorModel
>>
{
createModelReference
(
resource
:
URI
):
T
henabl
e
<
IReference
<
ITextEditorModel
>>
{
return
this
.
_createModelReference
(
resource
);
}
private
_createModelReference
(
resource
:
URI
):
T
Promis
e
<
IReference
<
ITextEditorModel
>>
{
private
_createModelReference
(
resource
:
URI
):
T
henabl
e
<
IReference
<
ITextEditorModel
>>
{
// Untitled Schema: go through cached input
if
(
resource
.
scheme
===
network
.
Schemas
.
untitled
)
{
...
...
@@ -142,10 +141,10 @@ export class TextModelResolverService implements ITextModelService {
const
cachedModel
=
this
.
modelService
.
getModel
(
resource
);
if
(
!
cachedModel
)
{
return
TPromise
.
wrapError
<
IReference
<
ITextEditorModel
>>
(
new
Error
(
'
Cant resolve inmemory resource
'
));
return
Promise
.
reject
(
new
Error
(
'
Cant resolve inmemory resource
'
));
}
return
TPromise
.
as
(
new
ImmortalReference
(
this
.
instantiationService
.
createInstance
(
ResourceEditorModel
,
resource
)));
return
Promise
.
resolve
(
new
ImmortalReference
(
this
.
instantiationService
.
createInstance
(
ResourceEditorModel
,
resource
)));
}
const
ref
=
this
.
resourceModelCollection
.
acquire
(
resource
.
toString
());
...
...
@@ -155,7 +154,7 @@ export class TextModelResolverService implements ITextModelService {
err
=>
{
ref
.
dispose
();
return
TPromise
.
wrapError
<
IReference
<
ITextEditorModel
>>
(
err
);
return
Promise
.
reject
(
err
);
}
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录