Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
8cdf377b
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,发现更多精彩内容 >>
提交
8cdf377b
编写于
4月 08, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add DiagnosticsCollection#has and #get
上级
aeb52ceb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
89 addition
and
5 deletion
+89
-5
extensions/vscode-api-tests/src/languages.test.ts
extensions/vscode-api-tests/src/languages.test.ts
+29
-1
src/vs/vscode.d.ts
src/vs/vscode.d.ts
+18
-0
src/vs/workbench/api/node/extHostDiagnostics.ts
src/vs/workbench/api/node/extHostDiagnostics.ts
+42
-4
未找到文件。
extensions/vscode-api-tests/src/languages.test.ts
浏览文件 @
8cdf377b
...
...
@@ -10,7 +10,7 @@ import {languages, Uri, Diagnostic, Range} from 'vscode';
suite
(
'
languages namespace tests
'
,
()
=>
{
test
(
'
diagnostic collection
'
,
function
()
{
test
(
'
diagnostic collection
, forEach, clear, has
'
,
function
()
{
let
collection
=
languages
.
createDiagnosticCollection
(
'
test
'
);
assert
.
equal
(
collection
.
name
,
'
test
'
);
collection
.
dispose
();
...
...
@@ -43,5 +43,33 @@ suite('languages namespace tests', () => {
]);
collection
.
forEach
(()
=>
c
++
);
assert
.
equal
(
c
,
2
);
assert
.
ok
(
collection
.
has
(
Uri
.
parse
(
'
foo:bar1
'
)));
assert
.
ok
(
collection
.
has
(
Uri
.
parse
(
'
foo:bar2
'
)));
assert
.
ok
(
!
collection
.
has
(
Uri
.
parse
(
'
foo:bar3
'
)));
collection
.
delete
(
Uri
.
parse
(
'
foo:bar1
'
));
assert
.
ok
(
!
collection
.
has
(
Uri
.
parse
(
'
foo:bar1
'
)));
});
test
(
'
diagnostic collection, immutable read
'
,
function
()
{
let
collection
=
languages
.
createDiagnosticCollection
(
'
test
'
);
collection
.
set
(
Uri
.
parse
(
'
foo:bar
'
),
[
new
Diagnostic
(
new
Range
(
0
,
0
,
1
,
1
),
'
message-1
'
),
new
Diagnostic
(
new
Range
(
0
,
0
,
1
,
1
),
'
message-2
'
)
]);
let
array
=
collection
.
get
(
Uri
.
parse
(
'
foo:bar
'
));
assert
.
throws
(()
=>
array
.
length
=
0
);
assert
.
throws
(()
=>
array
.
pop
());
assert
.
throws
(()
=>
array
[
0
]
=
new
Diagnostic
(
new
Range
(
0
,
0
,
0
,
0
),
'
evil
'
));
collection
.
forEach
((
uri
,
array
)
=>
{
assert
.
throws
(()
=>
array
.
length
=
0
);
assert
.
throws
(()
=>
array
.
pop
());
assert
.
throws
(()
=>
array
[
0
]
=
new
Diagnostic
(
new
Range
(
0
,
0
,
0
,
0
),
'
evil
'
));
});
array
=
collection
.
get
(
Uri
.
parse
(
'
foo:bar
'
));
assert
.
equal
(
array
.
length
,
2
);
});
});
\ No newline at end of file
src/vs/vscode.d.ts
浏览文件 @
8cdf377b
...
...
@@ -2509,6 +2509,24 @@ declare namespace vscode {
*/
forEach
(
callback
:
(
uri
:
Uri
,
diagnostics
:
Diagnostic
[],
collection
:
DiagnosticCollection
)
=>
any
,
thisArg
?:
any
):
void
;
/**
* Get the diagnostics for a given resource. *Note* that you cannot
* modify the diagnostics-array returned from this call.
*
* @param uri A resource identifier.
* @returns An immutable array of [diagnostics](#Diagnostic) or `undefined`.
*/
get
(
uri
:
Uri
):
Diagnostic
[];
/**
* Check if this collection contains diagnostics for a
* given resource.
*
* @param uri A resource identifier.
* @returns `true` if this collection has diagnostic for the given resource.
*/
has
(
uri
:
Uri
):
boolean
;
/**
* Dispose and free associated resources. Calls
* [clear](#DiagnosticCollection.clear).
...
...
src/vs/workbench/api/node/extHostDiagnostics.ts
浏览文件 @
8cdf377b
...
...
@@ -11,7 +11,7 @@ import {TPromise} from 'vs/base/common/winjs.base';
import
Severity
from
'
vs/base/common/severity
'
;
import
*
as
vscode
from
'
vscode
'
;
class
DiagnosticCollection
implements
vscode
.
DiagnosticCollection
{
export
class
DiagnosticCollection
implements
vscode
.
DiagnosticCollection
{
private
static
_maxDiagnosticsPerFile
:
number
=
250
;
...
...
@@ -113,10 +113,24 @@ class DiagnosticCollection implements vscode.DiagnosticCollection {
forEach
(
callback
:
(
uri
:
URI
,
diagnostics
:
vscode
.
Diagnostic
[],
collection
:
DiagnosticCollection
)
=>
any
,
thisArg
?:
any
):
void
{
this
.
_checkDisposed
();
for
(
let
key
in
this
.
_data
)
{
callback
.
apply
(
thisArg
,
[
URI
.
parse
(
key
),
this
.
_data
[
key
],
this
]);
let
uri
=
URI
.
parse
(
key
);
callback
.
apply
(
thisArg
,
[
uri
,
this
.
get
(
uri
),
this
]);
}
}
get
(
uri
:
URI
):
vscode
.
Diagnostic
[]
{
this
.
_checkDisposed
();
let
result
=
this
.
_data
[
uri
.
toString
()];
if
(
Array
.
isArray
(
result
))
{
return
Object
.
freeze
(
result
.
slice
(
0
));
}
}
has
(
uri
:
URI
):
boolean
{
this
.
_checkDisposed
();
return
Array
.
isArray
(
this
.
_data
[
uri
.
toString
()]);
}
private
_checkDisposed
()
{
if
(
this
.
_isDisposed
)
{
throw
new
Error
(
'
illegal state - object is disposed
'
);
...
...
@@ -150,20 +164,44 @@ class DiagnosticCollection implements vscode.DiagnosticCollection {
}
}
@
Remotable
.
ExtHostContext
(
'
ExtHostDiagnostics
'
)
export
class
ExtHostDiagnostics
{
private
static
_idPool
:
number
=
0
;
private
_proxy
:
MainThreadDiagnostics
;
private
_collections
:
DiagnosticCollection
[];
constructor
(
threadService
:
IThreadService
)
{
constructor
(
@
IThreadService
threadService
:
IThreadService
)
{
this
.
_proxy
=
threadService
.
getRemotable
(
MainThreadDiagnostics
);
this
.
_collections
=
[];
}
createDiagnosticCollection
(
name
:
string
):
vscode
.
DiagnosticCollection
{
if
(
!
name
)
{
name
=
'
_generated_diagnostic_collection_name_#
'
+
ExtHostDiagnostics
.
_idPool
++
;
}
return
new
DiagnosticCollection
(
name
,
this
.
_proxy
);
const
{
_collections
,
_proxy
}
=
this
;
const
result
=
new
class
extends
DiagnosticCollection
{
constructor
()
{
super
(
name
,
_proxy
);
_collections
.
push
(
this
);
}
dispose
()
{
super
.
dispose
();
let
idx
=
_collections
.
indexOf
(
this
);
if
(
idx
!==
-
1
)
{
_collections
.
splice
(
idx
,
1
);
}
}
};
return
result
;
}
forEach
(
callback
:
(
collection
:
DiagnosticCollection
)
=>
any
):
void
{
this
.
_collections
.
forEach
(
callback
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录