Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
da6d0c35
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,发现更多精彩内容 >>
提交
da6d0c35
编写于
2月 05, 2019
作者:
I
Ivan Basov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
code review feedback
上级
6927b390
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
10 deletion
+22
-10
src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests.vb
...Test2/IntelliSense/CSharpCompletionCommandHandlerTests.vb
+16
-0
src/Workspaces/CSharp/Portable/Extensions/ContextQuery/CSharpSyntaxContext.cs
...p/Portable/Extensions/ContextQuery/CSharpSyntaxContext.cs
+5
-6
src/Workspaces/CSharp/Portable/Recommendations/CSharpRecommendationService.cs
...p/Portable/Recommendations/CSharpRecommendationService.cs
+1
-4
未找到文件。
src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests.vb
浏览文件 @
da6d0c35
...
...
@@ -204,6 +204,22 @@ class c { void M() { this.$$ToString() } }
End
Using
End
Function
<
MemberData
(
NameOf
(
AllCompletionImplementations
))
>
<
WpfTheory
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)
>
Public
Async
Function
TestInvokingCompletionBetweenTwoDots
(
completionImplementation
As
CompletionImplementation
)
As
Task
' Starting C# 8.0 two dots are considered as a DotDotToken of a Range expression.
' However, we may want to have a completion when invoking it aqfter the first dot.
Using
state
=
TestStateFactory
.
CreateCSharpTestState
(
completionImplementation
,
<
Document
>
class
c
{
void
M
()
{
this
.
$$.
ToString
()
}
}
</
Document
>
)
state
.
SendInvokeCompletionList
()
Await
state
.
AssertCompletionSession
()
Assert
.
True
(
state
.
CompletionItemsContainsAll
({
"ToString"
}))
End
Using
End
Function
<
MemberData
(
NameOf
(
AllCompletionImplementations
))
>
<
WpfTheory
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)
>
Public
Async
Function
TestEnterIsConsumed
(
completionImplementation
As
CompletionImplementation
)
As
Task
...
...
src/Workspaces/CSharp/Portable/Extensions/ContextQuery/CSharpSyntaxContext.cs
浏览文件 @
da6d0c35
...
...
@@ -48,7 +48,7 @@ internal sealed class CSharpSyntaxContext : SyntaxContext
public
readonly
bool
IsCrefContext
;
public
readonly
bool
IsCatchFilterContext
;
public
readonly
bool
IsDestructorTypeContext
;
public
readonly
bool
Is
FirstDotOfDotDotToken
;
public
readonly
bool
Is
AfterFirstDotOfDotDot
;
private
CSharpSyntaxContext
(
Workspace
workspace
,
...
...
@@ -100,7 +100,7 @@ internal sealed class CSharpSyntaxContext : SyntaxContext
bool
isDestructorTypeContext
,
bool
isPossibleTupleContext
,
bool
isPatternContext
,
bool
is
FirstDotOfDotDotToken
,
bool
is
AfterFirstDotOfDotDot
,
CancellationToken
cancellationToken
)
:
base
(
workspace
,
semanticModel
,
position
,
leftToken
,
targetToken
,
isTypeContext
,
isNamespaceContext
,
isNamespaceDeclarationNameContext
,
...
...
@@ -140,7 +140,7 @@ internal sealed class CSharpSyntaxContext : SyntaxContext
this
.
IsCrefContext
=
isCrefContext
;
this
.
IsCatchFilterContext
=
isCatchFilterContext
;
this
.
IsDestructorTypeContext
=
isDestructorTypeContext
;
this
.
Is
FirstDotOfDotDotToken
=
isFirstDotOfDotDotToken
;
this
.
Is
AfterFirstDotOfDotDot
=
isAfterFirstDotOfDotDot
;
}
public
static
CSharpSyntaxContext
CreateContext
(
Workspace
workspace
,
SemanticModel
semanticModel
,
int
position
,
CancellationToken
cancellationToken
)
...
...
@@ -198,8 +198,7 @@ private static CSharpSyntaxContext CreateContextWorker(Workspace workspace, Sema
targetToken
.
Parent
.
IsKind
(
SyntaxKind
.
DestructorDeclaration
)
&&
targetToken
.
Parent
.
Parent
.
IsKind
(
SyntaxKind
.
ClassDeclaration
,
SyntaxKind
.
StructDeclaration
);
var
isFirstDotOfDotDotToken
=
targetToken
.
IsKind
(
SyntaxKind
.
DotDotToken
)
&&
targetToken
.
Parent
.
IsKind
(
SyntaxKind
.
RangeExpression
)
&&
var
isAfterFirstDotOfDotDot
=
targetToken
.
IsKind
(
SyntaxKind
.
DotDotToken
)
&&
position
==
targetToken
.
SpanStart
+
1
;
return
new
CSharpSyntaxContext
(
...
...
@@ -252,7 +251,7 @@ private static CSharpSyntaxContext CreateContextWorker(Workspace workspace, Sema
isDestructorTypeContext
:
isDestructorTypeContext
,
isPossibleTupleContext
:
syntaxTree
.
IsPossibleTupleContext
(
leftToken
,
position
),
isPatternContext
:
syntaxTree
.
IsPatternContext
(
leftToken
,
position
),
is
FirstDotOfDotDotToken
:
isFirstDotOfDotDotToken
,
is
AfterFirstDotOfDotDot
:
isAfterFirstDotOfDotDot
,
cancellationToken
:
cancellationToken
);
}
...
...
src/Workspaces/CSharp/Portable/Recommendations/CSharpRecommendationService.cs
浏览文件 @
da6d0c35
...
...
@@ -66,6 +66,7 @@ internal class CSharpRecommendationService : AbstractRecommendationService
}
else
if
(
context
.
IsAnyExpressionContext
||
context
.
IsStatementContext
||
context
.
IsAfterFirstDotOfDotDot
||
context
.
SyntaxTree
.
IsDefiniteCastTypeContext
(
context
.
Position
,
context
.
LeftToken
,
cancellationToken
))
{
// GitHub #717: With automatic brace completion active, typing '(i' produces "(i)", which gets parsed as
...
...
@@ -94,10 +95,6 @@ internal class CSharpRecommendationService : AbstractRecommendationService
{
return
GetSymbolsForNamespaceDeclarationNameContext
(
context
,
cancellationToken
);
}
else
if
(
context
.
IsFirstDotOfDotDotToken
)
{
return
GetSymbolsForExpressionOrStatementContext
(
context
,
filterOutOfScopeLocals
,
cancellationToken
);
}
return
ImmutableArray
<
ISymbol
>.
Empty
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录