Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
9496bb79
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,发现更多精彩内容 >>
提交
9496bb79
编写于
10月 01, 2018
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debt - replace asThenable with Promise.resolve
上级
75968799
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
6 addition
and
17 deletion
+6
-17
src/vs/base/common/async.ts
src/vs/base/common/async.ts
+0
-8
src/vs/editor/contrib/folding/syntaxRangeProvider.ts
src/vs/editor/contrib/folding/syntaxRangeProvider.ts
+2
-3
src/vs/editor/standalone/browser/standaloneLanguages.ts
src/vs/editor/standalone/browser/standaloneLanguages.ts
+3
-4
src/vs/workbench/api/node/extHostTextEditors.ts
src/vs/workbench/api/node/extHostTextEditors.ts
+1
-2
未找到文件。
src/vs/base/common/async.ts
浏览文件 @
9496bb79
...
...
@@ -16,14 +16,6 @@ export function isThenable<T>(obj: any): obj is Thenable<T> {
return
obj
&&
typeof
(
<
Thenable
<
any
>>
obj
).
then
===
'
function
'
;
}
export
function
toThenable
<
T
>
(
arg
:
T
|
Thenable
<
T
>
):
Thenable
<
T
>
{
if
(
isThenable
(
arg
))
{
return
arg
;
}
else
{
return
TPromise
.
as
(
arg
);
}
}
export
interface
CancelablePromise
<
T
>
extends
Promise
<
T
>
{
cancel
():
void
;
}
...
...
src/vs/editor/contrib/folding/syntaxRangeProvider.ts
浏览文件 @
9496bb79
...
...
@@ -7,7 +7,6 @@
import
{
FoldingRangeProvider
,
FoldingRange
,
FoldingContext
}
from
'
vs/editor/common/modes
'
;
import
{
onUnexpectedExternalError
}
from
'
vs/base/common/errors
'
;
import
{
toThenable
}
from
'
vs/base/common/async
'
;
import
{
ITextModel
}
from
'
vs/editor/common/model
'
;
import
{
RangeProvider
}
from
'
./folding
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
...
...
@@ -50,7 +49,7 @@ export class SyntaxRangeProvider implements RangeProvider {
function
collectSyntaxRanges
(
providers
:
FoldingRangeProvider
[],
model
:
ITextModel
,
cancellationToken
:
CancellationToken
):
Thenable
<
IFoldingRangeData
[]
|
null
>
{
let
rangeData
:
IFoldingRangeData
[]
=
null
;
let
promises
=
providers
.
map
((
provider
,
i
)
=>
{
return
toThenabl
e
(
provider
.
provideFoldingRanges
(
model
,
foldingContext
,
cancellationToken
)).
then
(
ranges
=>
{
return
Promise
.
resolv
e
(
provider
.
provideFoldingRanges
(
model
,
foldingContext
,
cancellationToken
)).
then
(
ranges
=>
{
if
(
cancellationToken
.
isCancellationRequested
)
{
return
;
}
...
...
@@ -187,4 +186,4 @@ export function sanitizeRanges(rangeData: IFoldingRangeData[], limit: number): F
}
}
return
collector
.
toIndentRanges
();
}
\ No newline at end of file
}
src/vs/editor/standalone/browser/standaloneLanguages.ts
浏览文件 @
9496bb79
...
...
@@ -16,7 +16,6 @@ import { LanguageConfiguration, IndentAction } from 'vs/editor/common/modes/lang
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
CancellationToken
}
from
'
vs/base/common/cancellation
'
;
import
{
toThenable
}
from
'
vs/base/common/async
'
;
import
{
compile
}
from
'
vs/editor/standalone/common/monarch/monarchCompile
'
;
import
{
createTokenizationSupport
}
from
'
vs/editor/standalone/common/monarch/monarchLexer
'
;
import
{
LanguageConfigurationRegistry
}
from
'
vs/editor/common/modes/languageConfigurationRegistry
'
;
...
...
@@ -352,7 +351,7 @@ export function registerHoverProvider(languageId: string, provider: modes.HoverP
provideHover
:
(
model
:
model
.
ITextModel
,
position
:
Position
,
token
:
CancellationToken
):
Thenable
<
modes
.
Hover
>
=>
{
let
word
=
model
.
getWordAtPosition
(
position
);
return
toThenabl
e
<
modes
.
Hover
>
(
provider
.
provideHover
(
model
,
position
,
token
)).
then
((
value
)
=>
{
return
Promise
.
resolv
e
<
modes
.
Hover
>
(
provider
.
provideHover
(
model
,
position
,
token
)).
then
((
value
)
=>
{
if
(
!
value
)
{
return
undefined
;
}
...
...
@@ -779,7 +778,7 @@ class SuggestAdapter {
provideCompletionItems
(
model
:
model
.
ITextModel
,
position
:
Position
,
context
:
modes
.
SuggestContext
,
token
:
CancellationToken
):
Thenable
<
modes
.
ISuggestResult
>
{
const
result
=
this
.
_provider
.
provideCompletionItems
(
model
,
position
,
token
,
context
);
return
toThenabl
e
<
CompletionItem
[]
|
CompletionList
>
(
result
).
then
(
value
=>
{
return
Promise
.
resolv
e
<
CompletionItem
[]
|
CompletionList
>
(
result
).
then
(
value
=>
{
const
result
:
modes
.
ISuggestResult
=
{
suggestions
:
[]
};
...
...
@@ -830,7 +829,7 @@ class SuggestAdapter {
return
TPromise
.
as
(
suggestion
);
}
return
toThenabl
e
(
this
.
_provider
.
resolveCompletionItem
(
item
,
token
)).
then
(
resolvedItem
=>
{
return
Promise
.
resolv
e
(
this
.
_provider
.
resolveCompletionItem
(
item
,
token
)).
then
(
resolvedItem
=>
{
let
wordStartPos
=
position
;
const
word
=
model
.
getWordUntilPosition
(
position
);
if
(
word
)
{
...
...
src/vs/workbench/api/node/extHostTextEditors.ts
浏览文件 @
9496bb79
...
...
@@ -5,7 +5,6 @@
'
use strict
'
;
import
{
Event
,
Emitter
}
from
'
vs/base/common/event
'
;
import
{
toThenable
}
from
'
vs/base/common/async
'
;
import
{
TextEditorSelectionChangeKind
}
from
'
./extHostTypes
'
;
import
*
as
TypeConverters
from
'
./extHostTypeConverters
'
;
import
{
TextEditorDecorationType
,
ExtHostTextEditor
}
from
'
./extHostTextEditor
'
;
...
...
@@ -149,6 +148,6 @@ export class ExtHostEditors implements ExtHostEditorsShape {
}
getDiffInformation
(
id
:
string
):
Thenable
<
vscode
.
LineChange
[]
>
{
return
toThenabl
e
(
this
.
_proxy
.
$getDiffInformation
(
id
));
return
Promise
.
resolv
e
(
this
.
_proxy
.
$getDiffInformation
(
id
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录