Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
a947b6cd
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,发现更多精彩内容 >>
提交
a947b6cd
编写于
8月 11, 2020
作者:
M
Manish Vasani
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes
上级
21a46d15
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
19 deletion
+13
-19
src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerDriver.cs
...pilers/Core/Portable/DiagnosticAnalyzer/AnalyzerDriver.cs
+2
-2
src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerExecutor.cs
...lers/Core/Portable/DiagnosticAnalyzer/AnalyzerExecutor.cs
+11
-17
未找到文件。
src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerDriver.cs
浏览文件 @
a947b6cd
...
@@ -1211,7 +1211,7 @@ static ImmutableHashSet<ISymbol> computeGeneratedCodeSymbolsInTree(SyntaxTree tr
...
@@ -1211,7 +1211,7 @@ static ImmutableHashSet<ISymbol> computeGeneratedCodeSymbolsInTree(SyntaxTree tr
}
}
}
}
private
bool
IsAnalyzerSuppressedForTree
(
DiagnosticAnalyzer
analyzer
,
SyntaxTree
tree
,
SyntaxTreeOptionsProvider
options
)
private
bool
IsAnalyzerSuppressedForTree
(
DiagnosticAnalyzer
analyzer
,
SyntaxTree
tree
,
SyntaxTreeOptionsProvider
?
options
)
{
{
if
(!
SuppressedAnalyzersForTreeMap
.
TryGetValue
(
tree
,
out
var
suppressedAnalyzers
))
if
(!
SuppressedAnalyzersForTreeMap
.
TryGetValue
(
tree
,
out
var
suppressedAnalyzers
))
{
{
...
@@ -1221,7 +1221,7 @@ private bool IsAnalyzerSuppressedForTree(DiagnosticAnalyzer analyzer, SyntaxTree
...
@@ -1221,7 +1221,7 @@ private bool IsAnalyzerSuppressedForTree(DiagnosticAnalyzer analyzer, SyntaxTree
return
suppressedAnalyzers
.
Contains
(
analyzer
);
return
suppressedAnalyzers
.
Contains
(
analyzer
);
}
}
private
ImmutableHashSet
<
DiagnosticAnalyzer
>
ComputeSuppressedAnalyzersForTree
(
SyntaxTree
tree
,
SyntaxTreeOptionsProvider
options
)
private
ImmutableHashSet
<
DiagnosticAnalyzer
>
ComputeSuppressedAnalyzersForTree
(
SyntaxTree
tree
,
SyntaxTreeOptionsProvider
?
options
)
{
{
if
(
options
is
null
)
if
(
options
is
null
)
{
{
...
...
src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerExecutor.cs
浏览文件 @
a947b6cd
...
@@ -68,7 +68,11 @@ internal partial class AnalyzerExecutor
...
@@ -68,7 +68,11 @@ internal partial class AnalyzerExecutor
private
Func
<
IOperation
,
ControlFlowGraph
>
GetControlFlowGraph
private
Func
<
IOperation
,
ControlFlowGraph
>
GetControlFlowGraph
=>
_lazyGetControlFlowGraph
??=
GetControlFlowGraphImpl
;
=>
_lazyGetControlFlowGraph
??=
GetControlFlowGraphImpl
;
private
SyntaxTreeOptionsProvider
SyntaxTreeOptions
=>
_compilation
.
Options
.
SyntaxTreeOptionsProvider
;
private
bool
IsAnalyzerSuppressedForTree
(
DiagnosticAnalyzer
analyzer
,
SyntaxTree
tree
)
{
Debug
.
Assert
(
_isAnalyzerSuppressedForTree
!=
null
);
return
_isAnalyzerSuppressedForTree
(
analyzer
,
tree
,
Compilation
.
Options
.
SyntaxTreeOptionsProvider
);
}
/// <summary>
/// <summary>
/// Creates <see cref="AnalyzerExecutor"/> to execute analyzer actions with given arguments
/// Creates <see cref="AnalyzerExecutor"/> to execute analyzer actions with given arguments
...
@@ -690,10 +694,8 @@ public void MarkSymbolEndAnalysisComplete(ISymbol symbol, DiagnosticAnalyzer ana
...
@@ -690,10 +694,8 @@ public void MarkSymbolEndAnalysisComplete(ISymbol symbol, DiagnosticAnalyzer ana
AnalyzerStateData
?
analyzerState
,
AnalyzerStateData
?
analyzerState
,
bool
isGeneratedCode
)
bool
isGeneratedCode
)
{
{
Debug
.
Assert
(
_isAnalyzerSuppressedForTree
!=
null
);
if
(
isGeneratedCode
&&
_shouldSkipAnalysisOnGeneratedCode
(
analyzer
)
||
if
(
isGeneratedCode
&&
_shouldSkipAnalysisOnGeneratedCode
(
analyzer
)
||
_isAnalyzerSuppressedForTree
(
analyzer
,
semanticModel
.
SyntaxTree
,
SyntaxTreeOptions
))
IsAnalyzerSuppressedForTree
(
analyzer
,
semanticModel
.
SyntaxTree
))
{
{
return
;
return
;
}
}
...
@@ -774,11 +776,10 @@ public void MarkSymbolEndAnalysisComplete(ISymbol symbol, DiagnosticAnalyzer ana
...
@@ -774,11 +776,10 @@ public void MarkSymbolEndAnalysisComplete(ISymbol symbol, DiagnosticAnalyzer ana
bool
isGeneratedCode
)
bool
isGeneratedCode
)
{
{
Debug
.
Assert
(
file
.
SourceTree
!=
null
);
Debug
.
Assert
(
file
.
SourceTree
!=
null
);
Debug
.
Assert
(
_isAnalyzerSuppressedForTree
!=
null
);
var
tree
=
file
.
SourceTree
;
var
tree
=
file
.
SourceTree
;
if
(
isGeneratedCode
&&
_shouldSkipAnalysisOnGeneratedCode
(
analyzer
)
||
if
(
isGeneratedCode
&&
_shouldSkipAnalysisOnGeneratedCode
(
analyzer
)
||
_isAnalyzerSuppressedForTree
(
analyzer
,
tree
,
SyntaxTreeOptions
))
IsAnalyzerSuppressedForTree
(
analyzer
,
tree
))
{
{
return
;
return
;
}
}
...
@@ -1060,10 +1061,9 @@ public void MarkSymbolEndAnalysisComplete(ISymbol symbol, DiagnosticAnalyzer ana
...
@@ -1060,10 +1061,9 @@ public void MarkSymbolEndAnalysisComplete(ISymbol symbol, DiagnosticAnalyzer ana
Debug
.
Assert
(
CanHaveExecutableCodeBlock
(
declaredSymbol
));
Debug
.
Assert
(
CanHaveExecutableCodeBlock
(
declaredSymbol
));
Debug
.
Assert
(
startActions
.
Any
()
||
endActions
.
Any
()
||
actions
.
Any
());
Debug
.
Assert
(
startActions
.
Any
()
||
endActions
.
Any
()
||
actions
.
Any
());
Debug
.
Assert
(!
executableBlocks
.
IsEmpty
);
Debug
.
Assert
(!
executableBlocks
.
IsEmpty
);
Debug
.
Assert
(
_isAnalyzerSuppressedForTree
!=
null
);
if
(
isGeneratedCode
&&
_shouldSkipAnalysisOnGeneratedCode
(
analyzer
)
||
if
(
isGeneratedCode
&&
_shouldSkipAnalysisOnGeneratedCode
(
analyzer
)
||
_isAnalyzerSuppressedForTree
(
analyzer
,
declaredNode
.
SyntaxTree
,
SyntaxTreeOptions
))
IsAnalyzerSuppressedForTree
(
analyzer
,
declaredNode
.
SyntaxTree
))
{
{
return
;
return
;
}
}
...
@@ -1316,10 +1316,8 @@ public void MarkSymbolEndAnalysisComplete(ISymbol symbol, DiagnosticAnalyzer ana
...
@@ -1316,10 +1316,8 @@ public void MarkSymbolEndAnalysisComplete(ISymbol symbol, DiagnosticAnalyzer ana
bool
isGeneratedCode
)
bool
isGeneratedCode
)
where
TLanguageKindEnum
:
struct
where
TLanguageKindEnum
:
struct
{
{
Debug
.
Assert
(
_isAnalyzerSuppressedForTree
!=
null
);
if
(
isGeneratedCode
&&
_shouldSkipAnalysisOnGeneratedCode
(
analyzer
)
||
if
(
isGeneratedCode
&&
_shouldSkipAnalysisOnGeneratedCode
(
analyzer
)
||
_isAnalyzerSuppressedForTree
(
analyzer
,
model
.
SyntaxTree
,
SyntaxTreeOptions
))
IsAnalyzerSuppressedForTree
(
analyzer
,
model
.
SyntaxTree
))
{
{
return
;
return
;
}
}
...
@@ -1456,10 +1454,8 @@ public void MarkSymbolEndAnalysisComplete(ISymbol symbol, DiagnosticAnalyzer ana
...
@@ -1456,10 +1454,8 @@ public void MarkSymbolEndAnalysisComplete(ISymbol symbol, DiagnosticAnalyzer ana
OperationAnalyzerStateData
?
analyzerState
,
OperationAnalyzerStateData
?
analyzerState
,
bool
isGeneratedCode
)
bool
isGeneratedCode
)
{
{
Debug
.
Assert
(
_isAnalyzerSuppressedForTree
!=
null
);
if
(
isGeneratedCode
&&
_shouldSkipAnalysisOnGeneratedCode
(
analyzer
)
||
if
(
isGeneratedCode
&&
_shouldSkipAnalysisOnGeneratedCode
(
analyzer
)
||
_isAnalyzerSuppressedForTree
(
analyzer
,
model
.
SyntaxTree
,
SyntaxTreeOptions
))
IsAnalyzerSuppressedForTree
(
analyzer
,
model
.
SyntaxTree
))
{
{
return
;
return
;
}
}
...
@@ -2014,12 +2010,10 @@ private ControlFlowGraph GetControlFlowGraphImpl(IOperation operation)
...
@@ -2014,12 +2010,10 @@ private ControlFlowGraph GetControlFlowGraphImpl(IOperation operation)
private
bool
IsAnalyzerSuppressedForSymbol
(
DiagnosticAnalyzer
analyzer
,
ISymbol
symbol
)
private
bool
IsAnalyzerSuppressedForSymbol
(
DiagnosticAnalyzer
analyzer
,
ISymbol
symbol
)
{
{
Debug
.
Assert
(
_isAnalyzerSuppressedForTree
!=
null
);
foreach
(
var
location
in
symbol
.
Locations
)
foreach
(
var
location
in
symbol
.
Locations
)
{
{
if
(
location
.
SourceTree
!=
null
&&
if
(
location
.
SourceTree
!=
null
&&
!
_isAnalyzerSuppressedForTree
(
analyzer
,
location
.
SourceTree
,
SyntaxTreeOptions
))
IsAnalyzerSuppressedForTree
(
analyzer
,
location
.
SourceTree
))
{
{
return
false
;
return
false
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录