Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
7f93cad6
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,发现更多精彩内容 >>
提交
7f93cad6
编写于
2月 27, 2017
作者:
O
Omar Tawfik
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
In/RefReadOnly tokens in completion service for signatures
上级
95911739
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
156 addition
and
1 deletion
+156
-1
src/EditorFeatures/CSharpTest/Completion/CompletionProviders/KeywordCompletionProviderTests.cs
...ion/CompletionProviders/KeywordCompletionProviderTests.cs
+106
-0
src/Features/CSharp/Portable/Completion/KeywordRecommenders/InKeywordRecommender.cs
...le/Completion/KeywordRecommenders/InKeywordRecommender.cs
+50
-1
未找到文件。
src/EditorFeatures/CSharpTest/Completion/CompletionProviders/KeywordCompletionProviderTests.cs
浏览文件 @
7f93cad6
...
...
@@ -493,5 +493,111 @@ public static void Test()
await
VerifyItemExistsAsync
(
code
,
"in"
);
}
[
Test
.
Utilities
.
CompilerTrait
(
Test
.
Utilities
.
CompilerFeature
.
ReadonlyReferences
)]
[
WpfFact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
async
Task
RefReadOnlyWillPopUpInMethodReturnTypes
()
{
var
code
=
@"
class Program
{
public ref $$ int Test()
{
return ref x;
}
}"
;
await
VerifyItemExistsAsync
(
code
,
"readonly"
);
}
[
Test
.
Utilities
.
CompilerTrait
(
Test
.
Utilities
.
CompilerFeature
.
ReadonlyReferences
)]
[
WpfFact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
async
Task
RefReadOnlyWillPopUpInGlobalMemberDeclaration
()
{
var
code
=
@"
public ref $$ "
;
await
VerifyItemExistsAsync
(
code
,
"readonly"
,
sourceCodeKind
:
SourceCodeKind
.
Script
);
}
[
Test
.
Utilities
.
CompilerTrait
(
Test
.
Utilities
.
CompilerFeature
.
ReadonlyReferences
)]
[
WpfFact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
async
Task
RefReadOnlyWillPopUpInDelegateReturnType
()
{
var
code
=
@"
public delegate ref $$ int Delegate();
class Program
{
}"
;
await
VerifyItemExistsAsync
(
code
,
"readonly"
);
}
[
Test
.
Utilities
.
CompilerTrait
(
Test
.
Utilities
.
CompilerFeature
.
ReadonlyReferences
)]
[
WpfFact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
async
Task
RefReadOnlyWillPopUpInMemberDeclaration
()
{
var
code
=
@"
class Program
{
public ref $$ int Test { get; set; }
}"
;
await
VerifyItemExistsAsync
(
code
,
"readonly"
);
}
[
Test
.
Utilities
.
CompilerTrait
(
Test
.
Utilities
.
CompilerFeature
.
ReadonlyReferences
)]
[
WpfFact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
async
Task
InWillPopUpInMethodReturnTypes
()
{
var
code
=
@"
class Program
{
public $$ int Test()
{
return ref x;
}
}"
;
await
VerifyItemExistsAsync
(
code
,
"in"
);
}
[
Test
.
Utilities
.
CompilerTrait
(
Test
.
Utilities
.
CompilerFeature
.
ReadonlyReferences
)]
[
WpfFact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
async
Task
InWillPopUpInGlobalMemberDeclaration
()
{
var
code
=
@"
public $$ "
;
await
VerifyItemExistsAsync
(
code
,
"in"
,
sourceCodeKind
:
SourceCodeKind
.
Script
);
}
[
Test
.
Utilities
.
CompilerTrait
(
Test
.
Utilities
.
CompilerFeature
.
ReadonlyReferences
)]
[
WpfFact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
async
Task
InWillPopUpInDelegateReturnType
()
{
var
code
=
@"
public delegate $$ int Delegate();
class Program
{
}"
;
await
VerifyItemExistsAsync
(
code
,
"in"
);
}
[
Test
.
Utilities
.
CompilerTrait
(
Test
.
Utilities
.
CompilerFeature
.
ReadonlyReferences
)]
[
WpfFact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
async
Task
InWillPopUpInMemberDeclaration
()
{
var
code
=
@"
class Program
{
public $$ int Test { get; set; }
}"
;
await
VerifyItemExistsAsync
(
code
,
"in"
);
}
}
}
src/Features/CSharp/Portable/Completion/KeywordRecommenders/InKeywordRecommender.cs
浏览文件 @
7f93cad6
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using
System.Collections.Generic
;
using
System.Threading
;
using
Microsoft.CodeAnalysis.CSharp.Extensions
;
using
Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery
;
using
Microsoft.CodeAnalysis.CSharp.Syntax
;
using
Microsoft.CodeAnalysis.CSharp.Utilities
;
using
Microsoft.CodeAnalysis.Shared.Extensions
;
namespace
Microsoft.CodeAnalysis.CSharp.Completion.KeywordRecommenders
...
...
@@ -15,6 +17,46 @@ public InKeywordRecommender()
{
}
/// <summary>
/// Same as <see cref="SyntaxKindSet.AllMemberModifiers"/> with in specific exclusions
/// </summary>
private
static
readonly
ISet
<
SyntaxKind
>
InMemberModifiers
=
new
HashSet
<
SyntaxKind
>(
SyntaxFacts
.
EqualityComparer
)
{
SyntaxKind
.
AbstractKeyword
,
// SyntaxKind.AsyncKeyword, // async methods cannot be in
SyntaxKind
.
ExternKeyword
,
SyntaxKind
.
InternalKeyword
,
SyntaxKind
.
NewKeyword
,
SyntaxKind
.
OverrideKeyword
,
SyntaxKind
.
PublicKeyword
,
SyntaxKind
.
PrivateKeyword
,
SyntaxKind
.
ProtectedKeyword
,
// SyntaxKind.ReadOnlyKeyword, // fields cannot be in
SyntaxKind
.
SealedKeyword
,
SyntaxKind
.
StaticKeyword
,
SyntaxKind
.
UnsafeKeyword
,
SyntaxKind
.
VirtualKeyword
,
// SyntaxKind.VolatileKeyword, // fields cannot be in
};
/// <summary>
/// Same as <see cref="SyntaxKindSet.AllGlobalMemberModifiers"/> with in specific exclusions
/// </summary>
private
static
readonly
ISet
<
SyntaxKind
>
InGlobalMemberModifiers
=
new
HashSet
<
SyntaxKind
>(
SyntaxFacts
.
EqualityComparer
)
{
// SyntaxKind.AsyncKeyword, // async methods cannot be in
SyntaxKind
.
ExternKeyword
,
SyntaxKind
.
InternalKeyword
,
SyntaxKind
.
NewKeyword
,
SyntaxKind
.
OverrideKeyword
,
SyntaxKind
.
PublicKeyword
,
SyntaxKind
.
PrivateKeyword
,
// SyntaxKind.ReadOnlyKeyword, // fields cannot be in
SyntaxKind
.
StaticKeyword
,
SyntaxKind
.
UnsafeKeyword
,
// SyntaxKind.VolatileKeyword, // fields cannot be in
};
protected
override
bool
IsValidContext
(
int
position
,
CSharpSyntaxContext
context
,
CancellationToken
cancellationToken
)
{
return
...
...
@@ -24,7 +66,14 @@ protected override bool IsValidContext(int position, CSharpSyntaxContext context
context
.
TargetToken
.
IsTypeParameterVarianceContext
()
||
context
.
SyntaxTree
.
IsParameterModifierContext
(
position
,
context
.
LeftToken
,
cancellationToken
)
||
context
.
SyntaxTree
.
IsAnonymousMethodParameterModifierContext
(
position
,
context
.
LeftToken
,
cancellationToken
)
||
context
.
SyntaxTree
.
IsPossibleLambdaParameterModifierContext
(
position
,
context
.
LeftToken
,
cancellationToken
);
context
.
SyntaxTree
.
IsPossibleLambdaParameterModifierContext
(
position
,
context
.
LeftToken
,
cancellationToken
)
||
context
.
IsDelegateReturnTypeContext
||
context
.
SyntaxTree
.
IsGlobalMemberDeclarationContext
(
position
,
InGlobalMemberModifiers
,
cancellationToken
)
||
context
.
IsMemberDeclarationContext
(
validModifiers
:
InMemberModifiers
,
validTypeDeclarations
:
SyntaxKindSet
.
ClassInterfaceStructTypeDeclarations
,
canBePartial
:
true
,
cancellationToken
:
cancellationToken
);
}
private
bool
IsValidContextInForEachClause
(
CSharpSyntaxContext
context
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录