Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
b04aed0f
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,发现更多精彩内容 >>
提交
b04aed0f
编写于
1月 27, 2017
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'joh/next'
上级
91da4276
b680dbb3
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
20 addition
and
14 deletion
+20
-14
src/vs/base/common/winjs.base.d.ts
src/vs/base/common/winjs.base.d.ts
+10
-5
src/vs/editor/common/modes.ts
src/vs/editor/common/modes.ts
+0
-3
src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts
...editor/contrib/goToDeclaration/browser/goToDeclaration.ts
+1
-1
src/vs/editor/contrib/suggest/common/completionModel.ts
src/vs/editor/contrib/suggest/common/completionModel.ts
+4
-5
src/vs/monaco.d.ts
src/vs/monaco.d.ts
+5
-0
未找到文件。
src/vs/base/common/winjs.base.d.ts
浏览文件 @
b04aed0f
...
...
@@ -28,17 +28,17 @@ export declare class Promise {
static
join
(
promises
:
{
[
name
:
string
]:
Promise
;
}):
Promise
;
static
join
(
promises
:
Promise
[]):
Promise
;
static
any
(
promises
:
Promise
[]):
Promise
;
//
static any(promises: Promise[]): Promise;
// commented out to speed up adoption of TPromise
// static timeout(delay:number):Promise;
static
wrapError
(
error
:
any
):
Promise
;
static
is
(
value
:
any
):
value
is
Thenable
<
any
>
;
static
addEventListener
(
type
:
string
,
fn
:
EventCallback
):
void
;
//
static is(value: any): value is Thenable<any>;
//
static addEventListener(type: string, fn: EventCallback): void;
public
then
(
success
?:
ValueCallback
,
error
?:
ErrorCallback
,
progress
?:
ProgressCallback
):
Promise
;
public
then
<
U
>
(
success
?:
ValueCallback
,
error
?:
ErrorCallback
,
progress
?:
ProgressCallback
):
TPromise
<
U
>
;
//
public then<U>(success?: ValueCallback, error?: ErrorCallback, progress?: ProgressCallback): TPromise<U>;
public
done
(
success
?:
ValueCallback
,
error
?:
ErrorCallback
,
progress
?:
ProgressCallback
):
void
;
public
cancel
():
void
;
}
...
...
@@ -78,7 +78,12 @@ export declare class TPromise<V> {
public
done
(
success
?:
(
value
:
V
)
=>
void
,
error
?:
(
err
:
any
)
=>
any
,
progress
?:
ProgressCallback
):
void
;
public
cancel
():
void
;
public
static
as
(
value
:
null
):
TPromise
<
null
>
;
public
static
as
(
value
:
undefined
):
TPromise
<
undefined
>
;
public
static
as
<
ValueType
>
(
value
:
TPromise
<
ValueType
>
):
TPromise
<
ValueType
>
;
public
static
as
<
ValueType
>
(
value
:
Thenable
<
ValueType
>
):
Thenable
<
ValueType
>
;
public
static
as
<
ValueType
>
(
value
:
ValueType
):
TPromise
<
ValueType
>
;
public
static
is
(
value
:
any
):
value
is
Thenable
<
any
>
;
public
static
timeout
(
delay
:
number
):
TPromise
<
void
>
;
public
static
join
<
ValueType
>
(
promises
:
TPromise
<
ValueType
>
[]):
TPromise
<
ValueType
[]
>
;
...
...
@@ -113,4 +118,4 @@ export declare class PPromise<C, P> extends TPromise<C> {
public
static
join
<
C
,
P
>
(
promises
:
{
[
n
:
string
]:
PPromise
<
C
,
P
>
}):
PPromise
<
{
[
n
:
string
]:
C
},
P
>
;
public
static
any
<
C
,
P
>
(
promises
:
PPromise
<
C
,
P
>
[]):
PPromise
<
{
key
:
string
;
value
:
PPromise
<
C
,
P
>
;
},
P
>
;
public
static
wrapError
<
V
>
(
error
:
any
):
TPromise
<
V
>
;
}
\ No newline at end of file
}
src/vs/editor/common/modes.ts
浏览文件 @
b04aed0f
...
...
@@ -7,7 +7,6 @@
import
{
MarkedString
}
from
'
vs/base/common/htmlContent
'
;
import
{
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
IFilter
}
from
'
vs/base/common/filters
'
;
import
*
as
editorCommon
from
'
vs/editor/common/editorCommon
'
;
import
{
TokenizationResult
,
TokenizationResult2
}
from
'
vs/editor/common/core/token
'
;
import
LanguageFeatureRegistry
from
'
vs/editor/common/modes/languageFeatureRegistry
'
;
...
...
@@ -237,8 +236,6 @@ export interface ISuggestSupport {
triggerCharacters
:
string
[];
filter
?:
IFilter
;
provideCompletionItems
(
model
:
editorCommon
.
IReadOnlyModel
,
position
:
Position
,
token
:
CancellationToken
):
ISuggestResult
|
Thenable
<
ISuggestResult
>
;
resolveCompletionItem
?(
model
:
editorCommon
.
IReadOnlyModel
,
position
:
Position
,
item
:
ISuggestion
,
token
:
CancellationToken
):
ISuggestion
|
Thenable
<
ISuggestion
>
;
...
...
src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts
浏览文件 @
b04aed0f
...
...
@@ -373,7 +373,7 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC
this
.
throttler
.
queue
(()
=>
{
return
state
.
validate
(
this
.
editor
)
?
this
.
findDefinition
(
mouseEvent
.
target
)
:
TPromise
.
as
(
null
);
:
TPromise
.
as
<
Location
[]
>
(
null
);
}).
then
(
results
=>
{
if
(
!
results
||
!
results
.
length
||
!
state
.
validate
(
this
.
editor
))
{
...
...
src/vs/editor/contrib/suggest/common/completionModel.ts
浏览文件 @
b04aed0f
...
...
@@ -110,8 +110,7 @@ export class CompletionModel {
for
(
const
item
of
this
.
_items
)
{
const
{
suggestion
,
support
,
container
}
=
item
;
const
filter
=
support
&&
support
.
filter
||
fuzzyContiguousFilter
;
const
{
suggestion
,
container
}
=
item
;
// collect those supports that signaled having
// an incomplete result
...
...
@@ -128,17 +127,17 @@ export class CompletionModel {
let
match
=
false
;
// compute highlights based on 'label'
item
.
highlights
=
filter
(
word
,
suggestion
.
label
);
item
.
highlights
=
f
uzzyContiguousF
ilter
(
word
,
suggestion
.
label
);
match
=
item
.
highlights
!==
null
;
// no match on label nor codeSnippet -> check on filterText
if
(
!
match
&&
typeof
suggestion
.
filterText
===
'
string
'
)
{
if
(
!
isFalsyOrEmpty
(
filter
(
word
,
suggestion
.
filterText
)))
{
if
(
!
isFalsyOrEmpty
(
f
uzzyContiguousF
ilter
(
word
,
suggestion
.
filterText
)))
{
match
=
true
;
// try to compute highlights by stripping none-word
// characters from the end of the string
item
.
highlights
=
filter
(
word
.
replace
(
/^
\W
+|
\W
+$/
,
''
),
suggestion
.
label
);
item
.
highlights
=
f
uzzyContiguousF
ilter
(
word
.
replace
(
/^
\W
+|
\W
+$/
,
''
),
suggestion
.
label
);
}
}
...
...
src/vs/monaco.d.ts
浏览文件 @
b04aed0f
...
...
@@ -74,7 +74,12 @@ declare module monaco {
public
done
(
success
?:
(
value
:
V
)
=>
void
,
error
?:
(
err
:
any
)
=>
any
,
progress
?:
ProgressCallback
):
void
;
public
cancel
():
void
;
public
static
as
(
value
:
null
):
Promise
<
null
>
;
public
static
as
(
value
:
undefined
):
Promise
<
undefined
>
;
public
static
as
<
ValueType
>
(
value
:
Promise
<
ValueType
>
):
Promise
<
ValueType
>
;
public
static
as
<
ValueType
>
(
value
:
Thenable
<
ValueType
>
):
Thenable
<
ValueType
>
;
public
static
as
<
ValueType
>
(
value
:
ValueType
):
Promise
<
ValueType
>
;
public
static
is
(
value
:
any
):
value
is
Thenable
<
any
>
;
public
static
timeout
(
delay
:
number
):
Promise
<
void
>
;
public
static
join
<
ValueType
>
(
promises
:
Promise
<
ValueType
>
[]):
Promise
<
ValueType
[]
>
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录