Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
3cbf7dfd
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,发现更多精彩内容 >>
提交
3cbf7dfd
编写于
11月 07, 2016
作者:
R
Ravi Chande
提交者:
GitHub
11月 07, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #14868 from rchande/sighelpLinkedFiles
Fix sighelp crash in linked files
上级
df89375a
f18e350e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
51 addition
and
12 deletion
+51
-12
src/EditorFeatures/CSharpTest/SignatureHelp/TupleConstructionSignatureHelpProviderTests.cs
...natureHelp/TupleConstructionSignatureHelpProviderTests.cs
+30
-0
src/Features/CSharp/Portable/SignatureHelp/TupleConstructionSignatureHelpProvider.cs
...e/SignatureHelp/TupleConstructionSignatureHelpProvider.cs
+19
-10
src/Features/Core/Portable/SignatureHelp/AbstractSignatureHelpProvider.cs
...e/Portable/SignatureHelp/AbstractSignatureHelpProvider.cs
+2
-2
未找到文件。
src/EditorFeatures/CSharpTest/SignatureHelp/TupleConstructionSignatureHelpProviderTests.cs
浏览文件 @
3cbf7dfd
...
...
@@ -200,5 +200,35 @@ static void Main(string[] args)
await
TestAsync
(
markup
,
expectedOrderedItems
,
usePreviousCharAsTrigger
:
true
);
}
[
WorkItem
(
14793
,
"https://github.com/dotnet/roslyn/issues/14793"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
SignatureHelp
)]
public
async
Task
DoNotCrashInLinkedFile
()
{
var
markup
=
@"<Workspace>
<Project Language=""C#"" CommonReferences=""true"" AssemblyName=""Proj1"" PreprocessorSymbols=""FOO"">
<Document FilePath=""SourceDocument""><![CDATA[
class C
{
#if FOO
void bar()
{
}
#endif
void foo()
{
(int, string) x = ($$
}
}
]]>
</Document>
</Project>
<Project Language=""C#"" CommonReferences=""true"" AssemblyName=""Proj2"">
<Document IsLinkFile=""true"" LinkAssemblyName=""Proj1"" LinkFilePath=""SourceDocument""/>
</Project>
</Workspace>"
;
var
expectedDescription
=
new
SignatureHelpTestItem
(
$"(int, string)"
,
currentParameterIndex
:
0
);
await
VerifyItemWithReferenceWorkerAsync
(
markup
,
new
[]
{
expectedDescription
},
false
);
}
}
}
src/Features/CSharp/Portable/SignatureHelp/TupleConstructionSignatureHelpProvider.cs
浏览文件 @
3cbf7dfd
...
...
@@ -152,21 +152,30 @@ protected override async Task<SignatureHelpItems> GetItemsWorkerAsync(Document d
private
SignatureHelpItems
CreateItems
(
int
position
,
SyntaxNode
root
,
ISyntaxFactsService
syntaxFacts
,
SyntaxNode
targetExpression
,
SemanticModel
semanticModel
,
IEnumerable
<
INamedTypeSymbol
>
tupleTypes
,
CancellationToken
cancellationToken
)
{
var
prefixParts
=
SpecializedCollections
.
SingletonEnumerable
(
new
SymbolDisplayPart
(
SymbolDisplayPartKind
.
Punctuation
,
null
,
"("
));
var
suffixParts
=
SpecializedCollections
.
SingletonEnumerable
(
new
SymbolDisplayPart
(
SymbolDisplayPartKind
.
Punctuation
,
null
,
")"
));
var
separatorParts
=
GetSeparatorParts
();
var
prefixParts
=
SpecializedCollections
.
SingletonEnumerable
(
new
SymbolDisplayPart
(
SymbolDisplayPartKind
.
Punctuation
,
null
,
"("
))
.
ToTaggedText
()
;
var
suffixParts
=
SpecializedCollections
.
SingletonEnumerable
(
new
SymbolDisplayPart
(
SymbolDisplayPartKind
.
Punctuation
,
null
,
")"
))
.
ToTaggedText
()
;
var
separatorParts
=
GetSeparatorParts
()
.
ToTaggedText
()
;
var
items
=
tupleTypes
.
Select
(
t
=>
new
SignatureHelpItem
(
isVariadic
:
false
,
var
items
=
tupleTypes
.
Select
(
tupleType
=>
Convert
(
tupleType
,
prefixParts
,
suffixParts
,
separatorParts
,
semanticModel
,
position
))
.
ToList
();
var
state
=
GetCurrentArgumentState
(
root
,
position
,
syntaxFacts
,
targetExpression
.
FullSpan
,
cancellationToken
);
return
CreateSignatureHelpItems
(
items
,
targetExpression
.
Span
,
state
);
}
SignatureHelpItem
Convert
(
INamedTypeSymbol
tupleType
,
ImmutableArray
<
TaggedText
>
prefixParts
,
ImmutableArray
<
TaggedText
>
suffixParts
,
ImmutableArray
<
TaggedText
>
separatorParts
,
SemanticModel
semanticModel
,
int
position
)
{
return
new
SymbolKeySignatureHelpItem
(
symbol
:
tupleType
,
isVariadic
:
false
,
documentationFactory
:
null
,
prefixParts
:
prefixParts
,
separatorParts
:
separatorParts
,
suffixParts
:
suffixParts
,
parameters
:
ConvertTupleMembers
(
t
,
semanticModel
,
position
),
descriptionParts
:
null
)).
ToList
();
var
state
=
GetCurrentArgumentState
(
root
,
position
,
syntaxFacts
,
targetExpression
.
FullSpan
,
cancellationToken
);
return
CreateSignatureHelpItems
(
items
,
targetExpression
.
Span
,
state
);
parameters
:
ConvertTupleMembers
(
tupleType
,
semanticModel
,
position
),
descriptionParts
:
null
);
}
private
IEnumerable
<
SignatureHelpParameter
>
ConvertTupleMembers
(
INamedTypeSymbol
tupleType
,
SemanticModel
semanticModel
,
int
position
)
...
...
src/Features/Core/Portable/SignatureHelp/AbstractSignatureHelpProvider.cs
浏览文件 @
3cbf7dfd
...
...
@@ -188,7 +188,7 @@ where part.Symbol.IsNormalAnonymousType()
var
finalItems
=
new
List
<
SignatureHelpItem
>();
foreach
(
var
item
in
itemsForCurrentDocument
.
Items
)
{
var
symbolKey
=
(
(
SymbolKeySignatureHelpItem
)
item
)
.
SymbolKey
;
var
symbolKey
=
(
item
as
SymbolKeySignatureHelpItem
)?
.
SymbolKey
;
if
(
symbolKey
==
null
)
{
finalItems
.
Add
(
item
);
...
...
@@ -224,7 +224,7 @@ where part.Symbol.IsNormalAnonymousType()
foreach
(
var
related
in
relatedDocuments
)
{
// If we don't have symbol keys, give up.
if
(
related
.
Item2
.
Any
(
s
=>
(
(
SymbolKeySignatureHelpItem
)
s
)
.
SymbolKey
==
null
))
if
(
related
.
Item2
.
Any
(
s
=>
(
s
as
SymbolKeySignatureHelpItem
)?
.
SymbolKey
==
null
))
{
continue
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录