Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

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

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

Update tests.

上级 1815b253
隐藏空白更改
内联 并排
Showing with 63 addition and 75 deletion
src/EditorFeatures/CSharpTest/Interactive/NavigateTo/InteractiveNavigateToTests.cs
浏览文件 @ aa6883ae
......@@ -90,7 +90,7 @@ public void Method()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPublic);
var item = (await _aggregator.GetItemsAsync("Method")).Single();
VerifyNavigateToResultItem(item, "Method", "[|Method|]()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.type_0, "Foo.Bar.DogBed"));
VerifyNavigateToResultItem(item, "Method", "[|Method|]()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.in_0_project_1, "Foo.Bar.DogBed", "Test"));
});
}
......@@ -125,7 +125,7 @@ class Foo<U>
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPublic);
var item = (await _aggregator.GetItemsAsync("Bar")).Single();
VerifyNavigateToResultItem(item, "Bar", "[|Bar|]<T>(T)", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.type_0, "Foo<U>"));
VerifyNavigateToResultItem(item, "Bar", "[|Bar|]<T>(T)", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.in_0_project_1, "Foo<U>", "Test"));
});
}
......@@ -256,7 +256,7 @@ public async Task FindVerbatimIdentifier()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupField, StandardGlyphItem.GlyphItemPrivate);
var item = (await _aggregator.GetItemsAsync("string")).Single();
VerifyNavigateToResultItem(item, "string", "[|string|]", MatchKind.Exact, NavigateToItemKind.Field, additionalInfo: string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "string", "[|string|]", MatchKind.Exact, NavigateToItemKind.Field, additionalInfo: string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -268,7 +268,7 @@ public async Task FindIndexer()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupProperty, StandardGlyphItem.GlyphItemPublic);
var item = (await _aggregator.GetItemsAsync("this")).Single();
VerifyNavigateToResultItem(item, "this", "[|this|][int]", MatchKind.Exact, NavigateToItemKind.Property, additionalInfo: string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "this", "[|this|][int]", MatchKind.Exact, NavigateToItemKind.Property, additionalInfo: string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -280,7 +280,7 @@ public async Task FindEvent()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupEvent, StandardGlyphItem.GlyphItemPublic);
var item = (await _aggregator.GetItemsAsync("CEH")).Single();
VerifyNavigateToResultItem(item, "ChangedEventHandler", "[|C|]hanged[|E|]vent[|H|]andler", MatchKind.Regular, NavigateToItemKind.Event, additionalInfo: string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "ChangedEventHandler", "[|C|]hanged[|E|]vent[|H|]andler", MatchKind.Regular, NavigateToItemKind.Event, additionalInfo: string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -295,7 +295,7 @@ public async Task FindAutoProperty()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupProperty, StandardGlyphItem.GlyphItemPrivate);
var item = (await _aggregator.GetItemsAsync("B")).Single();
VerifyNavigateToResultItem(item, "Bar", "[|B|]ar", MatchKind.Prefix, NavigateToItemKind.Property, additionalInfo: string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "Bar", "[|B|]ar", MatchKind.Prefix, NavigateToItemKind.Property, additionalInfo: string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -310,7 +310,7 @@ public async Task FindMethod()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPrivate);
var item = (await _aggregator.GetItemsAsync("DS")).Single();
VerifyNavigateToResultItem(item, "DoSomething", "[|D|]o[|S|]omething()", MatchKind.Regular, NavigateToItemKind.Method, string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "DoSomething", "[|D|]o[|S|]omething()", MatchKind.Regular, NavigateToItemKind.Method, string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -327,7 +327,7 @@ void DoSomething(int a, string b)
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPrivate);
var item = (await _aggregator.GetItemsAsync("DS")).Single();
VerifyNavigateToResultItem(item, "DoSomething", "[|D|]o[|S|]omething(int, string)", MatchKind.Regular, NavigateToItemKind.Method, string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "DoSomething", "[|D|]o[|S|]omething(int, string)", MatchKind.Regular, NavigateToItemKind.Method, string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -344,7 +344,7 @@ public Foo()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPublic);
var item = (await _aggregator.GetItemsAsync("Foo")).Single(t => t.Kind == NavigateToItemKind.Method);
VerifyNavigateToResultItem(item, "Foo", "[|Foo|]()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "Foo", "[|Foo|]()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -361,7 +361,7 @@ public Foo(int i)
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPublic);
var item = (await _aggregator.GetItemsAsync("Foo")).Single(t => t.Kind == NavigateToItemKind.Method);
VerifyNavigateToResultItem(item, "Foo", "[|Foo|](int)", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "Foo", "[|Foo|](int)", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -378,7 +378,7 @@ static Foo()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPrivate);
var item = (await _aggregator.GetItemsAsync("Foo")).Single(t => t.Kind == NavigateToItemKind.Method && t.Name != ".ctor");
VerifyNavigateToResultItem(item, "Foo", "[|Foo|].static Foo()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "Foo", "[|Foo|].static Foo()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -407,7 +407,7 @@ public async Task FindPartialMethodDefinitionOnly()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPrivate);
var item = (await _aggregator.GetItemsAsync("Bar")).Single();
VerifyNavigateToResultItem(item, "Bar", "[|Bar|]()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "Bar", "[|Bar|]()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -430,7 +430,7 @@ public async Task FindOverriddenMembers()
var unused = itemDisplay.Glyph;
Assert.Equal("Name", itemDisplay.Name);
Assert.Equal(string.Format(FeaturesResources.type_0, "DogBed"), itemDisplay.AdditionalInformation);
Assert.Equal(string.Format(FeaturesResources.in_0_project_1, "DogBed", "Test"), itemDisplay.AdditionalInformation);
_glyphServiceMock.Verify();
item = items.ElementAt(1);
......@@ -438,7 +438,7 @@ public async Task FindOverriddenMembers()
unused = itemDisplay.Glyph;
Assert.Equal("Name", itemDisplay.Name);
Assert.Equal(string.Format(FeaturesResources.type_0, "Foo"), itemDisplay.AdditionalInformation);
Assert.Equal(string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"), itemDisplay.AdditionalInformation);
_glyphServiceMock.Verify();
});
}
......@@ -485,7 +485,7 @@ class Foo
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupField, StandardGlyphItem.GlyphItemPrivate);
var item = (await _aggregator.GetItemsAsync("sqr")).Single();
VerifyNavigateToResultItem(item, "sqr", "[|sqr|]", MatchKind.Exact, NavigateToItemKind.Field, string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "sqr", "[|sqr|]", MatchKind.Exact, NavigateToItemKind.Field, string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......
src/EditorFeatures/CSharpTest/NavigateTo/NavigateToTests.cs
浏览文件 @ aa6883ae
......@@ -105,7 +105,7 @@ public void Method()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPublic);
var item = (await _aggregator.GetItemsAsync("Method")).Single();
VerifyNavigateToResultItem(item, "Method", "[|Method|]()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.type_0, "Foo.Bar.DogBed"));
VerifyNavigateToResultItem(item, "Method", "[|Method|]()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.in_0_project_1, "Foo.Bar.DogBed", "Test"));
});
}
......@@ -140,7 +140,7 @@ class Foo<U>
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPublic);
var item = (await _aggregator.GetItemsAsync("Bar")).Single();
VerifyNavigateToResultItem(item, "Bar", "[|Bar|]<T>(T)", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.type_0, "Foo<U>"));
VerifyNavigateToResultItem(item, "Bar", "[|Bar|]<T>(T)", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.in_0_project_1, "Foo<U>", "Test"));
});
}
......@@ -256,7 +256,7 @@ public async Task FindField1()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupField, StandardGlyphItem.GlyphItemPrivate);
var item = (await _aggregator.GetItemsAsync("b")).Single();
VerifyNavigateToResultItem(item, "bar", "[|b|]ar", MatchKind.Prefix, NavigateToItemKind.Field, additionalInfo: string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "bar", "[|b|]ar", MatchKind.Prefix, NavigateToItemKind.Field, additionalInfo: string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -271,7 +271,7 @@ public async Task FindField2()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupField, StandardGlyphItem.GlyphItemPrivate);
var item = (await _aggregator.GetItemsAsync("ba")).Single();
VerifyNavigateToResultItem(item, "bar", "[|ba|]r", MatchKind.Prefix, NavigateToItemKind.Field, additionalInfo: string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "bar", "[|ba|]r", MatchKind.Prefix, NavigateToItemKind.Field, additionalInfo: string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -300,11 +300,11 @@ public async Task FindVerbatimField()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupField, StandardGlyphItem.GlyphItemPrivate);
var item = (await _aggregator.GetItemsAsync("string")).Single();
VerifyNavigateToResultItem(item, "string", "[|string|]", MatchKind.Exact, NavigateToItemKind.Field, additionalInfo: string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "string", "[|string|]", MatchKind.Exact, NavigateToItemKind.Field, additionalInfo: string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
// Check searching for@string too
item = (await _aggregator.GetItemsAsync("@string")).Single();
VerifyNavigateToResultItem(item, "string", "[|string|]", MatchKind.Exact, NavigateToItemKind.Field, additionalInfo: string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "string", "[|string|]", MatchKind.Exact, NavigateToItemKind.Field, additionalInfo: string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -360,7 +360,7 @@ public async Task FindIndexer()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupProperty, StandardGlyphItem.GlyphItemPublic);
var item = (await _aggregator.GetItemsAsync("this")).Single();
VerifyNavigateToResultItem(item, "this", "[|this|][int]", MatchKind.Exact, NavigateToItemKind.Property, additionalInfo: string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "this", "[|this|][int]", MatchKind.Exact, NavigateToItemKind.Property, additionalInfo: string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -372,7 +372,7 @@ public async Task FindEvent()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupEvent, StandardGlyphItem.GlyphItemPublic);
var item = (await _aggregator.GetItemsAsync("CEH")).Single();
VerifyNavigateToResultItem(item, "ChangedEventHandler", "[|C|]hanged[|E|]vent[|H|]andler", MatchKind.Regular, NavigateToItemKind.Event, additionalInfo: string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "ChangedEventHandler", "[|C|]hanged[|E|]vent[|H|]andler", MatchKind.Regular, NavigateToItemKind.Event, additionalInfo: string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -387,7 +387,7 @@ public async Task FindAutoProperty()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupProperty, StandardGlyphItem.GlyphItemPrivate);
var item = (await _aggregator.GetItemsAsync("B")).Single();
VerifyNavigateToResultItem(item, "Bar", "[|B|]ar", MatchKind.Prefix, NavigateToItemKind.Property, additionalInfo: string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "Bar", "[|B|]ar", MatchKind.Prefix, NavigateToItemKind.Property, additionalInfo: string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -402,7 +402,7 @@ public async Task FindMethod()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPrivate);
var item = (await _aggregator.GetItemsAsync("DS")).Single();
VerifyNavigateToResultItem(item, "DoSomething", "[|D|]o[|S|]omething()", MatchKind.Regular, NavigateToItemKind.Method, string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "DoSomething", "[|D|]o[|S|]omething()", MatchKind.Regular, NavigateToItemKind.Method, string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -417,11 +417,11 @@ public async Task FindVerbatimMethod()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPrivate);
var item = (await _aggregator.GetItemsAsync("static")).Single();
VerifyNavigateToResultItem(item, "static", "[|static|]()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "static", "[|static|]()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
// Verify if we search for @static too
item = (await _aggregator.GetItemsAsync("@static")).Single();
VerifyNavigateToResultItem(item, "static", "[|static|]()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "static", "[|static|]()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -438,7 +438,7 @@ void DoSomething(int a, string b)
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPrivate);
var item = (await _aggregator.GetItemsAsync("DS")).Single();
VerifyNavigateToResultItem(item, "DoSomething", "[|D|]o[|S|]omething(int, string)", MatchKind.Regular, NavigateToItemKind.Method, string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "DoSomething", "[|D|]o[|S|]omething(int, string)", MatchKind.Regular, NavigateToItemKind.Method, string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -455,7 +455,7 @@ public Foo()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPublic);
var item = (await _aggregator.GetItemsAsync("Foo")).Single(t => t.Kind == NavigateToItemKind.Method);
VerifyNavigateToResultItem(item, "Foo", "[|Foo|]()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "Foo", "[|Foo|]()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -472,7 +472,7 @@ public Foo(int i)
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPublic);
var item = (await _aggregator.GetItemsAsync("Foo")).Single(t => t.Kind == NavigateToItemKind.Method);
VerifyNavigateToResultItem(item, "Foo", "[|Foo|](int)", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "Foo", "[|Foo|](int)", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -489,7 +489,7 @@ static Foo()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPrivate);
var item = (await _aggregator.GetItemsAsync("Foo")).Single(t => t.Kind == NavigateToItemKind.Method && t.Name != ".ctor");
VerifyNavigateToResultItem(item, "Foo", "[|Foo|].static Foo()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "Foo", "[|Foo|].static Foo()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -518,7 +518,7 @@ public async Task FindPartialMethodDefinitionOnly()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPrivate);
var item = (await _aggregator.GetItemsAsync("Bar")).Single();
VerifyNavigateToResultItem(item, "Bar", "[|Bar|]()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "Bar", "[|Bar|]()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -535,7 +535,7 @@ public async Task FindPartialMethodImplementationOnly()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPrivate);
var item = (await _aggregator.GetItemsAsync("Bar")).Single();
VerifyNavigateToResultItem(item, "Bar", "[|Bar|]()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "Bar", "[|Bar|]()", MatchKind.Exact, NavigateToItemKind.Method, string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -558,7 +558,7 @@ public async Task FindOverriddenMembers()
var unused = itemDisplay.Glyph;
Assert.Equal("Name", itemDisplay.Name);
Assert.Equal(string.Format(FeaturesResources.type_0, "DogBed"), itemDisplay.AdditionalInformation);
Assert.Equal(string.Format(FeaturesResources.in_0_project_1, "DogBed", "Test"), itemDisplay.AdditionalInformation);
_glyphServiceMock.Verify();
item = items.ElementAt(1);
......@@ -566,7 +566,7 @@ public async Task FindOverriddenMembers()
unused = itemDisplay.Glyph;
Assert.Equal("Name", itemDisplay.Name);
Assert.Equal(string.Format(FeaturesResources.type_0, "Foo"), itemDisplay.AdditionalInformation);
Assert.Equal(string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"), itemDisplay.AdditionalInformation);
_glyphServiceMock.Verify();
});
}
......@@ -613,7 +613,7 @@ class Foo
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupField, StandardGlyphItem.GlyphItemPrivate);
var item = (await _aggregator.GetItemsAsync("sqr")).Single();
VerifyNavigateToResultItem(item, "sqr", "[|sqr|]", MatchKind.Exact, NavigateToItemKind.Field, string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "sqr", "[|sqr|]", MatchKind.Exact, NavigateToItemKind.Field, string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -628,7 +628,7 @@ public async Task FindArray()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupField, StandardGlyphItem.GlyphItemPrivate);
var item = (await _aggregator.GetItemsAsync("itemArray")).Single();
VerifyNavigateToResultItem(item, "itemArray", "[|itemArray|]", MatchKind.Exact, NavigateToItemKind.Field, string.Format(FeaturesResources.type_0, "Foo"));
VerifyNavigateToResultItem(item, "itemArray", "[|itemArray|]", MatchKind.Exact, NavigateToItemKind.Field, string.Format(FeaturesResources.in_0_project_1, "Foo", "Test"));
});
}
......@@ -676,7 +676,7 @@ void M()
{
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPrivate);
var item = (await _aggregator.GetItemsAsync("M")).Single();
VerifyNavigateToResultItem(item, "M", "[|M|]()", MatchKind.Exact, NavigateToItemKind.Method, additionalInfo: string.Format(FeaturesResources.type_0, "A<T>.B.C<U>"));
VerifyNavigateToResultItem(item, "M", "[|M|]()", MatchKind.Exact, NavigateToItemKind.Method, additionalInfo: string.Format(FeaturesResources.in_0_project_1, "A<T>.B.C<U>", "Test"));
});
}
......
src/EditorFeatures/VisualBasicTest/NavigateTo/NavigateToTests.vb
浏览文件 @ aa6883ae
......@@ -75,7 +75,7 @@ End Class
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPublic)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("DS")).Single()
VerifyNavigateToResultItem(item, "DoSomething", "[|D|]o[|S|]omething()", MatchKind.Regular, NavigateToItemKind.Method, String.Format(FeaturesResources.type_0, "Alpha.Beta.Gamma"))
VerifyNavigateToResultItem(item, "DoSomething", "[|D|]o[|S|]omething()", MatchKind.Regular, NavigateToItemKind.Method, String.Format(FeaturesResources.in_0_project_1, "Alpha.Beta.Gamma", "Test"))
End Function)
End Function
......@@ -97,7 +97,7 @@ End Sub
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPublic)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("Bar")).Single()
VerifyNavigateToResultItem(item, "Bar", "[|Bar|](Of T)()", MatchKind.Exact, NavigateToItemKind.Method, String.Format(FeaturesResources.type_0, "Foo(Of M)"))
VerifyNavigateToResultItem(item, "Bar", "[|Bar|](Of T)()", MatchKind.Exact, NavigateToItemKind.Method, String.Format(FeaturesResources.in_0_project_1, "Foo(Of M)", "Test"))
End Function)
End Function
......@@ -177,7 +177,7 @@ Private Bar As Integer
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupField, StandardGlyphItem.GlyphItemPrivate)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("Ba")).Single()
VerifyNavigateToResultItem(item, "Bar", "[|Ba|]r", MatchKind.Prefix, NavigateToItemKind.Field, additionalInfo:=String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "Bar", "[|Ba|]r", MatchKind.Prefix, NavigateToItemKind.Field, additionalInfo:=String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
End Function)
End Function
......@@ -188,7 +188,7 @@ Private Bar As Integer
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupField, StandardGlyphItem.GlyphItemPrivate)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("ba")).Single()
VerifyNavigateToResultItem(item, "Bar", "[|Ba|]r", MatchKind.Prefix, NavigateToItemKind.Field, additionalInfo:=String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "Bar", "[|Ba|]r", MatchKind.Prefix, NavigateToItemKind.Field, additionalInfo:=String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
End Function)
End Function
......@@ -209,10 +209,10 @@ Private [string] As String
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupField, StandardGlyphItem.GlyphItemPrivate)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("string")).Single()
VerifyNavigateToResultItem(item, "string", "[|string|]", MatchKind.Exact, NavigateToItemKind.Field, additionalInfo:=String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "string", "[|string|]", MatchKind.Exact, NavigateToItemKind.Field, additionalInfo:=String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
item = (Await _aggregator.GetItemsAsync("[string]")).Single()
VerifyNavigateToResultItem(item, "string", "[|string|]", MatchKind.Exact, NavigateToItemKind.Field, additionalInfo:=String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "string", "[|string|]", MatchKind.Exact, NavigateToItemKind.Field, additionalInfo:=String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
End Function)
End Function
......@@ -223,7 +223,7 @@ Private Const bar As String = ""bar""
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupConstant, StandardGlyphItem.GlyphItemPrivate)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("bar")).Single()
VerifyNavigateToResultItem(item, "bar", "[|bar|]", MatchKind.Exact, NavigateToItemKind.Constant, additionalInfo:=String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "bar", "[|bar|]", MatchKind.Exact, NavigateToItemKind.Constant, additionalInfo:=String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
End Function)
End Function
......@@ -242,7 +242,7 @@ End Property
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupProperty, StandardGlyphItem.GlyphItemPublic)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("Item")).Single()
VerifyNavigateToResultItem(item, "Item", "[|Item|](Integer)", MatchKind.Exact, NavigateToItemKind.Property, String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "Item", "[|Item|](Integer)", MatchKind.Exact, NavigateToItemKind.Property, String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
End Function)
End Function
......@@ -253,7 +253,7 @@ Public Event Bar as EventHandler
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupEvent, StandardGlyphItem.GlyphItemPublic)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("Bar")).Single()
VerifyNavigateToResultItem(item, "Bar", "[|Bar|]", MatchKind.Exact, NavigateToItemKind.Event, additionalInfo:=String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "Bar", "[|Bar|]", MatchKind.Exact, NavigateToItemKind.Event, additionalInfo:=String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
End Function)
End Function
......@@ -269,7 +269,7 @@ End Set
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupProperty, StandardGlyphItem.GlyphItemPublic)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("Name")).Single()
VerifyNavigateToResultItem(item, "Name", "[|Name|]", MatchKind.Exact, NavigateToItemKind.Property, additionalInfo:=String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "Name", "[|Name|]", MatchKind.Exact, NavigateToItemKind.Property, additionalInfo:=String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
End Function)
End Function
......@@ -280,7 +280,7 @@ Property Name As String
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupProperty, StandardGlyphItem.GlyphItemPublic)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("Name")).Single()
VerifyNavigateToResultItem(item, "Name", "[|Name|]", MatchKind.Exact, NavigateToItemKind.Property, additionalInfo:=String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "Name", "[|Name|]", MatchKind.Exact, NavigateToItemKind.Property, additionalInfo:=String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
End Function)
End Function
......@@ -292,7 +292,7 @@ End Sub
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPrivate)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("DS")).Single()
VerifyNavigateToResultItem(item, "DoSomething", "[|D|]o[|S|]omething()", MatchKind.Regular, NavigateToItemKind.Method, String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "DoSomething", "[|D|]o[|S|]omething()", MatchKind.Regular, NavigateToItemKind.Method, String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
End Function)
End Function
......@@ -304,10 +304,10 @@ End Sub
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPrivate)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("sub")).Single()
VerifyNavigateToResultItem(item, "Sub", "[|Sub|]()", MatchKind.Exact, NavigateToItemKind.Method, String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "Sub", "[|Sub|]()", MatchKind.Exact, NavigateToItemKind.Method, String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
item = (Await _aggregator.GetItemsAsync("[sub]")).Single()
VerifyNavigateToResultItem(item, "Sub", "[|Sub|]()", MatchKind.Exact, NavigateToItemKind.Method, String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "Sub", "[|Sub|]()", MatchKind.Exact, NavigateToItemKind.Method, String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
End Function)
End Function
......@@ -319,7 +319,7 @@ End Sub
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPrivate)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("DS")).Single()
VerifyNavigateToResultItem(item, "DoSomething", "[|D|]o[|S|]omething(Integer, String)", MatchKind.Regular, NavigateToItemKind.Method, String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "DoSomething", "[|D|]o[|S|]omething(Integer, String)", MatchKind.Regular, NavigateToItemKind.Method, String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
End Function)
End Function
......@@ -331,7 +331,7 @@ End Sub
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPublic)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("Foo")).Single(Function(i) i.Kind = NavigateToItemKind.Method)
VerifyNavigateToResultItem(item, "Foo", "[|Foo|].New()", MatchKind.Exact, NavigateToItemKind.Method, String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "Foo", "[|Foo|].New()", MatchKind.Exact, NavigateToItemKind.Method, String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
End Function)
End Function
......@@ -343,7 +343,7 @@ End Sub
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPrivate)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("Foo")).Single(Function(i) i.Kind = NavigateToItemKind.Method)
VerifyNavigateToResultItem(item, "Foo", "[|Foo|].New()", MatchKind.Exact, NavigateToItemKind.Method, String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "Foo", "[|Foo|].New()", MatchKind.Exact, NavigateToItemKind.Method, String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
End Function)
End Function
......@@ -358,11 +358,11 @@ End Sub
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemProtected)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("Finalize")).Single()
VerifyNavigateToResultItem(item, "Finalize", "[|Finalize|]()", MatchKind.Exact, NavigateToItemKind.Method, String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "Finalize", "[|Finalize|]()", MatchKind.Exact, NavigateToItemKind.Method, String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPublic)
item = (Await _aggregator.GetItemsAsync("Dispose")).Single()
VerifyNavigateToResultItem(item, "Dispose", "[|Dispose|]()", MatchKind.Exact, NavigateToItemKind.Method, String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "Dispose", "[|Dispose|]()", MatchKind.Exact, NavigateToItemKind.Method, String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
End Function)
End Function
......@@ -399,7 +399,7 @@ End Sub
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPrivate)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("Bar")).Single()
VerifyNavigateToResultItem(item, "Bar", "[|Bar|]()", MatchKind.Exact, NavigateToItemKind.Method, String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "Bar", "[|Bar|]()", MatchKind.Exact, NavigateToItemKind.Method, String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
End Function)
End Function
......@@ -411,7 +411,7 @@ End Sub
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPrivate)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("Bar")).Single()
VerifyNavigateToResultItem(item, "Bar", "[|Bar|]()", MatchKind.Exact, NavigateToItemKind.Method, String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "Bar", "[|Bar|]()", MatchKind.Exact, NavigateToItemKind.Method, String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
End Function)
End Function
......@@ -611,7 +611,7 @@ Dim sqr As Func(Of Integer, Integer) = Function(x) x*x
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupField, StandardGlyphItem.GlyphItemPrivate)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("sqr")).Single()
VerifyNavigateToResultItem(item, "sqr", "[|sqr|]", MatchKind.Exact, NavigateToItemKind.Field, additionalInfo:=String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "sqr", "[|sqr|]", MatchKind.Exact, NavigateToItemKind.Field, additionalInfo:=String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
End Function)
End Function
......@@ -633,7 +633,7 @@ y as Integer)
End Sub", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPublic)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("Bar")).Single()
VerifyNavigateToResultItem(item, "Bar", "[|Bar|](Integer, Integer)", MatchKind.Exact, NavigateToItemKind.Method, String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "Bar", "[|Bar|](Integer, Integer)", MatchKind.Exact, NavigateToItemKind.Method, String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
End Function)
End Function
......@@ -644,7 +644,7 @@ Private itemArray as object()
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupField, StandardGlyphItem.GlyphItemPrivate)
Dim item As NavigateToItem = (Await _aggregator.GetItemsAsync("itemArray")).Single
VerifyNavigateToResultItem(item, "itemArray", "[|itemArray|]", MatchKind.Exact, NavigateToItemKind.Field, additionalInfo:=String.Format(FeaturesResources.type_0, "Foo"))
VerifyNavigateToResultItem(item, "itemArray", "[|itemArray|]", MatchKind.Exact, NavigateToItemKind.Field, additionalInfo:=String.Format(FeaturesResources.in_0_project_1, "Foo", "Test"))
End Function)
End Function
......@@ -681,7 +681,7 @@ End Class
End Class", Async Function(w)
SetupVerifiableGlyph(StandardGlyphGroup.GlyphGroupMethod, StandardGlyphItem.GlyphItemPublic)
Dim item = (Await _aggregator.GetItemsAsync("M")).Single
VerifyNavigateToResultItem(item, "M", "[|M|]()", MatchKind.Exact, NavigateToItemKind.Method, additionalInfo:=String.Format(FeaturesResources.type_0, "A(Of T).B.C(Of U)"))
VerifyNavigateToResultItem(item, "M", "[|M|]()", MatchKind.Exact, NavigateToItemKind.Method, additionalInfo:=String.Format(FeaturesResources.in_0_project_1, "A(Of T).B.C(Of U)", "Test"))
End Function)
End Function
......
src/Features/Core/Portable/FeaturesResources.Designer.cs
浏览文件 @ aa6883ae
......@@ -2984,15 +2984,6 @@ internal class FeaturesResources {
}
}
/// <summary>
/// Looks up a localized string similar to type {0}.
/// </summary>
internal static string type_0 {
get {
return ResourceManager.GetString("type_0", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to type constraint.
/// </summary>
......
src/Features/Core/Portable/FeaturesResources.resx
浏览文件 @ aa6883ae
......@@ -1046,9 +1046,6 @@ This version used in: {2}</value>
<data name="project_0" xml:space="preserve">
<value>project {0}</value>
</data>
<data name="type_0" xml:space="preserve">
<value>type {0}</value>
</data>
<data name="Inline_variable_declaration" xml:space="preserve">
<value>Inline variable declaration</value>
</data>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或