Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

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

未验证 提交 7628d776 编写于 作者: R Rikki Gibson 提交者： GitHub
浏览文件
操作

Merge pull request #46571 from CyrusNajmabadi/navToMatch 

Improve sorting of navigate-to matches when doing dotted patterns
上级 60fc2ad3 1dfc8c82
隐藏空白更改
内联 并排
Showing with 156 addition and 150 deletion
src/EditorFeatures/CSharpTest/NavigateTo/NavigateToTests.cs
浏览文件 @ 7628d776
......@@ -31,7 +31,7 @@ public class NavigateToTests : AbstractNavigateToTests
protected override TestWorkspace CreateWorkspace(string content, ExportProvider exportProvider)
=> TestWorkspace.CreateCSharp(content, exportProvider: exportProvider);
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task NoItemsForEmptyFile(TestHost testHost)
{
......@@ -41,7 +41,7 @@ public async Task NoItemsForEmptyFile(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindClass(TestHost testHost)
{
......@@ -55,7 +55,7 @@ public async Task FindClass(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindVerbatimClass(TestHost testHost)
{
......@@ -73,7 +73,7 @@ public async Task FindVerbatimClass(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindNestedClass(TestHost testHost)
{
......@@ -93,7 +93,7 @@ internal class DogBed
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindMemberInANestedClass(TestHost testHost)
{
......@@ -116,7 +116,7 @@ public void Method()
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindGenericClassWithConstraints(TestHost testHost)
{
......@@ -132,7 +132,7 @@ class Goo<T> where T : IEnumerable
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindGenericMethodWithConstraints(TestHost testHost)
{
......@@ -151,7 +151,7 @@ class Goo<U>
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindPartialClass(TestHost testHost)
{
......@@ -175,7 +175,7 @@ partial class Goo
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindTypesInMetadata(TestHost testHost)
{
......@@ -189,7 +189,7 @@ public async Task FindTypesInMetadata(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindClassInNamespace(TestHost testHost)
{
......@@ -206,7 +206,7 @@ class Goo
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindStruct(TestHost testHost)
{
......@@ -220,7 +220,7 @@ public async Task FindStruct(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindEnum(TestHost testHost)
{
......@@ -237,7 +237,7 @@ public async Task FindEnum(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindEnumMember(TestHost testHost)
{
......@@ -254,7 +254,7 @@ public async Task FindEnumMember(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindField1(TestHost testHost)
{
......@@ -269,7 +269,7 @@ public async Task FindField1(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindField2(TestHost testHost)
{
......@@ -284,7 +284,7 @@ public async Task FindField2(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindField3(TestHost testHost)
{
......@@ -298,7 +298,7 @@ public async Task FindField3(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindVerbatimField(TestHost testHost)
{
......@@ -317,7 +317,7 @@ public async Task FindVerbatimField(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindPtrField1(TestHost testHost)
{
......@@ -331,7 +331,7 @@ public async Task FindPtrField1(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindPtrField2(TestHost testHost)
{
......@@ -346,7 +346,7 @@ public async Task FindPtrField2(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindConstField(TestHost testHost)
{
......@@ -361,7 +361,7 @@ public async Task FindConstField(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindIndexer(TestHost testHost)
{
......@@ -373,7 +373,7 @@ public async Task FindIndexer(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindEvent(TestHost testHost)
{
......@@ -385,7 +385,7 @@ public async Task FindEvent(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindAutoProperty(TestHost testHost)
{
......@@ -400,7 +400,7 @@ public async Task FindAutoProperty(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindMethod(TestHost testHost)
{
......@@ -415,7 +415,7 @@ public async Task FindMethod(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindVerbatimMethod(TestHost testHost)
{
......@@ -434,7 +434,7 @@ public async Task FindVerbatimMethod(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindParameterizedMethod(TestHost testHost)
{
......@@ -451,7 +451,7 @@ void DoSomething(int a, string b)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindConstructor(TestHost testHost)
{
......@@ -468,7 +468,7 @@ public Goo()
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindParameterizedConstructor(TestHost testHost)
{
......@@ -485,7 +485,7 @@ public Goo(int i)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindStaticConstructor(TestHost testHost)
{
......@@ -502,7 +502,7 @@ static Goo()
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindPartialMethods(TestHost testHost)
{
......@@ -517,7 +517,7 @@ public async Task FindPartialMethods(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindPartialMethodDefinitionOnly(TestHost testHost)
{
......@@ -532,7 +532,7 @@ public async Task FindPartialMethodDefinitionOnly(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindPartialMethodImplementationOnly(TestHost testHost)
{
......@@ -549,7 +549,7 @@ public async Task FindPartialMethodImplementationOnly(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindOverriddenMembers(TestHost testHost)
{
......@@ -579,7 +579,7 @@ public async Task FindOverriddenMembers(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindInterface(TestHost testHost)
{
......@@ -593,7 +593,7 @@ public async Task FindInterface(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindDelegateInNamespace(TestHost testHost)
{
......@@ -608,7 +608,7 @@ public async Task FindDelegateInNamespace(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindLambdaExpression(TestHost testHost)
{
......@@ -625,7 +625,7 @@ class Goo
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindArray(TestHost testHost)
{
......@@ -640,7 +640,7 @@ public async Task FindArray(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindClassAndMethodWithSameName(TestHost testHost)
{
......@@ -666,7 +666,7 @@ void Goo()
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindMethodNestedInGenericTypes(TestHost testHost)
{
......@@ -689,7 +689,7 @@ void M()
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task OrderingOfConstructorsAndTypes(TestHost testHost)
{
......@@ -726,7 +726,7 @@ static C2()
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task NavigateToMethodWithNullableParameter(TestHost testHost)
{
......@@ -743,7 +743,7 @@ void M(object? o)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task StartStopSanity(TestHost testHost)
{
......@@ -766,7 +766,7 @@ public async Task StartStopSanity(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task DescriptionItems(TestHost testHost)
{
......@@ -789,7 +789,7 @@ void assertDescription(string label, string value)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task TermSplittingTest1(TestHost testHost)
{
......@@ -809,7 +809,7 @@ public async Task TermSplittingTest1(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task TermSplittingTest2(TestHost testHost)
{
......@@ -826,7 +826,7 @@ public async Task TermSplittingTest2(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task TermSplittingTest3(TestHost testHost)
{
......@@ -843,7 +843,7 @@ public async Task TermSplittingTest3(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task TermSplittingTest4(TestHost testHost)
{
......@@ -855,7 +855,7 @@ public async Task TermSplittingTest4(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task TermSplittingTest5(TestHost testHost)
{
......@@ -867,7 +867,7 @@ public async Task TermSplittingTest5(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task TermSplittingTest6(TestHost testHost)
{
......@@ -876,8 +876,8 @@ public async Task TermSplittingTest6(TestHost testHost)
{
var expecteditems = new List<NavigateToItem>
{
new NavigateToItem("get_key_word", NavigateToItemKind.Field, "csharp", null, null,s_emptyPrefixPatternMatch, null),
new NavigateToItem("GetKeyWord", NavigateToItemKind.Field, "csharp", null, null, s_emptyPrefixPatternMatch_NotCaseSensitive, null)
new NavigateToItem("get_key_word", NavigateToItemKind.Field, "csharp", null, null,s_emptySubstringPatternMatch, null),
new NavigateToItem("GetKeyWord", NavigateToItemKind.Field, "csharp", null, null, s_emptySubstringPatternMatch_NotCaseSensitive, null)
};
var items = await _aggregator.GetItemsAsync("get word");
......@@ -886,7 +886,7 @@ public async Task TermSplittingTest6(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task TermSplittingTest7(TestHost testHost)
{
......@@ -898,7 +898,7 @@ public async Task TermSplittingTest7(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task TestIndexer1(TestHost testHost)
{
......@@ -929,7 +929,7 @@ void Goo()
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task DottedPattern1(TestHost testHost)
{
......@@ -947,7 +947,7 @@ public async Task DottedPattern1(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task DottedPattern2(TestHost testHost)
{
......@@ -964,7 +964,7 @@ public async Task DottedPattern2(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task DottedPattern3(TestHost testHost)
{
......@@ -982,7 +982,7 @@ public async Task DottedPattern3(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task DottedPattern4(TestHost testHost)
{
......@@ -1000,7 +1000,7 @@ public async Task DottedPattern4(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task DottedPattern5(TestHost testHost)
{
......@@ -1018,7 +1018,7 @@ public async Task DottedPattern5(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task DottedPattern6(TestHost testHost)
{
......@@ -1035,7 +1035,7 @@ public async Task DottedPattern6(TestHost testHost)
});
}
[WpfTheory]
[Theory]
[CombinatorialData]
[WorkItem(7855, "https://github.com/dotnet/Roslyn/issues/7855")]
public async Task DottedPattern7(TestHost testHost)
......@@ -1054,6 +1054,25 @@ public async Task DottedPattern7(TestHost testHost)
});
}
[Theory, WorkItem(46267, "https://github.com/dotnet/roslyn/issues/46267")]
[CombinatorialData]
public async Task DottedPatternMatchKind(TestHost testHost)
{
var source = "namespace System { class Console { void Write(string s) { } void WriteLine(string s) { } } }";
await TestAsync(testHost, source, async w =>
{
var expecteditems = new List<NavigateToItem>
{
new NavigateToItem("Write", NavigateToItemKind.Method, "csharp", null, null, s_emptyExactPatternMatch, null),
new NavigateToItem("WriteLine", NavigateToItemKind.Method, "csharp", null, null, s_emptyPrefixPatternMatch, null)
};
var items = await _aggregator.GetItemsAsync("Console.Write");
VerifyNavigateToResultItems(expecteditems, items);
});
}
[Fact]
[WorkItem(1174255, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1174255")]
[WorkItem(8009, "https://github.com/dotnet/roslyn/issues/8009")]
......@@ -1100,7 +1119,7 @@ public partial class C
}
[WorkItem(11474, "https://github.com/dotnet/roslyn/pull/11474")]
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task FindFuzzy1(TestHost testHost)
{
......@@ -1118,7 +1137,7 @@ public void ToError()
}
[WorkItem(18843, "https://github.com/dotnet/roslyn/issues/18843")]
[WpfTheory]
[Theory]
[CombinatorialData]
public async Task Test__arglist(TestHost testHost)
{
......
src/EditorFeatures/VisualBasicTest/NavigateTo/NavigateToTests.vb
浏览文件 @ 7628d776
......@@ -22,7 +22,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.NavigateTo
Return TestWorkspace.CreateVisualBasic(content, exportProvider:=exportProvider)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestNoItemsForEmptyFile(testHost As TestHost) As Task
Await TestAsync(testHost, "", Async Function(w)
......@@ -30,7 +30,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.NavigateTo
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindClass(testHost As TestHost) As Task
Await TestAsync(testHost,
......@@ -41,7 +41,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindVerbatimClass(testHost As TestHost) As Task
Await TestAsync(testHost,
......@@ -55,7 +55,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindNestedClass(testHost As TestHost) As Task
Await TestAsync(testHost,
......@@ -70,7 +70,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindMemberInANestedClass(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Alpha
......@@ -87,7 +87,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindGenericConstrainedClass(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Goo(Of M As IComparable)
......@@ -97,7 +97,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindGenericConstrainedMethod(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Goo(Of M As IComparable)
......@@ -109,7 +109,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindPartialClass(testHost As TestHost) As Task
Await TestAsync(testHost, "Partial Public Class Goo
......@@ -131,7 +131,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindClassInNamespace(testHost As TestHost) As Task
Await TestAsync(testHost, "Namespace Bar
......@@ -143,7 +143,7 @@ End Namespace", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindStruct(testHost As TestHost) As Task
Await TestAsync(testHost, "Structure Bar
......@@ -153,7 +153,7 @@ End Structure", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindEnum(testHost As TestHost) As Task
Await TestAsync(testHost, "Enum Colors
......@@ -166,7 +166,7 @@ End Enum", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindEnumMember(testHost As TestHost) As Task
Await TestAsync(testHost, "Enum Colors
......@@ -179,7 +179,7 @@ End Enum", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindField1(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Goo
......@@ -190,7 +190,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindField2(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Goo
......@@ -201,7 +201,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindField3(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Goo
......@@ -211,7 +211,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindVerbatimField(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Goo
......@@ -225,7 +225,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindConstField(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Goo
......@@ -236,7 +236,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindIndexer(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Goo
......@@ -255,7 +255,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
<WorkItem(780993, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/780993")>
Public Async Function TestFindEvent(testHost As TestHost) As Task
......@@ -267,7 +267,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindNormalProperty(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Goo
......@@ -283,7 +283,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindAutoImplementedProperty(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Goo
......@@ -294,7 +294,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindMethod(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Goo
......@@ -306,7 +306,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindVerbatimMethod(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Goo
......@@ -321,7 +321,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindParameterizedMethod(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Goo
......@@ -333,7 +333,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindConstructor(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Goo
......@@ -345,7 +345,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindStaticConstructor(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Goo
......@@ -357,7 +357,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindDestructor(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Goo
......@@ -376,7 +376,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindPartialMethods(testHost As TestHost) As Task
Await TestAsync(testHost, "Partial Class Goo
......@@ -401,7 +401,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindPartialMethodDefinitionOnly(testHost As TestHost) As Task
Await TestAsync(testHost, "Partial Class Goo
......@@ -413,7 +413,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindPartialMethodImplementationOnly(testHost As TestHost) As Task
Await TestAsync(testHost, "Partial Class Goo
......@@ -425,7 +425,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindOverriddenMethods(testHost As TestHost) As Task
Await TestAsync(testHost, "Class BaseGoo
......@@ -450,7 +450,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestDottedPattern1(testHost As TestHost) As Task
Await TestAsync(testHost, "namespace Goo
......@@ -472,7 +472,7 @@ end namespace", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestDottedPattern2(testHost As TestHost) As Task
Await TestAsync(testHost, "namespace Goo
......@@ -493,7 +493,7 @@ end namespace", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestDottedPattern3(testHost As TestHost) As Task
Await TestAsync(testHost, "namespace Goo
......@@ -515,7 +515,7 @@ end namespace", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestDottedPattern4(testHost As TestHost) As Task
Await TestAsync(testHost, "namespace Goo
......@@ -537,7 +537,7 @@ end namespace", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestDottedPattern5(testHost As TestHost) As Task
Await TestAsync(testHost, "namespace Goo
......@@ -559,7 +559,7 @@ end namespace", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestDottedPattern6(testHost As TestHost) As Task
Await TestAsync(testHost, "namespace Goo
......@@ -578,7 +578,7 @@ end namespace", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
<WorkItem(7855, "https://github.com/dotnet/Roslyn/issues/7855")>
Public Async Function TestDottedPattern7(testHost As TestHost) As Task
......@@ -601,7 +601,7 @@ end namespace", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindInterface(testHost As TestHost) As Task
Await TestAsync(testHost, "Public Interface IGoo
......@@ -611,7 +611,7 @@ End Interface", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindDelegateInNamespace(testHost As TestHost) As Task
Await TestAsync(testHost, "Namespace Goo
......@@ -622,7 +622,7 @@ End Namespace", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindLambdaExpression(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Goo
......@@ -633,7 +633,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindModule(testHost As TestHost) As Task
Await TestAsync(testHost, "Module ModuleTest
......@@ -643,7 +643,7 @@ End Module", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindLineContinuationMethod(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Goo
......@@ -655,7 +655,7 @@ End Sub", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindArray(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Goo
......@@ -666,7 +666,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindClassAndMethodWithSameName(testHost As TestHost) As Task
Await TestAsync(testHost, "Class Goo
......@@ -688,7 +688,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindMethodNestedInGenericTypes(testHost As TestHost) As Task
Await TestAsync(testHost, "Class A(Of T)
......@@ -705,7 +705,7 @@ End Class", Async Function(w)
End Function
<WorkItem(1111131, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1111131")>
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindClassInNamespaceWithGlobalPrefix(testHost As TestHost) As Task
Await TestAsync(testHost, "Namespace Global.MyNS
......@@ -718,7 +718,7 @@ End Namespace", Async Function(w)
End Function
<WorkItem(1121267, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1121267")>
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestFindClassInGlobalNamespace(testHost As TestHost) As Task
Await TestAsync(testHost, "Namespace Global
......@@ -731,7 +731,7 @@ End Namespace", Async Function(w)
End Function
<WorkItem(1834, "https://github.com/dotnet/roslyn/issues/1834")>
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestConstructorNotParentedByTypeBlock(testHost As TestHost) As Task
Await TestAsync(testHost, "Module Program
......@@ -744,7 +744,7 @@ End Sub", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestStartStopSanity(testHost As TestHost) As Task
' Verify that multiple calls to start/stop don't blow up
......@@ -763,7 +763,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestDescriptionItems(testHost As TestHost) As Task
Await TestAsync(testHost, "
......@@ -786,7 +786,7 @@ End Class", Async Function(w)
End Function)
End Function
<WpfTheory>
<Theory>
<CombinatorialData>
Public Async Function TestDescriptionItemsFilePath(testHost As TestHost) As Task
Using workspace = CreateWorkspace(
......
src/Features/Core/Portable/NavigateTo/AbstractNavigateToSearchService.InProcess.cs
浏览文件 @ 7628d776
......@@ -21,6 +21,18 @@ namespace Microsoft.CodeAnalysis.NavigateTo
{
internal abstract partial class AbstractNavigateToSearchService
{
private static ImmutableArray<(PatternMatchKind roslynKind, NavigateToMatchKind vsKind)> s_kindPairs =
ImmutableArray.Create(
(PatternMatchKind.Exact, NavigateToMatchKind.Exact),
(PatternMatchKind.Prefix, NavigateToMatchKind.Prefix),
(PatternMatchKind.Substring, NavigateToMatchKind.Substring),
(PatternMatchKind.CamelCaseExact, NavigateToMatchKind.CamelCaseExact),
(PatternMatchKind.CamelCasePrefix, NavigateToMatchKind.CamelCasePrefix),
(PatternMatchKind.CamelCaseNonContiguousPrefix, NavigateToMatchKind.CamelCaseNonContiguousPrefix),
(PatternMatchKind.CamelCaseSubstring, NavigateToMatchKind.CamelCaseSubstring),
(PatternMatchKind.CamelCaseNonContiguousSubstring, NavigateToMatchKind.CamelCaseNonContiguousSubstring),
(PatternMatchKind.Fuzzy, NavigateToMatchKind.Fuzzy));
public static Task<ImmutableArray<INavigateToSearchResult>> SearchProjectInCurrentProcessAsync(
Project project, ImmutableArray<Document> priorityDocuments, string searchPattern, IImmutableSet<string> kinds, CancellationToken cancellationToken)
{
......@@ -187,44 +199,19 @@ private static string GetItemKind(DeclaredSymbolInfo declaredSymbolInfo)
private static NavigateToMatchKind GetNavigateToMatchKind(ArrayBuilder<PatternMatch> nameMatches)
{
if (nameMatches.Any(r => r.Kind == PatternMatchKind.Exact))
{
return NavigateToMatchKind.Exact;
}
if (nameMatches.Any(r => r.Kind == PatternMatchKind.Prefix))
{
return NavigateToMatchKind.Prefix;
}
if (nameMatches.Any(r => r.Kind == PatternMatchKind.Substring))
{
return NavigateToMatchKind.Substring;
}
if (nameMatches.Any(r => r.Kind == PatternMatchKind.CamelCaseExact))
{
return NavigateToMatchKind.CamelCaseExact;
}
// work backwards through the match kinds. That way our result is as bad as our worst match part. For
// example, say the user searches for `Console.Write` and we find `Console.Write` (exact, exact), and
// `Console.WriteLine` (exact, prefix). We don't want the latter hit to be considered an `exact` match, and
// thus as good as `Console.Write`.
if (nameMatches.Any(r => r.Kind == PatternMatchKind.CamelCasePrefix))
for (var i = s_kindPairs.Length - 1; i >= 0; i--)
{
return NavigateToMatchKind.CamelCasePrefix;
}
if (nameMatches.Any(r => r.Kind == PatternMatchKind.CamelCaseNonContiguousPrefix))
{
return NavigateToMatchKind.CamelCaseNonContiguousPrefix;
}
if (nameMatches.Any(r => r.Kind == PatternMatchKind.CamelCaseSubstring))
{
return NavigateToMatchKind.CamelCaseSubstring;
}
if (nameMatches.Any(r => r.Kind == PatternMatchKind.CamelCaseNonContiguousSubstring))
{
return NavigateToMatchKind.CamelCaseNonContiguousSubstring;
var (roslynKind, vsKind) = s_kindPairs[i];
foreach (var match in nameMatches)
{
if (match.Kind == roslynKind)
return vsKind;
}
}
return NavigateToMatchKind.Regular;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或