Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

体验新版 GitCode，发现更多精彩内容 >>

提交 15789842 编写于 作者: C CyrusNajmabadi
浏览文件
操作

Remove unused parameter.

上级 c7286ffe d8f94321
隐藏空白更改
内联 并排
Showing with 4 addition and 402 deletion
src/EditorFeatures/Core/FindUsages/IDefinitionsAndReferencesFactory.cs
浏览文件 @ 15789842
......@@ -3,7 +3,6 @@
using System.Collections.Generic;
using System.Composition;
using System.Diagnostics;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Completion;
......@@ -12,16 +11,11 @@
using Microsoft.CodeAnalysis.Host;
using Microsoft.CodeAnalysis.Host.Mef;
using Microsoft.CodeAnalysis.Shared.Extensions;
using Roslyn.Utilities;
namespace Microsoft.CodeAnalysis.Editor.FindUsages
{
internal interface IDefinitionsAndReferencesFactory : IWorkspaceService
{
Task<DefinitionsAndReferences> CreateDefinitionsAndReferencesAsync(
Solution solution, IEnumerable<ReferencedSymbol> referencedSymbols,
bool includeHiddenLocations, CancellationToken cancellationToken);
DefinitionItem GetThirdPartyDefinitionItem(
Solution solution, ISymbol definition, CancellationToken cancellationToken);
}
......@@ -29,100 +23,6 @@ internal interface IDefinitionsAndReferencesFactory : IWorkspaceService
[ExportWorkspaceService(typeof(IDefinitionsAndReferencesFactory)), Shared]
internal class DefaultDefinitionsAndReferencesFactory : IDefinitionsAndReferencesFactory
{
public async Task<DefinitionsAndReferences> CreateDefinitionsAndReferencesAsync(
Solution solution, IEnumerable<ReferencedSymbol> referencedSymbols,
bool includeHiddenLocations, CancellationToken cancellationToken)
{
var definitions = ArrayBuilder<DefinitionItem>.GetInstance();
var references = ArrayBuilder<SourceReferenceItem>.GetInstance();
var uniqueLocations = new HashSet<DocumentSpan>();
// Order the symbols by precedence, then create the appropriate
// definition item per symbol and all reference items for its
// reference locations.
foreach (var referencedSymbol in referencedSymbols.OrderBy(GetPrecedence))
{
await ProcessReferencedSymbolAsync(
solution, referencedSymbol, definitions, references,
includeHiddenLocations, uniqueLocations, cancellationToken).ConfigureAwait(false);
}
return new DefinitionsAndReferences(
definitions.ToImmutableAndFree(), references.ToImmutableAndFree());
}
/// <summary>
/// Reference locations are de-duplicated across the entire find references result set
/// Order the definitions so that references to multiple definitions appear under the
/// desired definition (e.g. constructor references should prefer the constructor method
/// over the type definition). Note that this does not change the order in which
/// definitions are displayed in Find Symbol Results, it only changes which definition
/// a given reference should appear under when its location is a reference to multiple
/// definitions.
/// </summary>
private static int GetPrecedence(ReferencedSymbol referencedSymbol)
{
switch (referencedSymbol.Definition.Kind)
{
case SymbolKind.Event:
case SymbolKind.Field:
case SymbolKind.Label:
case SymbolKind.Local:
case SymbolKind.Method:
case SymbolKind.Parameter:
case SymbolKind.Property:
case SymbolKind.RangeVariable:
return 0;
case SymbolKind.ArrayType:
case SymbolKind.DynamicType:
case SymbolKind.ErrorType:
case SymbolKind.NamedType:
case SymbolKind.PointerType:
return 1;
default:
return 2;
}
}
private async Task ProcessReferencedSymbolAsync(
Solution solution,
ReferencedSymbol referencedSymbol,
ArrayBuilder<DefinitionItem> definitions,
ArrayBuilder<SourceReferenceItem> references,
bool includeHiddenLocations,
HashSet<DocumentSpan> uniqueSpans,
CancellationToken cancellationToken)
{
// See if this is a symbol we even want to present to the user. If not,
// ignore it entirely (including all its reference locations).
if (!referencedSymbol.ShouldShow())
{
return;
}
var definitionItem = await referencedSymbol.Definition.ToDefinitionItemAsync(
solution, includeHiddenLocations, cancellationToken, uniqueSpans).ConfigureAwait(false);
definitions.Add(definitionItem);
// Now, create the SourceReferenceItems for all the reference locations
// for this definition.
await CreateReferencesAsync(
referencedSymbol, references, definitionItem,
includeHiddenLocations, uniqueSpans, cancellationToken).ConfigureAwait(false);
// Finally, see if there are any third parties that want to add their
// own result to our collection.
var thirdPartyItem = GetThirdPartyDefinitionItem(
solution, referencedSymbol.Definition, cancellationToken);
if (thirdPartyItem != null)
{
definitions.Add(thirdPartyItem);
}
}
/// <summary>
/// Provides an extension point that allows for other workspace layers to add additional
/// results to the results found by the FindReferences engine.
......@@ -132,30 +32,6 @@ private static int GetPrecedence(ReferencedSymbol referencedSymbol)
{
return null;
}
private static async Task CreateReferencesAsync(
ReferencedSymbol referencedSymbol,
ArrayBuilder<SourceReferenceItem> references,
DefinitionItem definitionItem,
bool includeHiddenLocations,
HashSet<DocumentSpan> uniqueSpans,
CancellationToken cancellationToken)
{
foreach (var referenceLocation in referencedSymbol.Locations)
{
var sourceReferenceItem = await referenceLocation.TryCreateSourceReferenceItemAsync(
definitionItem, includeHiddenLocations, cancellationToken).ConfigureAwait(false);
if (sourceReferenceItem == null)
{
continue;
}
if (uniqueSpans.Add(sourceReferenceItem.SourceSpan))
{
references.Add(sourceReferenceItem);
}
}
}
}
internal static class DefinitionItemExtensions
......@@ -164,8 +40,7 @@ internal static class DefinitionItemExtensions
this ISymbol definition,
Solution solution,
bool includeHiddenLocations,
CancellationToken cancellationToken,
HashSet<DocumentSpan> uniqueSpans = null)
CancellationToken cancellationToken)
{
// Ensure we're working with the original definition for the symbol. I.e. When we're
// creating definition items, we want to create them for types like Dictionary<TKey,TValue>
......@@ -210,18 +85,8 @@ internal static class DefinitionItemExtensions
{
var documentLocation = await ClassifiedSpansAndHighlightSpan.GetClassifiedDocumentSpanAsync(
document, location.SourceSpan, cancellationToken).ConfigureAwait(false);
if (sourceLocations.Count == 0)
{
sourceLocations.Add(documentLocation);
}
else
{
if (uniqueSpans == null ||
uniqueSpans.Add(documentLocation))
{
sourceLocations.Add(documentLocation);
}
}
sourceLocations.Add(documentLocation);
}
}
}
......
src/VisualStudio/Core/Test/FindResults/FindResultsTests.vb 已删除 100644 → 0
浏览文件 @ c7286ffe
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
Imports System.Text
Imports System.Threading
Imports Microsoft.CodeAnalysis
Imports Microsoft.CodeAnalysis.Editor.UnitTests
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Utilities
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
Imports Microsoft.CodeAnalysis.FindUsages
Imports Microsoft.CodeAnalysis.FindSymbols
Imports Microsoft.VisualStudio.Composition
Imports Microsoft.VisualStudio.LanguageServices.Implementation.Library.FindResults
Imports Microsoft.VisualStudio.LanguageServices.UnitTests.ObjectBrowser.Mocks
Imports Roslyn.Test.Utilities
Imports Roslyn.Utilities
Imports Microsoft.CodeAnalysis.Editor.FindUsages
Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.FindResults
Public Class FindResultsTests
<WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
<WorkItem(1138943, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1138943")>
Public Async Function ConstructorReferencesShouldNotAppearUnderClassNodeInCSharp() As System.Threading.Tasks.Task
Dim markup = <Text><![CDATA[
class $$C
{
const int z = 1;
public C() { }
public C(int x) { }
void T()
{
var a = new C();
var b = new C(5);
var c = C.z;
}
}"]]></Text>
Dim expectedResults = New List(Of AbstractTreeItem) From
{
TestFindResult.CreateDefinition($"[CSharpAssembly1] C.C() ({ServicesVSResources._1_reference})",
TestFindResult.CreateReference("Test1.cs - (11, 21) : var a = new C();")),
TestFindResult.CreateDefinition($"[CSharpAssembly1] C.C(int) ({ServicesVSResources._1_reference})",
TestFindResult.CreateReference("Test1.cs - (12, 21) : var b = new C(5);")),
TestFindResult.CreateDefinition($"[CSharpAssembly1] class C ({ServicesVSResources._1_reference})",
TestFindResult.CreateReference("Test1.cs - (13, 17) : var c = C.z;"))
}
Await VerifyAsync(markup, LanguageNames.CSharp, expectedResults)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
<WorkItem(1138943, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1138943")>
Public Async Function ConstructorReferencesShouldNotAppearUnderClassNodeInVisualBasic() As System.Threading.Tasks.Task
Dim markup = <Text><![CDATA[
Class C$$
Const z = 1
Public Sub New()
End Sub
Public Sub New(x As Integer)
End Sub
Sub T()
Dim a = New C()
Dim b = New C(5)
Dim d = C.z
End Sub
End Class"]]></Text>
Dim expectedResults = New List(Of AbstractTreeItem) From
{
TestFindResult.CreateDefinition($"[VisualBasicAssembly1] Class C ({ServicesVSResources._1_reference})",
TestFindResult.CreateReference("Test1.vb - (14, 17) : Dim d = C.z")),
TestFindResult.CreateDefinition($"[VisualBasicAssembly1] Sub C.New() ({ServicesVSResources._1_reference})",
TestFindResult.CreateReference("Test1.vb - (12, 21) : Dim a = New C()")),
TestFindResult.CreateDefinition($"[VisualBasicAssembly1] Sub C.New(Integer) ({ServicesVSResources._1_reference})",
TestFindResult.CreateReference("Test1.vb - (13, 21) : Dim b = New C(5)"))
}
Await VerifyAsync(markup, LanguageNames.VisualBasic, expectedResults)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
Public Async Function TestSourceNamespace() As System.Threading.Tasks.Task
Dim markup = <Text><![CDATA[
namespace NS$$
{
}
namespace NS
{
}
]]></Text>
Dim expectedResults = New List(Of AbstractTreeItem) From
{
TestFindResult.CreateUnnavigable($"namespace NS ({String.Format(ServicesVSResources._0_references, 2)})",
TestFindResult.CreateReference("Test1.cs - (2, 11) : namespace NS"),
TestFindResult.CreateReference("Test1.cs - (6, 11) : namespace NS"))
}
Await VerifyAsync(markup, LanguageNames.CSharp, expectedResults)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.FindReferences)>
Public Async Function TestMetadataNamespace() As System.Threading.Tasks.Task
Dim markup = <Text><![CDATA[
using System$$;
using System.Threading;
]]></Text>
Dim expectedResults = New List(Of AbstractTreeItem) From
{
TestFindResult.CreateUnnavigable($"namespace System ({String.Format(ServicesVSResources._0_references, 2)})",
TestFindResult.CreateReference("Test1.cs - (2, 7) : using System;"),
TestFindResult.CreateReference("Test1.cs - (3, 7) : using System.Threading;"))
}
Await VerifyAsync(markup, LanguageNames.CSharp, expectedResults)
End Function
Private Shared ReadOnly s_exportProvider As ExportProvider = MinimalTestExportProvider.CreateExportProvider(
TestExportProvider.MinimumCatalogWithCSharpAndVisualBasic.WithParts(
GetType(MockDocumentNavigationServiceProvider),
GetType(MockSymbolNavigationServiceProvider),
GetType(DefaultDefinitionsAndReferencesFactory)))
Private Async Function VerifyAsync(markup As XElement, languageName As String, expectedResults As IList(Of AbstractTreeItem)) As System.Threading.Tasks.Task
Dim workspaceXml =
<Workspace>
<Project Language=<%= languageName %> CommonReferences="true">
<Document><%= markup %></Document>
</Project>
</Workspace>
Using workspace = TestWorkspace.Create(workspaceXml, exportProvider:=s_exportProvider)
Dim doc = workspace.Documents.Single()
Dim workspaceDoc = workspace.CurrentSolution.GetDocument(doc.Id)
If Not doc.CursorPosition.HasValue Then
Assert.True(False, "Missing caret location in document.")
End If
Dim symbol = Await SymbolFinder.FindSymbolAtPositionAsync(workspaceDoc, doc.CursorPosition.Value, CancellationToken.None)
Assert.NotNull(symbol)
Dim result = Await SymbolFinder.FindReferencesAsync(symbol, workspace.CurrentSolution, CancellationToken.None)
WpfTestCase.RequireWpfFact($"The {NameOf(Implementation.Library.FindResults.LibraryManager)} assumes it's on the VS UI thread and thus uses WaitAndGetResult")
Dim libraryManager = New LibraryManager(New MockServiceProvider(New MockComponentModel(workspace.ExportProvider)))
Dim factory = workspace.Services.GetService(Of IDefinitionsAndReferencesFactory)
Dim definitionsAndReferences = factory.CreateDefinitionsAndReferences(
workspace.CurrentSolution, result,
includeHiddenLocations:=False, cancellationToken:=CancellationToken.None)
Dim findReferencesTree = libraryManager.CreateFindReferencesItems(definitionsAndReferences)
' We cannot control the ordering of top-level nodes in the Find Symbol References window, so do not consider ordering of these items here.
expectedResults = expectedResults.OrderBy(Function(n) n.DisplayText).ToList()
findReferencesTree = findReferencesTree.OrderBy(Function(n) n.DisplayText).ToList()
VerifyResultsTree(expectedResults, findReferencesTree)
End Using
End Function
Private Sub VerifyResultsTree(expectedResults As IList(Of AbstractTreeItem), findReferencesTree As IList(Of AbstractTreeItem))
Assert.True(expectedResults.Count = findReferencesTree.Count, $"Unexpected number of results. Expected: {expectedResults.Count} Actual: {findReferencesTree.Count}
Expected Items:
{GetResultText(expectedResults)}
Actual Items:
{GetResultText(findReferencesTree)}
")
For index = 0 To expectedResults.Count - 1
Dim expectedItem = expectedResults(index)
Dim actualItem = findReferencesTree(index)
Assert.Equal(expectedItem.DisplayText, actualItem.DisplayText)
Assert.Equal(expectedItem.CanGoToDefinition, actualItem.CanGoToDefinition)
Assert.Equal(expectedItem.CanGoToReference, actualItem.CanGoToReference)
Dim expectedHasChildren = expectedItem.Children IsNot Nothing AndAlso expectedItem.Children.Count > 0
Dim actualHasChildren = actualItem.Children IsNot Nothing AndAlso actualItem.Children.Count > 0
Assert.Equal(expectedHasChildren, actualHasChildren)
If expectedHasChildren Then
VerifyResultsTree(expectedItem.Children, actualItem.Children)
End If
Next
End Sub
Private Function GetResultText(items As IList(Of AbstractTreeItem)) As String
Dim indentString = String.Empty
Dim stringBuilder = New StringBuilder()
GetResultTextWorker(items, stringBuilder, indentString)
Return stringBuilder.ToString()
End Function
Private Sub GetResultTextWorker(items As IList(Of AbstractTreeItem), stringBuilder As StringBuilder, indentString As String)
For Each item In items
stringBuilder.Append(indentString)
stringBuilder.Append(item.DisplayText)
stringBuilder.Append(" [Kind: " &
If(item.CanGoToDefinition, "Def", String.Empty) &
If(item.CanGoToReference, "Ref", String.Empty) &
If(item.CanGoToDefinition OrElse item.CanGoToDefinition, "None", String.Empty) &
"]")
If item.Children IsNot Nothing AndAlso item.Children.Any() Then
GetResultTextWorker(item.Children, stringBuilder, indentString + " ")
End If
Next
End Sub
Private Class TestFindResult
Inherits AbstractTreeItem
Public ReadOnly expectedCanGoToDefinition As Boolean?
Public ReadOnly expectedCanGoToReference As Boolean?
Public Overrides Function CanGoToDefinition() As Boolean
Return If(expectedCanGoToDefinition, True)
End Function
Public Overrides Function CanGoToReference() As Boolean
Return If(expectedCanGoToReference, True)
End Function
Public Shared Function CreateDefinition(displayText As String, ParamArray children As TestFindResult()) As TestFindResult
Return New TestFindResult(displayText, children, expectedCanGoToDefinition:=True, expectedCanGoToReference:=False)
End Function
Public Shared Function CreateReference(displayText As String, ParamArray children As TestFindResult()) As TestFindResult
Return New TestFindResult(displayText, children, expectedCanGoToDefinition:=False, expectedCanGoToReference:=True)
End Function
Public Shared Function CreateUnnavigable(displayText As String, ParamArray children As TestFindResult()) As TestFindResult
Return New TestFindResult(displayText, children, expectedCanGoToDefinition:=False, expectedCanGoToReference:=False)
End Function
Private Sub New(displayText As String,
children As TestFindResult(),
expectedCanGoToDefinition As Boolean,
expectedCanGoToReference As Boolean)
MyBase.New(0)
Me.DisplayText = displayText
Me.expectedCanGoToDefinition = expectedCanGoToDefinition
Me.expectedCanGoToReference = expectedCanGoToReference
Me.Children = If(children IsNot Nothing AndAlso children.Length > 0, children, Nothing)
End Sub
Public Overrides Function GoToSource() As Integer
Throw New NotImplementedException()
End Function
End Class
End Class
End Namespace
\ No newline at end of file
src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj
浏览文件 @ 15789842
......@@ -330,7 +330,6 @@
<Compile Include="EditAndContinue\EditAndContinueWorkspaceServiceTests.vb" />
<Compile Include="EditAndContinue\VsReadOnlyDocumentTrackerTests.vb" />
<Compile Include="ExtractInterface\ExtractInterfaceViewModelTests.vb" />
<Compile Include="FindResults\FindResultsTests.vb" />
<Compile Include="GenerateType\GenerateTypeViewModelTests.vb" />
<Compile Include="GoToDefinition\GoToDefinitionApiTests.vb" />
<Compile Include="Help\HelpTests.vb" />
......@@ -411,4 +410,4 @@
<None Include="project.json" />
</ItemGroup>
<Import Project="..\..\..\..\build\Targets\Imports.targets" />
</Project>
</Project>
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或