Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
cee58445
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
cee58445
编写于
12月 18, 2020
作者:
J
Jason Malinowski
提交者:
GitHub
12月 18, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #50019 from jasonmalinowski/fix-cross-language-generate-constructor-bugs
Fix cross language generate constructor bugs
上级
a4cae91c
b3611be6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
92 addition
and
2 deletion
+92
-2
src/EditorFeatures/VisualBasicTest/GenerateConstructor/GenerateConstructorTests.vb
...BasicTest/GenerateConstructor/GenerateConstructorTests.vb
+77
-0
src/Features/Core/Portable/GenerateMember/GenerateConstructor/AbstractGenerateConstructorService.cs
...GenerateConstructor/AbstractGenerateConstructorService.cs
+4
-0
src/Features/Core/Portable/GenerateMember/GenerateConstructor/GenerateConstructorHelpers.cs
...eMember/GenerateConstructor/GenerateConstructorHelpers.cs
+11
-2
未找到文件。
src/EditorFeatures/VisualBasicTest/GenerateConstructor/GenerateConstructorTests.vb
浏览文件 @
cee58445
...
...
@@ -1866,6 +1866,83 @@ End Class",
End Class"
)
End
Function
<
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsGenerateConstructor
)
>
Public
Async
Function
TestDelegateConstructorCrossLanguageCycleAvoidance
()
As
Task
Await
TestInRegularAndScriptAsync
(
<
Workspace
>
<
Project
Language
=
"C#"
Name
=
"CSharpProject"
CommonReferences
=
"true"
>
<
Document
>
public
class
BaseType
{
public
BaseType
(
int
x
,
int
y
)
{
}
}
</
Document
>
</
Project
>
<
Project
Language
=
"Visual Basic"
CommonReferences
=
"true"
>
<
ProjectReference
>
CSharpProject
</
ProjectReference
>
<
Document
>
Public
Class
B
Inherits
BaseType
Public
Sub
New
(
a
As
Integer
)
[|
Me
.
New
(
a
,
1
)
|]
End
Sub
End
Class
</
Document
>
</
Project
>
</
Workspace
>
.
ToString
(),
"
Public Class B
Inherits BaseType
Public Sub New(a As Integer)
Me.New(a, 1)
End Sub
Public Sub New(x As Integer, y As Integer)
MyBase.New(x, y)
End Sub
End Class"
)
End
Function
<
WorkItem
(
49850
,
"https://github.com/dotnet/roslyn/issues/49850"
)
>
<
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsGenerateConstructor
)
>
Public
Async
Function
TestDelegateConstructorCrossLanguage
()
As
Task
Await
TestInRegularAndScriptAsync
(
<
Workspace
>
<
Project
Language
=
"C#"
Name
=
"CSharpProject"
CommonReferences
=
"true"
>
<
Document
>
public
class
BaseType
{
public
BaseType
(
string
x
)
{
}
}
</
Document
>
</
Project
>
<
Project
Language
=
"Visual Basic"
CommonReferences
=
"true"
>
<
ProjectReference
>
CSharpProject
</
ProjectReference
>
<
Document
>
Option Strict On
Public
Class
B
Public
Sub
M
()
Dim
x
=
[|
New
BaseType
(
42
)
|]
End
Sub
End
Class
</
Document
>
</
Project
>
</
Workspace
>
.
ToString
(),
"
public class BaseType
{
private int v;
public BaseType(string x) { }
public BaseType(int v)
{
this.v = v;
}
}"
)
End
Function
<
WorkItem
(
14077
,
"https://github.com/dotnet/roslyn/issues/14077"
)
>
<
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsGenerateConstructor
)
>
Public
Async
Function
CreateFieldDefaultNamingStyle
()
As
Task
...
...
src/Features/Core/Portable/GenerateMember/GenerateConstructor/AbstractGenerateConstructorService.cs
浏览文件 @
cee58445
...
...
@@ -57,6 +57,10 @@ protected bool WillCauseConstructorCycle(State state, SemanticDocument document,
if
(
currentConstructor
.
Equals
(
delegatedConstructor
))
return
true
;
// Delegating to a constructor in the base type can't cause a cycle
if
(!
delegatedConstructor
.
ContainingType
.
Equals
(
currentConstructor
.
ContainingType
))
return
false
;
// We need ensure that delegating constructor won't cause circular dependency.
// The chain of dependency can not exceed the number for constructors
var
constructorsCount
=
delegatedConstructor
.
ContainingType
.
InstanceConstructors
.
Length
;
...
...
src/Features/Core/Portable/GenerateMember/GenerateConstructor/GenerateConstructorHelpers.cs
浏览文件 @
cee58445
...
...
@@ -9,6 +9,7 @@
using
System.Linq
;
using
Microsoft.CodeAnalysis.LanguageServices
;
using
Microsoft.CodeAnalysis.Shared.Extensions
;
using
Roslyn.Utilities
;
namespace
Microsoft.CodeAnalysis.GenerateMember.GenerateConstructor
{
...
...
@@ -77,9 +78,17 @@ private static bool IsSymbolAccessible(Compilation compilation, ISymbol symbol)
{
Debug
.
Assert
(
constructor
.
Parameters
.
Length
==
expressions
.
Length
);
for
(
var
i
=
0
;
i
<
constructor
.
Parameters
.
Length
;
i
++)
// Resolve the constructor into our semantic model's compilation; if the constructor we're looking at is from
// another project with a different language.
var
constructorInCompilation
=
(
IMethodSymbol
?)
SymbolKey
.
Create
(
constructor
).
Resolve
(
semanticModel
.
Compilation
).
Symbol
;
Contract
.
ThrowIfNull
(
constructorInCompilation
);
for
(
var
i
=
0
;
i
<
constructorInCompilation
.
Parameters
.
Length
;
i
++)
{
var
constructorParameter
=
constructor
.
Parameters
[
i
];
var
constructorParameter
=
constructorInCompilation
.
Parameters
[
i
];
if
(
constructorParameter
==
null
)
return
false
;
var
conversion
=
semanticFacts
.
ClassifyConversion
(
semanticModel
,
expressions
[
i
],
constructorParameter
.
Type
);
if
(!
conversion
.
IsIdentity
&&
!
conversion
.
IsImplicit
)
return
false
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录