Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
15525f29
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,发现更多精彩内容 >>
提交
15525f29
编写于
1月 25, 2020
作者:
C
Christopher Schütz
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix issue with "Add Import" code fix
上级
92f024ab
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
46 addition
and
3 deletion
+46
-3
src/EditorFeatures/CSharpTest/AddUsing/AddUsingTests_NuGet.cs
...EditorFeatures/CSharpTest/AddUsing/AddUsingTests_NuGet.cs
+33
-0
src/Features/Core/Portable/AddImport/AbstractAddImportCodeFixProvider.cs
...re/Portable/AddImport/AbstractAddImportCodeFixProvider.cs
+13
-3
未找到文件。
src/EditorFeatures/CSharpTest/AddUsing/AddUsingTests_NuGet.cs
浏览文件 @
15525f29
...
...
@@ -277,6 +277,39 @@ public async Task TestFailedInstallRollsBackFile()
installerServiceMock
.
Verify
();
}
[
WorkItem
(
40857
,
"https://github.com/dotnet/roslyn/issues/40857"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsAddImport
)]
public
async
Task
TestNuGetFailureDoesNotImpactCodeFix
()
{
var
installerServiceMock
=
new
Mock
<
IPackageInstallerService
>(
MockBehavior
.
Strict
);
installerServiceMock
.
Setup
(
i
=>
i
.
IsEnabled
(
It
.
IsAny
<
ProjectId
>())).
Returns
(
true
);
installerServiceMock
.
Setup
(
i
=>
i
.
GetPackageSources
()).
Throws
(
new
Exception
(
"Test Exception"
));
var
packageServiceMock
=
new
Mock
<
ISymbolSearchService
>(
MockBehavior
.
Strict
);
packageServiceMock
.
Setup
(
s
=>
s
.
FindReferenceAssembliesWithTypeAsync
(
"NuGetType"
,
0
,
It
.
IsAny
<
CancellationToken
>()))
.
Returns
(
Task
.
FromResult
<
IList
<
ReferenceAssemblyWithTypeResult
>>(
new
List
<
ReferenceAssemblyWithTypeResult
>()));
packageServiceMock
.
Setup
(
s
=>
s
.
FindPackagesWithTypeAsync
(
NugetOrgSource
,
"NuGetType"
,
0
,
It
.
IsAny
<
CancellationToken
>()))
.
Returns
(
CreateSearchResult
(
null
));
await
TestInRegularAndScriptAsync
(
@"class Class
{
[|IDictionary|] Method()
{
Goo();
}
}"
,
@"using System.Collections;
class Class
{
IDictionary Method()
{
Goo();
}
}"
,
fixProviderData
:
new
FixProviderData
(
installerServiceMock
.
Object
,
packageServiceMock
.
Object
));
}
private
Task
<
IList
<
PackageWithTypeResult
>>
CreateSearchResult
(
string
packageName
,
string
typeName
,
ImmutableArray
<
string
>
containingNamespaceNames
)
{
...
...
src/Features/Core/Portable/AddImport/AbstractAddImportCodeFixProvider.cs
浏览文件 @
15525f29
...
...
@@ -56,9 +56,19 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
:
null
;
var
installerService
=
GetPackageInstallerService
(
document
);
var
packageSources
=
searchNuGetPackages
&&
symbolSearchService
!=
null
&&
installerService
?.
IsEnabled
(
document
.
Project
.
Id
)
==
true
ImmutableArray
<
PackageSource
>
packageSources
;
try
{
// Ensure any issues with getting access to package sources will not break the Code Fix for local imports
// https://github.com/dotnet/roslyn/issues/40857
packageSources
=
searchNuGetPackages
&&
symbolSearchService
!=
null
&&
installerService
?.
IsEnabled
(
document
.
Project
.
Id
)
==
true
?
installerService
.
GetPackageSources
()
:
ImmutableArray
<
PackageSource
>.
Empty
;
}
catch
{
packageSources
=
ImmutableArray
<
PackageSource
>.
Empty
;
}
var
fixesForDiagnostic
=
await
addImportService
.
GetFixesForDiagnosticsAsync
(
document
,
span
,
diagnostics
,
MaxResults
,
symbolSearchService
,
searchReferenceAssemblies
,
packageSources
,
cancellationToken
).
ConfigureAwait
(
false
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录