Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
25bedcea
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,发现更多精彩内容 >>
提交
25bedcea
编写于
9月 28, 2015
作者:
D
Dustin Campbell
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5508 from DustinCampbell/issue-5505
Code Model: Fix CodeFunction.Name for C# conversion operators
上级
5967d836
99afffe1
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
142 addition
and
4 deletion
+142
-4
src/VisualStudio/CSharp/Impl/CodeModel/CSharpCodeModelService.cs
...ualStudio/CSharp/Impl/CodeModel/CSharpCodeModelService.cs
+2
-2
src/VisualStudio/CSharp/Test/CodeModel/FileCodeFunctionTests.cs
...sualStudio/CSharp/Test/CodeModel/FileCodeFunctionTests.cs
+1
-1
src/VisualStudio/Core/Test/CodeModel/CSharp/CodeFunctionTests.vb
...ualStudio/Core/Test/CodeModel/CSharp/CodeFunctionTests.vb
+138
-0
src/VisualStudio/Core/Test/CodeModel/CSharp/FileCodeModelTests.vb
...alStudio/Core/Test/CodeModel/CSharp/FileCodeModelTests.vb
+1
-1
未找到文件。
src/VisualStudio/CSharp/Impl/CodeModel/CSharpCodeModelService.cs
浏览文件 @
25bedcea
...
...
@@ -823,8 +823,8 @@ public override string GetName(SyntaxNode node)
return
"operator "
+
((
OperatorDeclarationSyntax
)
node
).
OperatorToken
.
ToString
();
case
SyntaxKind
.
ConversionOperatorDeclaration
:
var
conversionOperator
=
(
ConversionOperatorDeclarationSyntax
)
node
;
return
"operator "
+
(
conversionOperator
.
ImplicitOrExplicitKeyword
.
Kind
()
==
SyntaxKind
.
ImplicitKeyword
?
"implicit "
:
"explicit "
)
return
(
conversionOperator
.
ImplicitOrExplicitKeyword
.
Kind
()
==
SyntaxKind
.
ImplicitKeyword
?
"implicit "
:
"explicit "
)
+
"operator "
+
conversionOperator
.
Type
.
ToString
();
case
SyntaxKind
.
EnumMemberDeclaration
:
return
((
EnumMemberDeclarationSyntax
)
node
).
Identifier
.
ToString
();
...
...
src/VisualStudio/CSharp/Test/CodeModel/FileCodeFunctionTests.cs
浏览文件 @
25bedcea
...
...
@@ -573,7 +573,7 @@ public void ConversionOperator()
{
CodeClass
classObject
=
(
CodeClass
)
GetCodeElement
(
"Ref"
);
var
element
=
classObject
.
Members
.
Item
(
1
);
Assert
.
Equal
(
"
operator implicit
Ref<T>"
,
element
.
Name
);
Assert
.
Equal
(
"
implicit operator
Ref<T>"
,
element
.
Name
);
}
}
}
src/VisualStudio/Core/Test/CodeModel/CSharp/CodeFunctionTests.vb
浏览文件 @
25bedcea
...
...
@@ -423,6 +423,75 @@ public class C1 : I1
TestFullName
(
code
,
"C1.I1.f1"
)
End
Sub
<
WorkItem
(
2437
,
"https://github.com/dotnet/roslyn/issues/2437"
)
>
<
ConditionalFact
(
GetType
(
x86
)),
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeModel
)
>
Public
Sub
FullName_ImplicitOperator
()
Dim
code
=
<
Code
>
public
class
ComplexType
{
public
ComplexType
()
{
}
public
static
implicit
operator
$$
ComplexType
(
System
.
Int32
input
)
{
return
new
ComplexType
()
;
}
public
static
ComplexType
operator
+
(
ComplexType
input0
,
ComplexType
input1
)
{
return
default
(
ComplexType
)
;
}
}
</
Code
>
TestFullName
(
code
,
"ComplexType.implicit operator ComplexType"
)
End
Sub
<
WorkItem
(
2437
,
"https://github.com/dotnet/roslyn/issues/2437"
)
>
<
ConditionalFact
(
GetType
(
x86
)),
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeModel
)
>
Public
Sub
FullName_ExplicitOperator
()
Dim
code
=
<
Code
>
public
class
ComplexType
{
public
ComplexType
()
{
}
public
static
explicit
operator
$$
ComplexType
(
System
.
Int32
input
)
{
return
new
ComplexType
()
;
}
public
static
ComplexType
operator
+
(
ComplexType
input0
,
ComplexType
input1
)
{
return
default
(
ComplexType
)
;
}
}
</
Code
>
TestFullName
(
code
,
"ComplexType.explicit operator ComplexType"
)
End
Sub
<
WorkItem
(
2437
,
"https://github.com/dotnet/roslyn/issues/2437"
)
>
<
ConditionalFact
(
GetType
(
x86
)),
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeModel
)
>
Public
Sub
FullName_OperatorOverload
()
Dim
code
=
<
Code
>
public
class
ComplexType
{
public
ComplexType
()
{
}
public
static
explicit
operator
ComplexType
(
System
.
Int32
input
)
{
return
new
ComplexType
()
;
}
public
static
ComplexType
operator
$$
+
(
ComplexType
input0
,
ComplexType
input1
)
{
return
default
(
ComplexType
)
;
}
}
</
Code
>
TestFullName
(
code
,
"ComplexType.operator +"
)
End
Sub
#End Region
#Region "FunctionKind tests"
...
...
@@ -623,6 +692,75 @@ class C
TestName
(
code
,
"~C"
)
End
Sub
<
WorkItem
(
2437
,
"https://github.com/dotnet/roslyn/issues/2437"
)
>
<
ConditionalFact
(
GetType
(
x86
)),
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeModel
)
>
Public
Sub
Name_ImplicitOperator
()
Dim
code
=
<
Code
>
public
class
ComplexType
{
public
ComplexType
()
{
}
public
static
implicit
operator
$$
ComplexType
(
System
.
Int32
input
)
{
return
new
ComplexType
()
;
}
public
static
ComplexType
operator
+
(
ComplexType
input0
,
ComplexType
input1
)
{
return
default
(
ComplexType
)
;
}
}
</
Code
>
TestName
(
code
,
"implicit operator ComplexType"
)
End
Sub
<
WorkItem
(
2437
,
"https://github.com/dotnet/roslyn/issues/2437"
)
>
<
ConditionalFact
(
GetType
(
x86
)),
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeModel
)
>
Public
Sub
Name_ExplicitOperator
()
Dim
code
=
<
Code
>
public
class
ComplexType
{
public
ComplexType
()
{
}
public
static
explicit
operator
$$
ComplexType
(
System
.
Int32
input
)
{
return
new
ComplexType
()
;
}
public
static
ComplexType
operator
+
(
ComplexType
input0
,
ComplexType
input1
)
{
return
default
(
ComplexType
)
;
}
}
</
Code
>
TestName
(
code
,
"explicit operator ComplexType"
)
End
Sub
<
WorkItem
(
2437
,
"https://github.com/dotnet/roslyn/issues/2437"
)
>
<
ConditionalFact
(
GetType
(
x86
)),
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeModel
)
>
Public
Sub
Name_OperatorOverload
()
Dim
code
=
<
Code
>
public
class
ComplexType
{
public
ComplexType
()
{
}
public
static
implicit
operator
ComplexType
(
System
.
Int32
input
)
{
return
new
ComplexType
()
;
}
public
static
ComplexType
operator
$$
+
(
ComplexType
input0
,
ComplexType
input1
)
{
return
default
(
ComplexType
)
;
}
}
</
Code
>
TestName
(
code
,
"operator +"
)
End
Sub
#End Region
#Region "OverrideKind tests"
...
...
src/VisualStudio/Core/Test/CodeModel/CSharp/FileCodeModelTests.vb
浏览文件 @
25bedcea
...
...
@@ -991,7 +991,7 @@ class D
Assert
.
NotNull
(
parentElement
)
Dim
unknownCodeFunction
=
TryCast
(
element
,
EnvDTE
.
CodeFunction
)
Assert
.
Equal
(
unknownCodeFunction
.
Name
,
"
operator implicit
D"
)
Assert
.
Equal
(
unknownCodeFunction
.
Name
,
"
implicit operator
D"
)
End
Using
End
Using
End
Sub
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录