Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
4f3f9ecf
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4f3f9ecf
编写于
5月 19, 2016
作者:
N
Nick Guerrera
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Respond to PR feedback
上级
82e584e9
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
31 addition
and
17 deletion
+31
-17
src/Compilers/Core/Portable/CommandLine/ErrorLogger.cs
src/Compilers/Core/Portable/CommandLine/ErrorLogger.cs
+31
-17
未找到文件。
src/Compilers/Core/Portable/CommandLine/ErrorLogger.cs
浏览文件 @
4f3f9ecf
...
@@ -164,12 +164,14 @@ private static string GetUri(string path)
...
@@ -164,12 +164,14 @@ private static string GetUri(string path)
Uri
uri
;
Uri
uri
;
if
(
Uri
.
TryCreate
(
path
,
UriKind
.
Absolute
,
out
uri
))
if
(
Uri
.
TryCreate
(
path
,
UriKind
.
Absolute
,
out
uri
))
{
{
// Note that URI.ToString() does not, for example, escape spaces to %20.
// We use Uri.AbsoluteUri and not Uri.ToString() because Uri.ToString()
// is unescaped (e.g. spaces remain unreplaced by %20) and therefore
// not well-formed.
return
uri
.
AbsoluteUri
;
return
uri
.
AbsoluteUri
;
}
}
// First fallback attempt:
interpret as relative reference if possible
// First fallback attempt:
attempt to interpret as relative path/URI.
// (
perhaps the resolver works that way).
// (
Perhaps the resolver works that way.)
if
(
Uri
.
TryCreate
(
path
,
UriKind
.
Relative
,
out
uri
))
if
(
Uri
.
TryCreate
(
path
,
UriKind
.
Relative
,
out
uri
))
{
{
// There is no AbsoluteUri equivalent for relative URI references and ToString()
// There is no AbsoluteUri equivalent for relative URI references and ToString()
...
@@ -177,7 +179,7 @@ private static string GetUri(string path)
...
@@ -177,7 +179,7 @@ private static string GetUri(string path)
return
_fileRoot
.
MakeRelativeUri
(
new
Uri
(
_fileRoot
,
uri
)).
ToString
();
return
_fileRoot
.
MakeRelativeUri
(
new
Uri
(
_fileRoot
,
uri
)).
ToString
();
}
}
// Last resort: UrlEncode the whole opaque string
as a relative reference with one part
.
// Last resort: UrlEncode the whole opaque string.
return
System
.
Net
.
WebUtility
.
UrlEncode
(
path
);
return
System
.
Net
.
WebUtility
.
UrlEncode
(
path
);
}
}
...
@@ -393,8 +395,18 @@ public string Add(DiagnosticDescriptor descriptor)
...
@@ -393,8 +395,18 @@ public string Add(DiagnosticDescriptor descriptor)
/// <summary>
/// <summary>
/// Compares descriptors by the values that we write to the log and nothing else.
/// Compares descriptors by the values that we write to the log and nothing else.
///
///
/// We cannot use the IEquatable implementation because it includes message format
/// We cannot just use <see cref="DiagnosticDescriptor"/>'s built-in implementation
/// and we don't write it out. It also ignores tags, which we do write.
/// of <see cref="IEquatable{DiagnosticDescriptor}"/> for two reasons:
///
/// 1. <see cref="DiagnosticDescriptor.MessageFormat"/> is part of that built-in
/// equatability, but we do not write it out, and so descriptors differing only
/// by MessageFormat (common) would lead to duplicate rule metadata entries in
/// the log.
///
/// 2. <see cref="DiagnosticDescriptor.CustomTags"/> is *not* part of that built-in
/// equatability, but we do write them out, and so descriptors differening only
/// by CustomTags (rare) would cause only one set of tags to be reported in the
/// log.
/// </summary>
/// </summary>
private
sealed
class
Comparer
:
IEqualityComparer
<
DiagnosticDescriptor
>
private
sealed
class
Comparer
:
IEqualityComparer
<
DiagnosticDescriptor
>
{
{
...
@@ -410,6 +422,10 @@ public bool Equals(DiagnosticDescriptor x, DiagnosticDescriptor y)
...
@@ -410,6 +422,10 @@ public bool Equals(DiagnosticDescriptor x, DiagnosticDescriptor y)
return
false
;
return
false
;
}
}
// The properties are guaranteed to be non-null by DiagnosticDescriptor invariants.
Debug
.
Assert
(
x
.
Description
!=
null
&&
x
.
Title
!=
null
&&
x
.
CustomTags
!=
null
);
Debug
.
Assert
(
y
.
Description
!=
null
&&
y
.
Title
!=
null
&&
y
.
CustomTags
!=
null
);
return
(
x
.
Category
==
y
.
Category
return
(
x
.
Category
==
y
.
Category
&&
x
.
DefaultSeverity
==
y
.
DefaultSeverity
&&
x
.
DefaultSeverity
==
y
.
DefaultSeverity
&&
x
.
Description
.
Equals
(
y
.
Description
)
&&
x
.
Description
.
Equals
(
y
.
Description
)
...
@@ -427,20 +443,18 @@ public int GetHashCode(DiagnosticDescriptor obj)
...
@@ -427,20 +443,18 @@ public int GetHashCode(DiagnosticDescriptor obj)
return
0
;
return
0
;
}
}
int
hash
=
Hash
.
Combine
(
obj
.
Category
.
GetHashCode
(),
// The properties are guaranteed to be non-null by DiagnosticDescriptor invariants.
Debug
.
Assert
(
obj
.
Category
!=
null
&&
obj
.
Description
!=
null
&&
obj
.
HelpLinkUri
!=
null
&&
obj
.
Id
!=
null
&&
obj
.
Title
!=
null
&&
obj
.
CustomTags
!=
null
);
return
Hash
.
Combine
(
obj
.
Category
.
GetHashCode
(),
Hash
.
Combine
(
obj
.
DefaultSeverity
.
GetHashCode
(),
Hash
.
Combine
(
obj
.
DefaultSeverity
.
GetHashCode
(),
Hash
.
Combine
(
obj
.
Description
.
GetHashCode
(),
Hash
.
Combine
(
obj
.
Description
.
GetHashCode
(),
Hash
.
Combine
(
obj
.
HelpLinkUri
.
GetHashCode
(),
Hash
.
Combine
(
obj
.
HelpLinkUri
.
GetHashCode
(),
Hash
.
Combine
(
obj
.
Id
.
GetHashCode
(),
Hash
.
Combine
(
obj
.
Id
.
GetHashCode
(),
Hash
.
Combine
(
obj
.
IsEnabledByDefault
.
GetHashCode
(),
Hash
.
Combine
(
obj
.
IsEnabledByDefault
.
GetHashCode
(),
obj
.
Title
.
GetHashCode
()))))));
Hash
.
Combine
(
obj
.
Title
.
GetHashCode
(),
Hash
.
CombineValues
(
obj
.
CustomTags
))))))));
foreach
(
string
tag
in
obj
.
CustomTags
)
{
hash
=
Hash
.
Combine
(
tag
,
hash
);
}
return
hash
;
}
}
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录