Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
75bc570f
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,发现更多精彩内容 >>
提交
75bc570f
编写于
10月 30, 2015
作者:
D
Dustin Campbell
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make doc comment parsing for code model external elements a bit more robust
上级
98888e29
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
50 addition
and
7 deletion
+50
-7
src/VisualStudio/Core/Impl/CodeModel/ExternalElements/AbstractExternalCodeElement.cs
...CodeModel/ExternalElements/AbstractExternalCodeElement.cs
+23
-7
src/VisualStudio/Core/Test/CodeModel/CSharp/ExternalCodeClassTests.vb
...udio/Core/Test/CodeModel/CSharp/ExternalCodeClassTests.vb
+14
-0
src/VisualStudio/Core/Test/CodeModel/VisualBasic/ExternalCodeClassTests.vb
...Core/Test/CodeModel/VisualBasic/ExternalCodeClassTests.vb
+13
-0
未找到文件。
src/VisualStudio/Core/Impl/CodeModel/ExternalElements/AbstractExternalCodeElement.cs
浏览文件 @
75bc570f
...
...
@@ -57,6 +57,20 @@ protected virtual EnvDTE.vsCMAccess GetAccess()
return
CodeModelService
.
GetAccess
(
LookupSymbol
());
}
private
static
bool
TryParseDocCommentXml
(
string
text
,
out
XElement
xml
)
{
try
{
xml
=
XElement
.
Parse
(
text
);
return
true
;
}
catch
(
XmlException
)
{
xml
=
null
;
return
false
;
}
}
protected
virtual
string
GetDocComment
()
{
var
symbol
=
LookupSymbol
();
...
...
@@ -73,14 +87,16 @@ protected virtual string GetDocComment()
}
XElement
xml
;
try
if
(!
TryParseDocCommentXml
(
documentationCommentXml
,
out
xml
))
{
xml
=
XElement
.
Parse
(
documentationCommentXml
);
}
catch
(
XmlException
)
// If we failed to parse, maybe it was because the XML fragment represents multiple elements.
// Try surrounding with <doc></doc> and parse again.
if
(!
TryParseDocCommentXml
(
$"<doc>
{
documentationCommentXml
}
</doc>"
,
out
xml
))
{
return
string
.
Empty
;
}
}
// Surround with <doc> element. Or replace <member> element with <doc>, if it exists.
if
(
xml
.
Name
==
"member"
)
...
...
@@ -88,7 +104,7 @@ protected virtual string GetDocComment()
xml
.
Name
=
"doc"
;
xml
.
RemoveAttributes
();
}
else
else
if
(
xml
.
Name
!=
"doc"
)
{
xml
=
new
XElement
(
"doc"
,
xml
);
}
...
...
src/VisualStudio/Core/Test/CodeModel/CSharp/ExternalCodeClassTests.vb
浏览文件 @
75bc570f
...
...
@@ -22,6 +22,20 @@ class C$$
TestDocComment
(
code
,
"<doc>"
&
vbCrLf
&
" <summary>This is my comment!</summary>"
&
vbCrLf
&
"</doc>"
)
End
Sub
<
ConditionalWpfFact
(
GetType
(
x86
)),
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeModel
)
>
Public
Sub
DocComment2
()
Dim
code
=
<
Code
>
///
&
lt
;
summary>
;
This
is
my
comment!
&
lt
;
/
summary>
;
///
&
lt
;
remarks
/&
gt
;
class
C
$$
{
}
</
Code
>
TestDocComment
(
code
,
"<doc>"
&
vbCrLf
&
" <summary>This is my comment!</summary>"
&
vbCrLf
&
" <remarks />"
&
vbCrLf
&
"</doc>"
)
End
Sub
#End Region
<
ConditionalWpfFact
(
GetType
(
x86
)),
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeModel
)
>
...
...
src/VisualStudio/Core/Test/CodeModel/VisualBasic/ExternalCodeClassTests.vb
浏览文件 @
75bc570f
...
...
@@ -21,6 +21,19 @@ End Class
TestDocComment
(
code
,
"<doc>"
&
vbCrLf
&
" <summary>This is my comment!</summary>"
&
vbCrLf
&
"</doc>"
)
End
Sub
<
ConditionalWpfFact
(
GetType
(
x86
)),
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeModel
)
>
Public
Sub
DocComment2
()
Dim
code
=
<
Code
>
''' <summary>This is my comment!</summary>
''' <remarks />
Class
C
$$
End
Class
</
Code
>
TestDocComment
(
code
,
"<doc>"
&
vbCrLf
&
" <summary>This is my comment!</summary>"
&
vbCrLf
&
" <remarks />"
&
vbCrLf
&
"</doc>"
)
End
Sub
#End Region
<
ConditionalWpfFact
(
GetType
(
x86
)),
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeModel
)
>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录