Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
c0363c56
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,发现更多精彩内容 >>
提交
c0363c56
编写于
10月 02, 2019
作者:
Y
yair halberstadt
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix nullable warnings
上级
c5c9ce04
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
2 deletion
+12
-2
src/Workspaces/Core/Portable/Editing/ImportAdder.cs
src/Workspaces/Core/Portable/Editing/ImportAdder.cs
+5
-0
src/Workspaces/Core/Portable/Editing/ImportAdderService.cs
src/Workspaces/Core/Portable/Editing/ImportAdderService.cs
+7
-2
未找到文件。
src/Workspaces/Core/Portable/Editing/ImportAdder.cs
浏览文件 @
c0363c56
...
...
@@ -9,6 +9,7 @@
using
Microsoft.CodeAnalysis.Options
;
using
Microsoft.CodeAnalysis.Shared.Extensions
;
using
Microsoft.CodeAnalysis.Text
;
using
Roslyn.Utilities
;
namespace
Microsoft.CodeAnalysis.Editing
{
...
...
@@ -52,6 +53,7 @@ public static Task<Document> AddImportsAsync(Document document, IEnumerable<Text
internal
static
async
Task
<
Document
>
AddImportsFromSyntaxesAsync
(
Document
document
,
bool
safe
=
true
,
OptionSet
?
options
=
null
,
CancellationToken
cancellationToken
=
default
)
{
var
root
=
await
document
.
GetSyntaxRootAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
Contract
.
ThrowIfNull
(
root
);
return
await
AddImportsFromSyntaxesAsync
(
document
,
root
.
FullSpan
,
safe
,
options
,
cancellationToken
).
ConfigureAwait
(
false
);
}
...
...
@@ -69,6 +71,7 @@ internal static Task<Document> AddImportsFromSyntaxesAsync(Document document, Te
internal
static
async
Task
<
Document
>
AddImportsFromSyntaxesAsync
(
Document
document
,
SyntaxAnnotation
annotation
,
bool
safe
=
true
,
OptionSet
?
options
=
null
,
CancellationToken
cancellationToken
=
default
)
{
var
root
=
await
document
.
GetSyntaxRootAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
Contract
.
ThrowIfNull
(
root
);
return
await
AddImportsFromSyntaxesAsync
(
document
,
root
.
GetAnnotatedNodesAndTokens
(
annotation
).
Select
(
t
=>
t
.
FullSpan
),
safe
,
options
,
cancellationToken
).
ConfigureAwait
(
false
);
}
...
...
@@ -94,6 +97,7 @@ internal static Task<Document> AddImportsFromSyntaxesAsync(Document document, IE
internal
static
async
Task
<
Document
>
AddImportsFromSymbolAnnotationAsync
(
Document
document
,
bool
safe
=
true
,
OptionSet
?
options
=
null
,
CancellationToken
cancellationToken
=
default
)
{
var
root
=
await
document
.
GetSyntaxRootAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
Contract
.
ThrowIfNull
(
root
);
return
await
AddImportsFromSymbolAnnotationAsync
(
document
,
root
.
FullSpan
,
safe
,
options
,
cancellationToken
).
ConfigureAwait
(
false
);
}
...
...
@@ -111,6 +115,7 @@ internal static Task<Document> AddImportsFromSymbolAnnotationAsync(Document docu
internal
static
async
Task
<
Document
>
AddImportsFromSymbolAnnotationAsync
(
Document
document
,
SyntaxAnnotation
annotation
,
bool
safe
=
true
,
OptionSet
?
options
=
null
,
CancellationToken
cancellationToken
=
default
)
{
var
root
=
await
document
.
GetSyntaxRootAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
Contract
.
ThrowIfNull
(
root
);
return
await
AddImportsFromSymbolAnnotationAsync
(
document
,
root
.
GetAnnotatedNodesAndTokens
(
annotation
).
Select
(
t
=>
t
.
FullSpan
),
safe
,
options
,
cancellationToken
).
ConfigureAwait
(
false
);
}
...
...
src/Workspaces/Core/Portable/Editing/ImportAdderService.cs
浏览文件 @
c0363c56
...
...
@@ -40,6 +40,7 @@ public enum Strategy
options
??=
await
document
.
GetOptionsAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
var
model
=
await
document
.
GetSemanticModelAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
Contract
.
ThrowIfNull
(
model
);
var
root
=
await
model
.
SyntaxTree
.
GetRootAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
var
addImportsService
=
document
.
GetLanguageService
<
IAddImportsService
>();
var
generator
=
SyntaxGenerator
.
GetGenerator
(
document
);
...
...
@@ -68,14 +69,18 @@ public enum Strategy
// This will allow us to find it after we have called MakeSafeToAddNamespaces.
var
annotation
=
new
SyntaxAnnotation
();
document
=
document
.
WithSyntaxRoot
(
root
.
ReplaceNode
(
context
,
context
.
WithAdditionalAnnotations
(
annotation
)));
root
=
await
document
.
GetSyntaxRootAsync
().
ConfigureAwait
(
false
);
root
=
(
await
document
.
GetSyntaxRootAsync
().
ConfigureAwait
(
false
))!;
model
=
await
document
.
GetSemanticModelAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
Contract
.
ThrowIfNull
(
model
);
// Make Safe to add namespaces
document
=
document
.
WithSyntaxRoot
(
MakeSafeToAddNamespaces
(
root
,
namespaceSymbols
,
model
,
document
.
Project
.
Solution
.
Workspace
,
cancellationToken
));
root
=
await
document
.
GetSyntaxRootAsync
().
ConfigureAwait
(
false
);
root
=
(
await
document
.
GetSyntaxRootAsync
().
ConfigureAwait
(
false
))!;
model
=
await
document
.
GetSemanticModelAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
Contract
.
ThrowIfNull
(
model
);
// Find the context. It might be null if we have removed the context in the process of complexifying the tree.
context
=
root
.
DescendantNodesAndSelf
().
FirstOrDefault
(
x
=>
x
.
HasAnnotation
(
annotation
))
??
root
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录