Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
df03c156
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,发现更多精彩内容 >>
提交
df03c156
编写于
7月 29, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
sort by severity when limiting diagnostics list, #9826
上级
db65d4aa
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
31 addition
and
4 deletion
+31
-4
src/vs/workbench/api/node/extHostDiagnostics.ts
src/vs/workbench/api/node/extHostDiagnostics.ts
+8
-2
src/vs/workbench/api/node/extHostTypes.ts
src/vs/workbench/api/node/extHostTypes.ts
+11
-0
src/vs/workbench/test/node/api/extHostDiagnostics.test.ts
src/vs/workbench/test/node/api/extHostDiagnostics.test.ts
+12
-2
未找到文件。
src/vs/workbench/api/node/extHostDiagnostics.ts
浏览文件 @
df03c156
...
...
@@ -10,6 +10,7 @@ import URI from 'vs/base/common/uri';
import
Severity
from
'
vs/base/common/severity
'
;
import
*
as
vscode
from
'
vscode
'
;
import
{
MainContext
,
MainThreadDiagnosticsShape
,
ExtHostDiagnosticsShape
}
from
'
./extHost.protocol
'
;
import
{
Diagnostic
}
from
'
./extHostTypes
'
;
export
class
DiagnosticCollection
implements
vscode
.
DiagnosticCollection
{
...
...
@@ -98,9 +99,14 @@ export class DiagnosticCollection implements vscode.DiagnosticCollection {
// no more than 250 diagnostics per file
if
(
diagnostics
.
length
>
DiagnosticCollection
.
_maxDiagnosticsPerFile
)
{
console
.
warn
(
'
diagnostics for %s will be capped to %d (actually is %d)
'
,
uri
.
toString
(),
DiagnosticCollection
.
_maxDiagnosticsPerFile
,
diagnostics
.
length
);
diagnostics
=
diagnostics
.
slice
(
0
,
DiagnosticCollection
.
_maxDiagnosticsPerFile
);
marker
=
[];
const
sorted
=
diagnostics
.
slice
(
0
).
sort
(
Diagnostic
.
compare
);
for
(
let
i
=
0
;
i
<
DiagnosticCollection
.
_maxDiagnosticsPerFile
;
i
++
)
{
marker
.
push
(
DiagnosticCollection
.
_toMarkerData
(
sorted
[
i
]));
}
}
else
{
marker
=
diagnostics
.
map
(
DiagnosticCollection
.
_toMarkerData
);
}
marker
=
diagnostics
.
map
(
DiagnosticCollection
.
_toMarkerData
);
}
entries
.
push
([
<
URI
>
uri
,
marker
]);
...
...
src/vs/workbench/api/node/extHostTypes.ts
浏览文件 @
df03c156
...
...
@@ -552,6 +552,17 @@ export class Diagnostic {
code
:
this
.
code
,
};
}
static
compare
(
a
:
vscode
.
Diagnostic
,
b
:
vscode
.
Diagnostic
):
number
{
let
ret
=
a
.
severity
-
b
.
severity
;
if
(
ret
===
0
)
{
ret
=
a
.
range
.
start
.
compareTo
(
b
.
range
.
start
);
}
if
(
ret
===
0
)
{
ret
=
a
.
message
.
localeCompare
(
b
.
message
);
}
return
ret
;
}
}
export
class
Hover
{
...
...
src/vs/workbench/test/node/api/extHostDiagnostics.test.ts
浏览文件 @
df03c156
...
...
@@ -7,8 +7,9 @@
import
*
as
assert
from
'
assert
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
Severity
from
'
vs/base/common/severity
'
;
import
{
DiagnosticCollection
}
from
'
vs/workbench/api/node/extHostDiagnostics
'
;
import
{
Diagnostic
,
Range
}
from
'
vs/workbench/api/node/extHostTypes
'
;
import
{
Diagnostic
,
DiagnosticSeverity
,
Range
}
from
'
vs/workbench/api/node/extHostTypes
'
;
import
{
MainThreadDiagnosticsShape
}
from
'
vs/workbench/api/node/extHost.protocol
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
IMarkerData
}
from
'
vs/platform/markers/common/markers
'
;
...
...
@@ -170,9 +171,18 @@ suite('ExtHostDiagnostics', () => {
});
let
uri
=
URI
.
parse
(
'
aa:bb
'
);
collection
.
set
(
uri
,
new
Array
(
500
).
map
((
value
,
i
)
=>
new
Diagnostic
(
new
Range
(
i
,
0
,
i
+
1
,
0
),
`error#
${
i
}
`
)));
let
diagnostics
:
Diagnostic
[]
=
[];
for
(
let
i
=
0
;
i
<
500
;
i
++
)
{
diagnostics
.
push
(
new
Diagnostic
(
new
Range
(
i
,
0
,
i
+
1
,
0
),
`error#
${
i
}
`
,
i
<
300
?
DiagnosticSeverity
.
Warning
:
DiagnosticSeverity
.
Error
));
}
collection
.
set
(
uri
,
diagnostics
);
assert
.
equal
(
collection
.
get
(
uri
).
length
,
500
);
assert
.
equal
(
lastEntries
.
length
,
1
);
assert
.
equal
(
lastEntries
[
0
][
1
].
length
,
250
);
assert
.
equal
(
lastEntries
[
0
][
1
][
0
].
severity
,
Severity
.
Error
);
assert
.
equal
(
lastEntries
[
0
][
1
][
200
].
severity
,
Severity
.
Warning
);
});
});
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录