Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
bfe05f42
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,发现更多精彩内容 >>
提交
bfe05f42
编写于
8月 07, 2018
作者:
L
Lillo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve code in AssemblyKeywordRecommender -> IsValidContext
上级
c6561868
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
28 deletion
+13
-28
src/Features/CSharp/Portable/Completion/KeywordRecommenders/AssemblyKeywordRecommender.cs
...pletion/KeywordRecommenders/AssemblyKeywordRecommender.cs
+13
-8
src/Workspaces/CSharp/Portable/Extensions/ContextQuery/CSharpSyntaxContext.cs
...p/Portable/Extensions/ContextQuery/CSharpSyntaxContext.cs
+0
-20
未找到文件。
src/Features/CSharp/Portable/Completion/KeywordRecommenders/AssemblyKeywordRecommender.cs
浏览文件 @
bfe05f42
// 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.Threading
;
using
Microsoft.CodeAnalysis.CSharp.Extensions
;
using
Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery
;
using
Microsoft.CodeAnalysis.CSharp.Syntax
;
using
Microsoft.CodeAnalysis.Shared.Extensions
;
namespace
Microsoft.CodeAnalysis.CSharp.Completion.KeywordRecommenders
{
...
...
@@ -17,14 +15,21 @@ public AssemblyKeywordRecommender()
protected
override
bool
IsValidContext
(
int
position
,
CSharpSyntaxContext
context
,
CancellationToken
cancellationToken
)
{
if
(
context
.
IsTypeAttributeContextBefore
(
SyntaxKind
.
NamespaceKeyword
,
cancellationToken
))
{
var
token
=
context
.
LeftToken
;
var
type
=
token
.
GetAncestor
<
MemberDeclarationSyntax
>();
var
token
=
context
.
TargetToken
;
return
type
==
null
||
type
.
IsParentKind
(
SyntaxKind
.
CompilationUnit
);
// 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
)
return
false
;
if
(
token
.
Parent
.
Kind
()
==
SyntaxKind
.
AttributeList
)
{
var
previousSyntax
=
token
.
GetPreviousToken
().
Parent
;
return
previousSyntax
==
null
;
}
return
false
;
var
nextSyntax
=
token
.
GetNextToken
().
Parent
;
var
currentSyntax
=
token
.
Parent
;
return
nextSyntax
is
NamespaceDeclarationSyntax
||
currentSyntax
is
CompilationUnitSyntax
;
}
}
}
src/Workspaces/CSharp/Portable/Extensions/ContextQuery/CSharpSyntaxContext.cs
浏览文件 @
bfe05f42
...
...
@@ -283,26 +283,6 @@ 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
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录