Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
d523c633
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,发现更多精彩内容 >>
提交
d523c633
编写于
1月 14, 2020
作者:
C
Cyrus Najmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
VB can simplify static member access off of 'me'.
上级
56d5b11b
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
47 addition
and
5 deletion
+47
-5
src/EditorFeatures/Test2/Simplification/TypeNameSimplifierTest.vb
...orFeatures/Test2/Simplification/TypeNameSimplifierTest.vb
+40
-1
src/Workspaces/CSharp/Portable/Extensions/ExpressionSyntaxExtensions.cs
.../CSharp/Portable/Extensions/ExpressionSyntaxExtensions.cs
+1
-1
src/Workspaces/Core/Portable/Simplification/SimplificationHelpers.cs
...ces/Core/Portable/Simplification/SimplificationHelpers.cs
+5
-2
src/Workspaces/VisualBasic/Portable/Extensions/ExpressionSyntaxExtensions.vb
...alBasic/Portable/Extensions/ExpressionSyntaxExtensions.vb
+1
-1
未找到文件。
src/EditorFeatures/Test2/Simplification/TypeNameSimplifierTest.vb
浏览文件 @
d523c633
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
Imports
System.Threading.Tasks
Imports
Microsoft.CodeAnalysis.CodeStyle
Imports
Microsoft.CodeAnalysis.CSharp.CodeStyle
Imports
Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
...
...
@@ -5908,6 +5907,46 @@ End Class
Await
TestAsync
(
input
,
expected
,
DontPreferIntrinsicPredefinedTypeKeywordInDeclaration
)
End
Function
<
Fact
(),
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Simplification
)
>
Public
Async
Function
TestSharedMemberOffOfMe
()
As
Task
' even if the user prefers qualified member access, we will strip off 'Me' when calling
' a static method through it.
Dim
input
=
<
Workspace
>
<
Project
Language
=
"Visual Basic"
CommonReferences
=
"true"
>
<
Document
>
<
!
[
CDATA
[
Imports
System
Class
Class1
Sub
Main
()
{
|
SimplifyParent
:
Me
.
Goo
|
}()
End
Sub
Shared
Sub
Goo
()
End
Sub
End
Class
]]
>
</
Document
>
</
Project
>
</
Workspace
>
Dim
expected
=
<
text
>
<
!
[
CDATA
[
Imports
System
Class
Class1
Sub
Main
()
Goo
()
End
Sub
Shared
Sub
Goo
()
End
Sub
End
Class
]]
></
text
>
Await
TestAsync
(
input
,
expected
,
QualifyMethodAccessOption
(
LanguageNames
.
VisualBasic
))
End
Function
#End Region
#Region "Helpers"
...
...
src/Workspaces/CSharp/Portable/Extensions/ExpressionSyntaxExtensions.cs
浏览文件 @
d523c633
...
...
@@ -820,7 +820,7 @@ private static bool CanReplace(ISymbol symbol)
return
false
;
if
(
memberAccess
.
Expression
.
IsKind
(
SyntaxKind
.
ThisExpression
)
&&
!
SimplificationHelpers
.
ShouldSimplifyMemberAccessExpression
(
semanticModel
,
optionSet
,
symbol
))
!
SimplificationHelpers
.
ShouldSimplify
ThisOrMe
MemberAccessExpression
(
semanticModel
,
optionSet
,
symbol
))
{
return
false
;
}
...
...
src/Workspaces/Core/Portable/Simplification/SimplificationHelpers.cs
浏览文件 @
d523c633
...
...
@@ -101,11 +101,14 @@ internal static bool IsValidSymbolInfo(ISymbol symbol)
return
symbol
!=
null
&&
!
symbol
.
IsErrorType
();
}
internal
static
bool
ShouldSimplifyMemberAccessExpression
(
internal
static
bool
ShouldSimplify
ThisOrMe
MemberAccessExpression
(
SemanticModel
semanticModel
,
OptionSet
optionSet
,
ISymbol
symbol
)
{
// If we're accessing a static member off of this/me then we should always consider this
// simplifiable. Note: in C# this isn't even legal to access a static off of `this`,
// but in VB it is legal to access a static off of `me`.
if
(
symbol
.
IsStatic
)
return
fals
e
;
return
tru
e
;
if
((
symbol
.
IsKind
(
SymbolKind
.
Field
)
&&
optionSet
.
GetOption
(
CodeStyleOptions
.
QualifyFieldAccess
,
semanticModel
.
Language
).
Value
||
(
symbol
.
IsKind
(
SymbolKind
.
Property
)
&&
optionSet
.
GetOption
(
CodeStyleOptions
.
QualifyPropertyAccess
,
semanticModel
.
Language
).
Value
)
||
...
...
src/Workspaces/VisualBasic/Portable/Extensions/ExpressionSyntaxExtensions.vb
浏览文件 @
d523c633
...
...
@@ -985,7 +985,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Extensions
End
If
If
memberAccess
.
Expression
.
IsKind
(
SyntaxKind
.
MeExpression
)
AndAlso
Not
SimplificationHelpers
.
ShouldSimplify
MemberAccessExpression
(
semanticModel
,
optionSet
,
symbol
)
Then
Not
SimplificationHelpers
.
ShouldSimplifyThisOrMe
MemberAccessExpression
(
semanticModel
,
optionSet
,
symbol
)
Then
Return
False
End
If
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录