Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
c6561868
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,发现更多精彩内容 >>
提交
c6561868
编写于
8月 07, 2018
作者:
L
Lillo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add more test case.
Add method to IsTypeAttributeContextBefore
上级
0514595d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
76 addition
and
13 deletion
+76
-13
src/EditorFeatures/CSharpTest2/Recommendations/AssemblyKeywordRecommenderTests.cs
...pTest2/Recommendations/AssemblyKeywordRecommenderTests.cs
+54
-3
src/Features/CSharp/Portable/Completion/KeywordRecommenders/AssemblyKeywordRecommender.cs
...pletion/KeywordRecommenders/AssemblyKeywordRecommender.cs
+1
-2
src/Workspaces/CSharp/Portable/Extensions/ContextQuery/CSharpSyntaxContext.cs
...p/Portable/Extensions/ContextQuery/CSharpSyntaxContext.cs
+21
-0
src/Workspaces/CSharp/Portable/Extensions/ContextQuery/SyntaxTokenExtensions.cs
...Portable/Extensions/ContextQuery/SyntaxTokenExtensions.cs
+0
-8
未找到文件。
src/EditorFeatures/CSharpTest2/Recommendations/AssemblyKeywordRecommenderTests.cs
浏览文件 @
c6561868
...
...
@@ -128,16 +128,41 @@ namespace Goo {}");
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
KeywordRecommending
)]
[
WorkItem
(
362
,
"https://github.com/dotnet/roslyn/issues/362"
)]
public
async
Task
TestNotBeforeAttributeNamespaceWithNoOpenBrac
e
()
public
async
Task
TestNotBeforeAttributeNamespaceWithNoOpenBrac
ket
()
{
await
VerifyAbsenceAsync
(
@"$$
namespace Goo {}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
KeywordRecommending
)]
[
WorkItem
(
362
,
"https://github.com/dotnet/roslyn/issues/362"
)]
public
async
Task
TestNotBeforeAttributeNamespaceAndAfterUsingWithNoOpenBracket
()
{
await
VerifyAbsenceAsync
(
@"
using System;
$$
namespace Goo {}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
KeywordRecommending
)]
[
WorkItem
(
362
,
"https://github.com/dotnet/roslyn/issues/362"
)]
public
async
Task
TestBeforeAssemblyAttributeWithOpenBrace
()
public
async
Task
TestBeforeAttributeNamespaceAndAfterUsingWithNoOpenBracket
()
{
await
VerifyKeywordAsync
(
@"
using System;
[$$
namespace Goo {}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
KeywordRecommending
)]
[
WorkItem
(
362
,
"https://github.com/dotnet/roslyn/issues/362"
)]
public
async
Task
TestBeforeAssemblyAttributeWithOpenBracket
()
{
await
VerifyKeywordAsync
(
@"
...
...
@@ -148,7 +173,7 @@ namespace Goo {}");
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
KeywordRecommending
)]
[
WorkItem
(
362
,
"https://github.com/dotnet/roslyn/issues/362"
)]
public
async
Task
TestNotBeforeAssemblyAttributeWithoutOpenBrac
e
()
public
async
Task
TestNotBeforeAssemblyAttributeWithoutOpenBrac
ket
()
{
await
VerifyAbsenceAsync
(
@"
...
...
@@ -157,6 +182,32 @@ public async Task TestNotBeforeAssemblyAttributeWithoutOpenBrace()
namespace Goo {}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
KeywordRecommending
)]
[
WorkItem
(
362
,
"https://github.com/dotnet/roslyn/issues/362"
)]
public
async
Task
TestNotBeforeAssemblyAttributeAndAfterUsingWithoutOpenBracket
()
{
await
VerifyAbsenceAsync
(
@"
using System;
$$
[assembly: Whatever]
namespace Goo {}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
KeywordRecommending
)]
[
WorkItem
(
362
,
"https://github.com/dotnet/roslyn/issues/362"
)]
public
async
Task
TestBeforeAssemblyAttributeAndAfterUsingWithoutOpenBracket
()
{
await
VerifyKeywordAsync
(
@"
using System;
[$$
[assembly: Whatever]
namespace Goo {}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
KeywordRecommending
)]
public
async
Task
TestNotInOuterAttributeInNamespace
()
{
...
...
src/Features/CSharp/Portable/Completion/KeywordRecommenders/AssemblyKeywordRecommender.cs
浏览文件 @
c6561868
...
...
@@ -17,14 +17,13 @@ public AssemblyKeywordRecommender()
protected
override
bool
IsValidContext
(
int
position
,
CSharpSyntaxContext
context
,
CancellationToken
cancellationToken
)
{
if
(
context
.
TargetToken
.
IsBeforeNamespace
()||
context
.
IsTypeAttributeContext
(
cancellationToken
)
)
if
(
context
.
IsTypeAttributeContextBefore
(
SyntaxKind
.
NamespaceKeyword
,
cancellationToken
)
)
{
var
token
=
context
.
LeftToken
;
var
type
=
token
.
GetAncestor
<
MemberDeclarationSyntax
>();
return
type
==
null
||
type
.
IsParentKind
(
SyntaxKind
.
CompilationUnit
);
}
return
false
;
}
}
...
...
src/Workspaces/CSharp/Portable/Extensions/ContextQuery/CSharpSyntaxContext.cs
浏览文件 @
c6561868
...
...
@@ -283,6 +283,27 @@ public bool IsTypeAttributeContext(CancellationToken cancellationToken)
return
false
;
}
public
bool
IsTypeAttributeContextBefore
(
SyntaxKind
syntaxKind
,
CancellationToken
cancellationToken
)
{
// cases:
// [ |
// class C {
var
token
=
TargetToken
;
// Note that we pass the token.SpanStart to IsTypeDeclarationContext below. This is a bit subtle,
// but we want to be sure that the attribute itself (i.e. the open square bracket, '[') is in a
// type declaration context.
if
(
token
.
Kind
()
==
SyntaxKind
.
OpenBracketToken
&&
(
token
.
GetNextToken
().
Kind
()
==
syntaxKind
||
token
.
Parent
.
Kind
()
==
SyntaxKind
.
AttributeList
)
&&
SyntaxTree
.
IsTypeDeclarationContext
(
token
.
SpanStart
,
contextOpt
:
null
,
validModifiers
:
null
,
validTypeDeclarations
:
SyntaxKindSet
.
ClassStructTypeDeclarations
,
canBePartial
:
false
,
cancellationToken
:
cancellationToken
))
{
return
true
;
}
return
false
;
}
public
bool
IsTypeDeclarationContext
(
ISet
<
SyntaxKind
>
validModifiers
=
null
,
ISet
<
SyntaxKind
>
validTypeDeclarations
=
null
,
...
...
src/Workspaces/CSharp/Portable/Extensions/ContextQuery/SyntaxTokenExtensions.cs
浏览文件 @
c6561868
...
...
@@ -670,13 +670,5 @@ public static bool IsMandatoryNamedParameterPosition(this SyntaxToken token)
return
false
;
}
public
static
bool
IsBeforeNamespace
(
this
SyntaxToken
token
)
{
// cases:
// | namespace Goo
// | [N] namespace Goo
return
token
.
GetNextToken
().
Kind
()
==
SyntaxKind
.
NamespaceKeyword
;
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录