Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
bdb3e5fd
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,发现更多精彩内容 >>
提交
bdb3e5fd
编写于
6月 01, 2020
作者:
C
Cyrus Najmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
properly walk in reverse
上级
6a62b685
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
66 addition
and
9 deletion
+66
-9
src/Workspaces/Core/Portable/SymbolKey/SymbolKey.ErrorTypeSymbolKey.cs
...s/Core/Portable/SymbolKey/SymbolKey.ErrorTypeSymbolKey.cs
+14
-7
src/Workspaces/CoreTest/SymbolKeyTests.cs
src/Workspaces/CoreTest/SymbolKeyTests.cs
+52
-2
未找到文件。
src/Workspaces/Core/Portable/SymbolKey/SymbolKey.ErrorTypeSymbolKey.cs
浏览文件 @
bdb3e5fd
...
...
@@ -23,7 +23,7 @@ public static void Create(INamedTypeSymbol symbol, SymbolKeyWriter visitor)
break
;
case
INamespaceSymbol
parentNamespace
:
visitor
.
WriteInteger
(
1
);
visitor
.
WriteStringArray
(
GetContainingNamespaceNames
(
parentNamespace
));
visitor
.
WriteStringArray
(
GetContainingNamespaceNames
InReverse
(
parentNamespace
));
break
;
default
:
// writing out `null` here is technically unnecessary. However, it makes it easier to
...
...
@@ -45,7 +45,11 @@ public static void Create(INamedTypeSymbol symbol, SymbolKeyWriter visitor)
}
}
private
static
ImmutableArray
<
string
>
GetContainingNamespaceNames
(
INamespaceSymbol
namespaceSymbol
)
/// <summary>
/// For a symbol like <c>System.Collections.Generic.IEnumerable</c>, this would produce <c>"Generic",
/// "Collections", "System"</c>
/// </summary>
private
static
ImmutableArray
<
string
>
GetContainingNamespaceNamesInReverse
(
INamespaceSymbol
namespaceSymbol
)
{
using
var
_
=
ArrayBuilder
<
string
>.
GetInstance
(
out
var
builder
);
while
(
namespaceSymbol
!=
null
&&
namespaceSymbol
.
Name
!=
""
)
...
...
@@ -96,13 +100,16 @@ private static SymbolKeyResolution ResolveContainer(SymbolKeyReader reader)
case
0
:
return
reader
.
ReadSymbolKey
();
case
1
:
var
namespaceNames
=
reader
.
ReadStringArray
();
var
currentNamespace
=
reader
.
Compilation
.
GlobalNamespace
;
using
(
var
namespaceNames
=
reader
.
ReadStringArray
())
{
var
currentNamespace
=
reader
.
Compilation
.
GlobalNamespace
;
foreach
(
var
name
in
namespaceNames
)
currentNamespace
=
reader
.
Compilation
.
CreateErrorNamespaceSymbol
(
currentNamespace
,
name
);
// have to walk the namespaces in reverse because that's how we encoded them.
for
(
var
i
=
namespaceNames
.
Count
-
1
;
i
>=
0
;
i
--)
currentNamespace
=
reader
.
Compilation
.
CreateErrorNamespaceSymbol
(
currentNamespace
,
namespaceNames
[
i
]);
return
new
SymbolKeyResolution
(
currentNamespace
);
return
new
SymbolKeyResolution
(
currentNamespace
);
}
case
2
:
return
reader
.
ReadSymbolKey
();
default
:
...
...
src/Workspaces/CoreTest/SymbolKeyTests.cs
浏览文件 @
bdb3e5fd
...
...
@@ -793,8 +793,8 @@ class C
{
int i { get; }
}"
;
// Tuples store locations along with them. But we can only recover those locations
//
if we're re-resolving into a compilation with the same files
.
//
We don't add metadata references, so even `int` will be an error type
.
var
compilation1
=
GetCompilation
(
source
,
LanguageNames
.
CSharp
,
"File1.cs"
,
Array
.
Empty
<
MetadataReference
>());
var
compilation2
=
GetCompilation
(
source
,
LanguageNames
.
CSharp
,
"File2.cs"
,
Array
.
Empty
<
MetadataReference
>());
...
...
@@ -821,6 +821,56 @@ class C
Assert
.
True
(
SymbolEquivalenceComparer
.
Instance
.
Equals
(
propType
,
found
));
}
[
Fact
,
WorkItem
(
14365
,
"https://github.com/dotnet/roslyn/issues/14365"
)]
public
void
TestErrorTypeInNestedNamespace
()
{
var
source1
=
@"
public class C
{
public System.Collections.IEnumerable I { get; }
}"
;
var
source2
=
@"
class X
{
void M()
{
new C().I;
}
}"
;
// We don't add metadata to the second compilation, so even `System.Collections.IEnumerable` will be an
// error type.
var
compilation1
=
GetCompilation
(
source1
,
LanguageNames
.
CSharp
,
"File1.cs"
);
var
compilation2
=
GetCompilation
(
source2
,
LanguageNames
.
CSharp
,
"File2.cs"
,
new
[]
{
compilation1
.
ToMetadataReference
()
});
var
symbol
=
(
IPropertySymbol
)
GetAllSymbols
(
compilation2
.
GetSemanticModel
(
compilation2
.
SyntaxTrees
.
Single
()),
n
=>
n
is
CSharp
.
Syntax
.
MemberAccessExpressionSyntax
).
Single
();
var
propType
=
symbol
.
Type
;
Assert
.
True
(
propType
.
Kind
==
SymbolKind
.
ErrorType
);
Assert
.
Equal
(
"Collections"
,
propType
.
ContainingNamespace
.
Name
);
Assert
.
Equal
(
"System"
,
propType
.
ContainingNamespace
.
ContainingNamespace
.
Name
);
// Ensure we don't crash getting these symbol keys.
var
id
=
SymbolKey
.
CreateString
(
propType
);
Assert
.
NotNull
(
id
);
// Validate that if the client does ask to resolve locations that we
// do not crash if those locations cannot be found.
var
found
=
SymbolKey
.
ResolveString
(
id
,
compilation2
).
GetAnySymbol
();
Assert
.
NotNull
(
found
);
Assert
.
Equal
(
propType
.
Name
,
found
.
Name
);
Assert
.
Equal
(
propType
.
Kind
,
found
.
Kind
);
Assert
.
Equal
(
propType
.
ContainingNamespace
.
Name
,
found
.
ContainingNamespace
.
Name
);
var
method
=
found
as
IErrorTypeSymbol
;
Assert
.
True
(
SymbolEquivalenceComparer
.
Instance
.
Equals
(
propType
,
found
));
}
[
Fact
]
public
void
TestFunctionPointerTypeSymbols
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录