Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
0317628e
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
0317628e
编写于
7月 30, 2018
作者:
D
dotnet-automerge-bot
提交者:
GitHub
7月 30, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #28904 from dotnet/merges/dev15.9.x-to-master
Merge dev15.9.x to master
上级
205ab135
70ccd49f
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
64 addition
and
10 deletion
+64
-10
src/EditorFeatures/Test2/FindReferences/FindReferencesTests.ConstructorSymbols.vb
.../FindReferences/FindReferencesTests.ConstructorSymbols.vb
+25
-0
src/EditorFeatures/Test2/Rename/RenameEngineTests.vb
src/EditorFeatures/Test2/Rename/RenameEngineTests.vb
+25
-0
src/Workspaces/Core/Portable/FindSymbols/FindReferences/DependentProjectsFinder.cs
...ble/FindSymbols/FindReferences/DependentProjectsFinder.cs
+1
-1
src/Workspaces/Core/Portable/Rename/ConflictEngine/ConflictResolver.Session.cs
...ortable/Rename/ConflictEngine/ConflictResolver.Session.cs
+1
-1
src/Workspaces/Core/Portable/Rename/RenameLocation.ReferenceProcessing.cs
...ore/Portable/Rename/RenameLocation.ReferenceProcessing.cs
+12
-8
未找到文件。
src/EditorFeatures/Test2/FindReferences/FindReferencesTests.ConstructorSymbols.vb
浏览文件 @
0317628e
...
...
@@ -788,6 +788,31 @@ class Program
}
</
Document
>
</
Project
>
</
Workspace
>
Await
TestAPIAndFeature
(
input
)
End
Function
<
WorkItem
(
25655
,
"https://github.com/dotnet/roslyn/issues/25655"
)
>
<
WpfFact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
FindReferences
)
>
Public
Async
Function
TestNoCompilationProjectReferencingCSharp
()
As
Task
Dim
input
=
<
Workspace
>
<
Project
Language
=
"NoCompilation"
CommonReferences
=
"false"
>
<
ProjectReference
>
CSharpProject
</
ProjectReference
>
<
Document
>
//
a
no
-
compilation
document
</
Document
>
</
Project
>
<
Project
Language
=
"C#"
AssemblyName
=
"CSharpProject"
CommonReferences
=
"true"
>
<
Document
>
public
class
A
{
public
{
|
Definition
:
$$
A
|
}()
{
}
}
</
Document
>
</
Project
>
</
Workspace
>
Await
TestAPIAndFeature
(
input
)
End
Function
...
...
src/EditorFeatures/Test2/Rename/RenameEngineTests.vb
浏览文件 @
0317628e
...
...
@@ -6162,6 +6162,31 @@ End Class
End
Using
End
Sub
<
WorkItem
(
25655
,
"https://github.com/dotnet/roslyn/issues/25655"
)
>
<
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Rename
)
>
Public
Sub
RenameClassWithNoCompilationProjectReferencingProject
()
Using
result
=
RenameEngineResult
.
Create
(
_outputHelper
,
<
Workspace
>
<
Project
Language
=
"NoCompilation"
CommonReferences
=
"false"
>
<
ProjectReference
>
CSharpProject
</
ProjectReference
>
<
Document
>
//
a
no
-
compilation
document
</
Document
>
</
Project
>
<
Project
Language
=
"C#"
AssemblyName
=
"CSharpProject"
CommonReferences
=
"true"
>
<
Document
>
public
class
[|$$
A
|]
{
public
[|
A
|]
()
{
}
}
</
Document
>
</
Project
>
</
Workspace
>
,
renameTo
:
=
"B"
)
End
Using
End
Sub
#Region "Rename in strings/comments"
<
WorkItem
(
700923
,
"http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/700923"
),
WorkItem
(
700925
,
"http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/700925"
)
>
...
...
src/Workspaces/Core/Portable/FindSymbols/FindReferences/DependentProjectsFinder.cs
浏览文件 @
0317628e
...
...
@@ -310,7 +310,7 @@ private static async Task AddNonSubmissionDependentProjectsAsync(IAssemblySymbol
cancellationToken
.
ThrowIfCancellationRequested
();
if
(
HasReferenceTo
(
sourceAssembly
,
sourceProject
,
project
,
cancellationToken
))
if
(
project
.
SupportsCompilation
&&
HasReferenceTo
(
sourceAssembly
,
sourceProject
,
project
,
cancellationToken
))
{
var
hasInternalsAccess
=
await
HasInternalsAccessAsync
(
sourceAssembly
,
internalsVisibleToMap
,
...
...
src/Workspaces/Core/Portable/Rename/ConflictEngine/ConflictResolver.Session.cs
浏览文件 @
0317628e
...
...
@@ -660,7 +660,7 @@ private async Task FindDocumentsAndPossibleNameConflicts()
foreach
(
var
language
in
documentsFromAffectedProjects
.
Select
(
d
=>
d
.
Project
.
Language
).
Distinct
())
{
solution
.
Workspace
.
Services
.
GetLanguageServices
(
language
).
GetService
<
IRenameRewriterLanguageService
>()
.
TryAddPossibleNameConflicts
(
symbol
,
_replacementText
,
_possibleNameConflicts
);
?
.
TryAddPossibleNameConflicts
(
symbol
,
_replacementText
,
_possibleNameConflicts
);
}
await
AddDocumentsWithPotentialConflicts
(
documentsFromAffectedProjects
).
ConfigureAwait
(
false
);
...
...
src/Workspaces/Core/Portable/Rename/RenameLocation.ReferenceProcessing.cs
浏览文件 @
0317628e
...
...
@@ -424,17 +424,21 @@ internal static async Task<IEnumerable<RenameLocation>> GetRenamableReferenceLoc
foreach
(
var
documentsGroupedByLanguage
in
RenameUtilities
.
GetDocumentsAffectedByRename
(
originalSymbol
,
solution
,
renameLocations
).
GroupBy
(
d
=>
d
.
Project
.
Language
))
{
var
syntaxFactsLanguageService
=
solution
.
Workspace
.
Services
.
GetLanguageServices
(
documentsGroupedByLanguage
.
Key
).
GetService
<
ISyntaxFactsService
>();
foreach
(
var
document
in
documentsGroupedByLanguage
)
if
(
syntaxFactsLanguageService
!=
null
)
{
if
(
renameInStrings
)
foreach
(
var
document
in
documentsGroupedByLanguage
)
{
await
AddLocationsToRenameInStringsAsync
(
document
,
renameText
,
syntaxFactsLanguageService
,
stringLocations
,
cancellationToken
).
ConfigureAwait
(
false
);
}
if
(
renameInStrings
)
{
await
AddLocationsToRenameInStringsAsync
(
document
,
renameText
,
syntaxFactsLanguageService
,
stringLocations
,
cancellationToken
).
ConfigureAwait
(
false
);
}
if
(
renameInComments
)
{
await
AddLocationsToRenameInCommentsAsync
(
document
,
renameText
,
commentLocations
,
cancellationToken
).
ConfigureAwait
(
false
);
if
(
renameInComments
)
{
await
AddLocationsToRenameInCommentsAsync
(
document
,
renameText
,
commentLocations
,
cancellationToken
).
ConfigureAwait
(
false
);
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录