Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
9c2c3382
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,发现更多精彩内容 >>
提交
9c2c3382
编写于
9月 27, 2020
作者:
C
Cyrus Najmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix xml attribute name classification
上级
2349c133
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
74 addition
and
15 deletion
+74
-15
src/EditorFeatures/CSharpTest/Classification/SyntacticClassifierTests.cs
...res/CSharpTest/Classification/SyntacticClassifierTests.cs
+55
-0
src/Workspaces/CSharp/Portable/Classification/Worker_DocumentationComments.cs
...p/Portable/Classification/Worker_DocumentationComments.cs
+19
-15
未找到文件。
src/EditorFeatures/CSharpTest/Classification/SyntacticClassifierTests.cs
浏览文件 @
9c2c3382
...
...
@@ -5518,5 +5518,60 @@ class C
Punctuation
.
Semicolon
,
Punctuation
.
CloseCurly
);
}
[
Fact
,
WorkItem
(
48094
,
"https://github.com/dotnet/roslyn/issues/48094"
)]
public
async
Task
TestXmlAttributeNameSpan1
()
{
var
source
=
@"/// <param name=""value""></param>"
;
using
var
workspace
=
CreateWorkspace
(
source
,
options
:
null
,
TestHost
.
InProcess
);
var
document
=
workspace
.
CurrentSolution
.
Projects
.
First
().
Documents
.
First
();
var
classifications
=
await
GetSyntacticClassificationsAsync
(
document
,
new
TextSpan
(
0
,
source
.
Length
));
Assert
.
Equal
(
new
[]
{
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentDelimiter
,
new
TextSpan
(
0
,
3
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentText
,
new
TextSpan
(
3
,
1
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentDelimiter
,
new
TextSpan
(
4
,
1
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentName
,
new
TextSpan
(
5
,
5
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentAttributeName
,
new
TextSpan
(
11
,
4
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentDelimiter
,
new
TextSpan
(
15
,
1
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentAttributeQuotes
,
new
TextSpan
(
16
,
1
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
Identifier
,
new
TextSpan
(
17
,
5
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentAttributeQuotes
,
new
TextSpan
(
22
,
1
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentDelimiter
,
new
TextSpan
(
23
,
1
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentDelimiter
,
new
TextSpan
(
24
,
2
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentName
,
new
TextSpan
(
26
,
5
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentDelimiter
,
new
TextSpan
(
31
,
1
))
},
classifications
);
}
[
Fact
,
WorkItem
(
48094
,
"https://github.com/dotnet/roslyn/issues/48094"
)]
public
async
Task
TestXmlAttributeNameSpan2
()
{
var
source
=
@"
/// <param
/// name=""value""></param>"
;
using
var
workspace
=
CreateWorkspace
(
source
,
options
:
null
,
TestHost
.
InProcess
);
var
document
=
workspace
.
CurrentSolution
.
Projects
.
First
().
Documents
.
First
();
var
classifications
=
await
GetSyntacticClassificationsAsync
(
document
,
new
TextSpan
(
0
,
source
.
Length
));
Assert
.
Equal
(
new
[]
{
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentDelimiter
,
new
TextSpan
(
2
,
3
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentText
,
new
TextSpan
(
5
,
1
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentDelimiter
,
new
TextSpan
(
6
,
1
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentName
,
new
TextSpan
(
7
,
5
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentDelimiter
,
new
TextSpan
(
14
,
3
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentAttributeName
,
new
TextSpan
(
18
,
4
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentDelimiter
,
new
TextSpan
(
22
,
1
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentAttributeQuotes
,
new
TextSpan
(
23
,
1
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
Identifier
,
new
TextSpan
(
24
,
5
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentAttributeQuotes
,
new
TextSpan
(
29
,
1
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentDelimiter
,
new
TextSpan
(
30
,
1
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentDelimiter
,
new
TextSpan
(
31
,
2
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentName
,
new
TextSpan
(
33
,
5
)),
new
ClassifiedSpan
(
ClassificationTypeNames
.
XmlDocCommentDelimiter
,
new
TextSpan
(
38
,
1
))
},
classifications
);
}
}
}
src/Workspaces/CSharp/Portable/Classification/Worker_DocumentationComments.cs
浏览文件 @
9c2c3382
...
...
@@ -200,28 +200,32 @@ private void ClassifyXmlTextToken(SyntaxToken token)
private
void
ClassifyXmlName
(
XmlNameSyntax
node
)
{
string
classificationType
;
if
(
node
.
Parent
is
XmlAttributeSyntax
)
var
classificationType
=
node
.
Parent
switch
{
classificationType
=
ClassificationTypeNames
.
XmlDocCommentAttributeName
;
}
else
if
(
node
.
Parent
is
XmlProcessingInstructionSyntax
)
{
classificationType
=
ClassificationTypeNames
.
XmlDocCommentProcessingInstruction
;
}
else
{
classificationType
=
ClassificationTypeNames
.
XmlDocCommentName
;
}
XmlAttributeSyntax
=>
ClassificationTypeNames
.
XmlDocCommentAttributeName
,
XmlProcessingInstructionSyntax
=>
ClassificationTypeNames
.
XmlDocCommentProcessingInstruction
,
_
=>
ClassificationTypeNames
.
XmlDocCommentName
,
};
var
prefix
=
node
.
Prefix
;
if
(
prefix
!=
null
)
{
AddXmlClassification
(
prefix
.
Prefix
,
classificationType
);
AddXmlClassification
(
prefix
.
ColonToken
,
classificationType
);
AddXmlNameTokenClassification
(
prefix
.
Prefix
,
classificationType
);
AddXmlNameTokenClassification
(
prefix
.
ColonToken
,
classificationType
);
}
AddXmlNameTokenClassification
(
node
.
LocalName
,
classificationType
);
}
AddXmlClassification
(
node
.
LocalName
,
classificationType
);
private
void
AddXmlNameTokenClassification
(
SyntaxToken
token
,
string
classificationType
)
{
if
(
token
.
HasLeadingTrivia
)
ClassifyXmlTrivia
(
token
.
LeadingTrivia
,
whitespaceClassificationType
:
null
);
AddClassification
(
token
,
classificationType
);
if
(
token
.
HasTrailingTrivia
)
ClassifyXmlTrivia
(
token
.
TrailingTrivia
,
whitespaceClassificationType
:
null
);
}
private
void
ClassifyXmlElement
(
XmlElementSyntax
node
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录