Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
78ed0b34
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,发现更多精彩内容 >>
提交
78ed0b34
编写于
4月 21, 2017
作者:
C
CyrusNajmabadi
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'upstream/master' into removeSynchronousFindRefsObjectBrowser
上级
05c2f647
f7848c91
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
43 deletion
+33
-43
src/EditorFeatures/CSharpTest/NavigateTo/NavigateToTests.cs
src/EditorFeatures/CSharpTest/NavigateTo/NavigateToTests.cs
+18
-0
src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionsSource.cs
...Core/Implementation/Suggestions/SuggestedActionsSource.cs
+7
-42
src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxFactsService.cs
...arp/Portable/LanguageServices/CSharpSyntaxFactsService.cs
+8
-1
未找到文件。
src/EditorFeatures/CSharpTest/NavigateTo/NavigateToTests.cs
浏览文件 @
78ed0b34
...
...
@@ -1095,5 +1095,23 @@ public void ToError()
VerifyNavigateToResultItem
(
item
,
"ToError"
,
"ToError()"
,
MatchKind
.
Regular
,
NavigateToItemKind
.
Method
);
});
}
[
WorkItem
(
18843
,
"https://github.com/dotnet/roslyn/issues/18843"
)]
[
WpfFact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
NavigateTo
)]
public
async
Task
Test__arglist
()
{
await
TestAsync
(
@"class C
{
public void ToError(__arglist)
{
}
}"
,
async
w
=>
{
SetupVerifiableGlyph
(
StandardGlyphGroup
.
GlyphGroupMethod
,
StandardGlyphItem
.
GlyphItemPublic
);
var
item
=
(
await
_aggregator
.
GetItemsAsync
(
"ToError"
)).
Single
();
VerifyNavigateToResultItem
(
item
,
"ToError"
,
"[|ToError|](__arglist)"
,
MatchKind
.
Exact
,
NavigateToItemKind
.
Method
);
});
}
}
}
\ No newline at end of file
src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionsSource.cs
浏览文件 @
78ed0b34
...
...
@@ -113,7 +113,7 @@ public bool TryGetTelemetryId(out Guid telemetryId)
using
(
Logger
.
LogBlock
(
FunctionId
.
SuggestedActions_GetSuggestedActions
,
cancellationToken
))
{
var
document
=
GetMatchingDocumentAsync
(
range
.
Snapshot
,
cancellationToken
).
WaitAndGetResult
(
cancellationToken
);
var
document
=
range
.
Snapshot
.
GetOpenDocumentInCurrentContextWithChanges
(
);
if
(
document
==
null
)
{
// this is here to fail test and see why it is failed.
...
...
@@ -288,7 +288,7 @@ private bool IsApplicable(CodeAction action, Workspace workspace)
if
(!
action
.
PerformFinalApplicabilityCheck
)
{
// If we don't even need to perform the final applicability check,
// then the code act
oi
n is applicable.
// then the code act
io
n is applicable.
return
true
;
}
...
...
@@ -588,7 +588,10 @@ private static SuggestedActionSetPriority GetSuggestedActionSetPriority(CodeActi
applicableSpan
);
}
public
async
Task
<
bool
>
HasSuggestedActionsAsync
(
ISuggestedActionCategorySet
requestedActionCategories
,
SnapshotSpan
range
,
CancellationToken
cancellationToken
)
public
async
Task
<
bool
>
HasSuggestedActionsAsync
(
ISuggestedActionCategorySet
requestedActionCategories
,
SnapshotSpan
range
,
CancellationToken
cancellationToken
)
{
// Explicitly hold onto below fields in locals and use these locals throughout this code path to avoid crashes
// if these fields happen to be cleared by Dispose() below. This is required since this code path involves
...
...
@@ -604,7 +607,7 @@ public async Task<bool> HasSuggestedActionsAsync(ISuggestedActionCategorySet req
using
(
var
asyncToken
=
provider
.
OperationListener
.
BeginAsyncOperation
(
"HasSuggestedActionsAsync"
))
{
var
document
=
await
GetMatchingDocumentAsync
(
range
.
Snapshot
,
cancellationToken
).
ConfigureAwait
(
false
);
var
document
=
range
.
Snapshot
.
GetOpenDocumentInCurrentContextWithChanges
(
);
if
(
document
==
null
)
{
// this is here to fail test and see why it is failed.
...
...
@@ -722,44 +725,6 @@ public async Task<bool> HasSuggestedActionsAsync(ISuggestedActionCategorySet req
return
translatedSpan
.
Span
.
ToTextSpan
();
}
private
static
async
Task
<
Document
>
GetMatchingDocumentAsync
(
ITextSnapshot
givenSnapshot
,
CancellationToken
cancellationToken
)
{
var
buffer
=
givenSnapshot
.
TextBuffer
;
if
(
buffer
==
null
)
{
return
null
;
}
var
workspace
=
buffer
.
GetWorkspace
();
if
(
workspace
==
null
)
{
return
null
;
}
var
documentId
=
workspace
.
GetDocumentIdInCurrentContext
(
buffer
.
AsTextContainer
());
if
(
documentId
==
null
)
{
return
null
;
}
var
document
=
workspace
.
CurrentSolution
.
GetDocument
(
documentId
);
if
(
document
==
null
)
{
return
null
;
}
var
sourceText
=
await
document
.
GetTextAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
cancellationToken
.
ThrowIfCancellationRequested
();
var
snapshot
=
sourceText
.
FindCorrespondingEditorTextSnapshot
();
if
(
snapshot
==
null
||
snapshot
.
Version
.
ReiteratedVersionNumber
!=
givenSnapshot
.
Version
.
ReiteratedVersionNumber
)
{
return
null
;
}
return
document
;
}
private
void
OnTextViewClosed
(
object
sender
,
EventArgs
e
)
{
Dispose
();
...
...
src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxFactsService.cs
浏览文件 @
78ed0b34
...
...
@@ -1014,7 +1014,14 @@ private void AppendParameters(SeparatedSyntaxList<ParameterSyntax> parameters, S
builder
.
Append
(
' '
);
}
AppendTokens
(
parameter
.
Type
,
builder
);
if
(
parameter
.
Type
!=
null
)
{
AppendTokens
(
parameter
.
Type
,
builder
);
}
else
{
builder
.
Append
(
parameter
.
Identifier
.
Text
);
}
first
=
false
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录