Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

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

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

Rename outlining->structure.

上级 7d5079bc
展开全部 隐藏空白更改
内联 并排
Showing with 1130 addition and 1257 deletion
src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj
浏览文件 @ 98e2791d
......@@ -304,47 +304,23 @@
<Compile Include="Organizing\OrganizeModifiersTests.cs" />
<Compile Include="Organizing\OrganizeTypeDeclarationTests.cs" />
<Compile Include="Organizing\OrganizeUsingsTests.cs" />
<Compile Include="Outlining\AbstractCSharpSyntaxNodeOutlinerTests.cs" />
<Compile Include="Outlining\AbstractCSharpSyntaxTriviaOutlinerTests.cs" />
<Compile Include="Outlining\AccessorDeclarationTests.cs" />
<Compile Include="Outlining\AnonymousMethodExpressionTests.cs" />
<Compile Include="Outlining\CommentTests.cs" />
<Compile Include="Outlining\CompilationUnitOutlinerTests.cs" />
<Compile Include="Outlining\ConstructorDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\ConversionOperatorDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\DelegateDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\DestructorDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\DisabledTextOutlinerTests.cs" />
<Compile Include="Outlining\DocumentationCommentOutlinerTests.cs" />
<Compile Include="Outlining\EnumDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\EventDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\EventFieldDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\FieldDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\IndexerDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\MetadataAsSource\ConstructorDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\MetadataAsSource\ConversionOperatorDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\MetadataAsSource\DelegateDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\MetadataAsSource\DestructorDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\MetadataAsSource\EnumDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\MetadataAsSource\EnumMemberDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\MetadataAsSource\EventDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\MetadataAsSource\EventFieldDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\MetadataAsSource\FieldDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\MetadataAsSource\IndexerDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\MetadataAsSource\InvalidIdentifierTests.cs" />
<Compile Include="Outlining\MetadataAsSource\MethodDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\MetadataAsSource\OperatorDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\MetadataAsSource\PropertyDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\MetadataAsSource\RegionDirectiveOutlinerTests.cs" />
<Compile Include="Outlining\MetadataAsSource\TypeDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\MethodDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\NamespaceDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\OperatorDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\ParenthesizedLambdaOutlinerTests.cs" />
<Compile Include="Outlining\PropertyDeclarationOutlinerTests.cs" />
<Compile Include="Outlining\RegionDirectiveOutlinerTests.cs" />
<Compile Include="Outlining\SimpleLambdaExpressionOutlinerTests.cs" />
<Compile Include="Outlining\TypeDeclarationOutlinerTests.cs" />
<Compile Include="Structure\AbstractCSharpSyntaxNodeStructureTests.cs" />
<Compile Include="Structure\AbstractCSharpSyntaxTriviaStructureTests.cs" />
<Compile Include="Structure\AccessorDeclarationStructureTests.cs" />
<Compile Include="Structure\AnonymousMethodExpressionStructureTests.cs" />
<Compile Include="Structure\CommentStructureTests.cs" />
<Compile Include="Structure\CompilationUnitStructureTests.cs" />
<Compile Include="Structure\ConstructorDeclarationStructureTests.cs" />
<Compile Include="Structure\ConversionOperatorDeclarationStructureTests.cs" />
<Compile Include="Structure\DelegateDeclarationStructureTests.cs" />
<Compile Include="Structure\DestructorDeclarationStructureTests.cs" />
<Compile Include="Structure\DisabledTextStructureTests.cs" />
<Compile Include="Structure\DocumentationCommentStructureTests.cs" />
<Compile Include="Structure\EnumDeclarationStructureTests.cs" />
<Compile Include="Structure\EventDeclarationStructureTests.cs" />
<Compile Include="Structure\EventFieldDeclarationStructureTests.cs" />
<Compile Include="Structure\FieldDeclarationStructureTests.cs" />
<Compile Include="Structure\IndexerDeclarationStructureTests.cs" />
<Compile Include="PopulateSwitch\PopulateSwitchTests.cs" />
<Compile Include="PopulateSwitch\PopulateSwitchTests_FixAllTests.cs" />
<Compile Include="QuickInfo\SemanticQuickInfoSourceTests.cs" />
......@@ -360,6 +336,30 @@
<Compile Include="SignatureHelp\ObjectCreationExpressionSignatureHelpProviderTests.cs" />
<Compile Include="SplitStringLiteral\SplitStringLiteralCommandHandlerTests.cs" />
<Compile Include="Squiggles\ErrorSquiggleProducerTests.cs" />
<Compile Include="Structure\MetadataAsSource\ConstructorDeclarationStructureTests.cs" />
<Compile Include="Structure\MetadataAsSource\ConversionOperatorDeclarationStructureTests.cs" />
<Compile Include="Structure\MetadataAsSource\DelegateDeclarationStructureTests.cs" />
<Compile Include="Structure\MetadataAsSource\DestructorDeclarationStructureTests.cs" />
<Compile Include="Structure\MetadataAsSource\EnumDeclarationStructureTests.cs" />
<Compile Include="Structure\MetadataAsSource\EnumMemberDeclarationStructureTests.cs" />
<Compile Include="Structure\MetadataAsSource\EventDeclarationStructureTests.cs" />
<Compile Include="Structure\MetadataAsSource\EventFieldDeclarationStructureTests.cs" />
<Compile Include="Structure\MetadataAsSource\FieldDeclarationStructureTests.cs" />
<Compile Include="Structure\MetadataAsSource\IndexerDeclarationStructureTests.cs" />
<Compile Include="Structure\MetadataAsSource\InvalidIdentifierStructureTests.cs" />
<Compile Include="Structure\MetadataAsSource\MethodDeclarationStructureTests.cs" />
<Compile Include="Structure\MetadataAsSource\OperatorDeclarationStructureTests.cs" />
<Compile Include="Structure\MetadataAsSource\PropertyDeclarationStructureTests.cs" />
<Compile Include="Structure\MetadataAsSource\RegionDirectiveStructureTests.cs" />
<Compile Include="Structure\MetadataAsSource\TypeDeclarationStructureTests.cs" />
<Compile Include="Structure\MethodDeclarationStructureTests.cs" />
<Compile Include="Structure\NamespaceDeclarationStructureTests.cs" />
<Compile Include="Structure\OperatorDeclarationStructureTests.cs" />
<Compile Include="Structure\ParenthesizedLambdaStructureTests.cs" />
<Compile Include="Structure\PropertyDeclarationStructureTests.cs" />
<Compile Include="Structure\RegionDirectiveStructureTests.cs" />
<Compile Include="Structure\SimpleLambdaExpressionStructureTests.cs" />
<Compile Include="Structure\TypeDeclarationStructureTests.cs" />
<Compile Include="SymbolId\SymbolKeyCompilationsTests.cs" />
<Compile Include="SymbolId\SymbolKeyMetadataVsSourceTests.cs" />
<Compile Include="SymbolId\SymbolKeyTestBase.cs" />
......@@ -525,4 +525,4 @@
</ItemGroup>
<Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
<Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
</Project>
</Project>
\ No newline at end of file
src/EditorFeatures/CSharpTest/Outlining/SimpleLambdaExpressionTests.cs 已删除 100644 → 0
浏览文件 @ 7d5079bc
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic;
using System.Linq;
using Microsoft.CodeAnalysis.Compilers.CSharp;
using Microsoft.CodeAnalysis.CSharp.Semantics;
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
using Microsoft.CodeAnalysis.Services.CSharp.Outlining;
using Microsoft.CodeAnalysis.Services.Internal;
using Microsoft.CodeAnalysis.Services.Outlining;
using Microsoft.CodeAnalysis.Test.Utilities;
using Microsoft.CodeAnalysis.Text;
using Microsoft.VisualStudio.Text;
using Xunit;
namespace Microsoft.CodeAnalysis.Services.CSharp.UnitTests.Outlining
{
public class SimpleLambdaExpressionTests :
AbstractOutlinerTests<SimpleLambdaExpressionSyntax>
{
protected override IEnumerable<OutliningRegion> GetRegions(SyntaxTree tree, SimpleLambdaExpressionSyntax lambdaExpression)
{
var outliner = new SimpleLambdaExpressionOutliner();
return outliner.GetRegions(tree, lambdaExpression).WhereNotNull();
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public void TestLambda()
{
var tree = Utils.ParseLines("class C",
"{",
" void Main()",
" {",
" f => {",
" x();",
" };",
" }",
"}");
var lambdaExpression = tree.Root.FindFirstNodeOfType<SimpleLambdaExpressionSyntax>();
var actualRegion = GetRegion(tree, lambdaExpression);
var expectedRegion = new OutliningRegion(
Span.FromBounds(41, 62),
CSharpOutliningHelpers.Ellipsis,
autoCollapse: false);
AssertRegion(expectedRegion, actualRegion);
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public void TestLambdaInForLoop()
{
var tree = Utils.ParseLines("class C",
"{",
" void Main()",
" {",
" for (Action a = x => { }; true; a()) { }",
" }",
"}");
var lambdaExpression = tree.Root.FindFirstNodeOfType<SimpleLambdaExpressionSyntax>();
var actualRegions = GetRegions(tree, lambdaExpression).ToList();
Assert.Equal(0, actualRegions.Count);
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public void TestLambdaInMethodCall1()
{
var tree = Utils.ParseLines("class C",
"{",
" void Main()",
" {",
" someMethod(42, \"test\", false, x => {",
" return x;",
" }, \"other arguments\");",
" }",
"}");
var lambdaExpression = tree.Root.FindFirstNodeOfType<SimpleLambdaExpressionSyntax>();
var actualRegion = GetRegion(tree, lambdaExpression);
var expectedRegion = new OutliningRegion(
Span.FromBounds(71, 98),
CSharpOutliningHelpers.Ellipsis,
autoCollapse: false);
AssertRegion(expectedRegion, actualRegion);
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public void TestLambdaInMethodCall2()
{
var tree = Utils.ParseLines("class C",
"{",
" void Main()",
" {",
" someMethod(42, \"test\", false, x => {",
" return x;",
" });",
" }",
"}");
var lambdaExpression = tree.Root.FindFirstNodeOfType<SimpleLambdaExpressionSyntax>();
var actualRegion = GetRegion(tree, lambdaExpression);
var expectedRegion = new OutliningRegion(
Span.FromBounds(71, 98),
CSharpOutliningHelpers.Ellipsis,
autoCollapse: false);
AssertRegion(expectedRegion, actualRegion);
}
}
}
src/EditorFeatures/CSharpTest/Outlining/AbstractCSharpSyntaxNodeOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/AbstractCSharpSyntaxNodeStructureTests.cs
浏览文件 @ 98e2791d
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.CodeAnalysis.Editor.UnitTests.Outlining;
using Microsoft.CodeAnalysis.Editor.UnitTests.Structure;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public abstract class AbstractCSharpSyntaxNodeOutlinerTests<TSyntaxNode> :
AbstractSyntaxNodeOutlinerTests<TSyntaxNode>
public abstract class AbstractCSharpSyntaxNodeStructureTests<TSyntaxNode> :
AbstractSyntaxNodeStructureProviderTests<TSyntaxNode>
where TSyntaxNode : SyntaxNode
{
protected sealed override string LanguageName => LanguageNames.CSharp;
......
src/EditorFeatures/CSharpTest/Outlining/AbstractCSharpSyntaxTriviaOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/AbstractCSharpSyntaxTriviaStructureTests.cs
浏览文件 @ 98e2791d
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.CodeAnalysis.Editor.UnitTests.Outlining;
using Microsoft.CodeAnalysis.Editor.UnitTests.Structure;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public abstract class AbstractCSharpSyntaxTriviaOutlinerTests : AbstractSyntaxTriviaOutlinerTests
public abstract class AbstractCSharpSyntaxTriviaStructureTests : AbstractSyntaxTriviaStructureProviderTests
{
protected sealed override string LanguageName => LanguageNames.CSharp;
}
......
src/EditorFeatures/CSharpTest/Outlining/AccessorDeclarationTests.cs → src/EditorFeatures/CSharpTest/Structure/AccessorDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -7,11 +7,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class AccessorDeclarationTests : AbstractCSharpSyntaxNodeOutlinerTests<AccessorDeclarationSyntax>
public class AccessorDeclarationTests : AbstractCSharpSyntaxNodeStructureTests<AccessorDeclarationSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new AccessorDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new AccessorDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestPropertyGetter1()
......@@ -27,8 +27,8 @@ public string Text
}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -48,9 +48,9 @@ public string Text
}
";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// My ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -70,9 +70,9 @@ public string Text
}
";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "/* My ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -92,8 +92,8 @@ public string Text
}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -116,9 +116,9 @@ public string Text
}
";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// My ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -141,9 +141,9 @@ public string Text
}
";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "/* My ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -160,8 +160,8 @@ public string Text
}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -180,9 +180,9 @@ public string Text
}
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// My ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -201,9 +201,9 @@ public string Text
}
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "/* My ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -223,8 +223,8 @@ public string Text
}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -246,9 +246,9 @@ public string Text
}
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// My ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -270,9 +270,9 @@ public string Text
}
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "/* My ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
src/EditorFeatures/CSharpTest/Outlining/AnonymousMethodExpressionTests.cs → src/EditorFeatures/CSharpTest/Structure/AnonymousMethodExpressionStructureTests.cs
浏览文件 @ 98e2791d
......@@ -7,11 +7,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class AnonymousMethodExpressionTests : AbstractCSharpSyntaxNodeOutlinerTests<AnonymousMethodExpressionSyntax>
public class AnonymousMethodExpressionTests : AbstractCSharpSyntaxNodeStructureTests<AnonymousMethodExpressionSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new AnonymousMethodExpressionOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new AnonymousMethodExpressionStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestAnonymousMethod()
......@@ -27,8 +27,8 @@ void Main()
}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: false));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: false));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -43,7 +43,7 @@ void Main()
}
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -60,8 +60,8 @@ void Main()
}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: false));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: false));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -78,8 +78,8 @@ void Main()
}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: false));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: false));
}
}
}
src/EditorFeatures/CSharpTest/Outlining/CommentTests.cs → src/EditorFeatures/CSharpTest/Structure/CommentStructureTests.cs
浏览文件 @ 98e2791d
......@@ -3,19 +3,19 @@
using System.Linq;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CSharp.Structure;
using Microsoft.CodeAnalysis.Editor.UnitTests.Outlining;
using Microsoft.CodeAnalysis.Editor.UnitTests.Structure;
using Microsoft.CodeAnalysis.Structure;
using Roslyn.Test.Utilities;
using Roslyn.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class CommentTests : AbstractSyntaxOutlinerTests
public class CommentTests : AbstractSyntaxStructureProviderTests
{
protected override string LanguageName => LanguageNames.CSharp;
internal override async Task<BlockSpan[]> GetRegionsAsync(Document document, int position)
internal override async Task<BlockSpan[]> GetBlockSpansAsync(Document document, int position)
{
var root = await document.GetSyntaxRootAsync();
var trivia = root.FindTrivia(position, findInsideTrivia: true);
......@@ -24,11 +24,11 @@ internal override async Task<BlockSpan[]> GetRegionsAsync(Document document, int
if (token.LeadingTrivia.Contains(trivia))
{
return CSharpOutliningHelpers.CreateCommentRegions(token.LeadingTrivia).ToArray();
return CSharpStructureHelpers.CreateCommentRegions(token.LeadingTrivia).ToArray();
}
else if (token.TrailingTrivia.Contains(trivia))
{
return CSharpOutliningHelpers.CreateCommentRegions(token.TrailingTrivia).ToArray();
return CSharpStructureHelpers.CreateCommentRegions(token.TrailingTrivia).ToArray();
}
else
{
......@@ -47,7 +47,7 @@ class C
}
";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "// Hello ...", autoCollapse: true));
}
......@@ -63,7 +63,7 @@ class C
}
";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "// Hello ...", autoCollapse: true));
}
......@@ -79,7 +79,7 @@ class C
}
";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "// Hello ...", autoCollapse: true));
}
......@@ -96,7 +96,7 @@ class C
}
";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "// Hello ...", autoCollapse: true));
}
......@@ -111,7 +111,7 @@ class C
}
";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "/* Hello ...", autoCollapse: true));
}
......@@ -125,7 +125,7 @@ class C
}
";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "/* Hello C# ...", autoCollapse: true));
}
......@@ -137,7 +137,7 @@ public async Task TestIncompleteMultilineCommentZeroSpace()
const string code = @"
{|span:$$/*|}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "/* ...", autoCollapse: true));
}
......@@ -149,7 +149,7 @@ public async Task TestIncompleteMultilineCommentSingleSpace()
const string code = @"
{|span:$$/* |}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "/* ...", autoCollapse: true));
}
}
......
src/EditorFeatures/CSharpTest/Outlining/CompilationUnitOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/CompilationUnitStructureTests.cs
浏览文件 @ 98e2791d
......@@ -7,11 +7,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class CompilationUnitOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<CompilationUnitSyntax>
public class CompilationUnitStructureTests : AbstractCSharpSyntaxNodeStructureTests<CompilationUnitSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new CompilationUnitOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new CompilationUnitStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestUsings()
......@@ -20,8 +20,8 @@ public async Task TestUsings()
$${|hint:using {|collapse:System;
using System.Core;|}|}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -33,8 +33,8 @@ public async Task TestUsingAliases()
using text = System.Text;
using linq = System.Linq;|}|}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -44,8 +44,8 @@ public async Task TestExternAliases()
$${|hint:extern {|collapse:alias Foo;
extern alias Bar;|}|}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -57,8 +57,8 @@ public async Task TestExternAliasesAndUsings()
using System;
using System.Core;|}|}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -76,9 +76,9 @@ public async Task TestExternAliasesAndUsingsWithLeadingTrailingAndNestedComments
{|span3:// Foo
// Bar|}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// Foo ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: true),
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: true),
Region("span3", "// Foo ...", autoCollapse: true));
}
......@@ -91,9 +91,9 @@ public async Task TestUsingsWithComments()
{|hint2:using {|collapse2:System;
using System.Core;|}|}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// Foo ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -105,9 +105,9 @@ public async Task TestExternAliasesWithComments()
{|hint2:extern {|collapse2:alias Foo;
extern alias Bar;|}|}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// Foo ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -117,7 +117,7 @@ public async Task TestWithComments()
$${|span1:// Foo
// Bar|}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// Foo ...", autoCollapse: true));
}
......@@ -129,8 +129,8 @@ public async Task TestWithCommentsAtEnd()
{|span2:// Foo
// Bar|}";
await VerifyRegionsAsync(code,
Region("collapse1", "hint1", CSharpOutliningHelpers.Ellipsis, autoCollapse: true),
await VerifyBlockSpansAsync(code,
Region("collapse1", "hint1", CSharpStructureHelpers.Ellipsis, autoCollapse: true),
Region("span2", "// Foo ...", autoCollapse: true));
}
......@@ -141,8 +141,8 @@ public async Task TestUsingKeywordWithSpace()
const string code = @"
$${|hint:using|} {|collapse:|}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
src/EditorFeatures/CSharpTest/Outlining/ConstructorDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/ConstructorDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -7,11 +7,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class ConstructorDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<ConstructorDeclarationSyntax>
public class ConstructorDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<ConstructorDeclarationSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new ConstructorDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new ConstructorDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestConstructor1()
......@@ -24,8 +24,8 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -39,8 +39,8 @@ class C
} |}|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -54,8 +54,8 @@ class C
}|}|} // .ctor
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -69,8 +69,8 @@ class C
}|}|} /* .ctor */
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -84,8 +84,8 @@ class C
}|}|} // .ctor
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -99,8 +99,8 @@ class C
}|}|} // .ctor
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -115,8 +115,8 @@ class C
}|}|} // .ctor
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -131,8 +131,8 @@ class C
}|}|} // .ctor
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -148,9 +148,9 @@ class C
}|}|} // .ctor
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// Foo ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -164,7 +164,7 @@ class C
$$C(
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
}
}
src/EditorFeatures/CSharpTest/Outlining/ConversionOperatorDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/ConversionOperatorDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -7,11 +7,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class ConversionOperatorDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<ConversionOperatorDeclarationSyntax>
public class ConversionOperatorDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<ConversionOperatorDeclarationSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new ConversionOperatorDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new ConversionOperatorDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestOperator()
......@@ -24,8 +24,8 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact,
......@@ -42,9 +42,9 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// Foo ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
src/EditorFeatures/CSharpTest/Outlining/DelegateDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/DelegateDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -7,11 +7,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class DelegateDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<DelegateDeclarationSyntax>
public class DelegateDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<DelegateDeclarationSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new DelegateDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new DelegateDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestDelegateWithComments()
......@@ -21,7 +21,7 @@ public async Task TestDelegateWithComments()
// Bar|}
$$public delegate void C();";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "// Foo ...", autoCollapse: true));
}
}
......
src/EditorFeatures/CSharpTest/Outlining/DestructorDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/DestructorDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -7,11 +7,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class DestructorDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<DestructorDeclarationSyntax>
public class DestructorDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<DestructorDeclarationSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new DestructorDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new DestructorDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestDestructor()
......@@ -24,8 +24,8 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -41,9 +41,9 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// Foo ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -57,7 +57,7 @@ class C
$$~C(
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
}
}
src/EditorFeatures/CSharpTest/Outlining/DisabledTextOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/DisabledTextStructureTests.cs
浏览文件 @ 98e2791d
......@@ -6,11 +6,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class DisabledTextOutlinerTests : AbstractCSharpSyntaxTriviaOutlinerTests
public class DisabledTextStructureTests : AbstractCSharpSyntaxTriviaStructureTests
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new DisabledTextTriviaOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new DisabledTextTriviaStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestDisabledIf()
......@@ -23,8 +23,8 @@ public async Task TestDisabledIf()
#endif
";
await VerifyRegionsAsync(code,
Region("span", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("span", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -39,8 +39,8 @@ public async Task TestDisabledElse()
#endif
";
await VerifyRegionsAsync(code,
Region("span", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("span", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -55,8 +55,8 @@ public async Task TestDisabledElIf()
#endif
";
await VerifyRegionsAsync(code,
Region("span", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("span", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[WorkItem(531360, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/531360")]
......@@ -76,8 +76,8 @@ class P {
}
";
await VerifyRegionsAsync(code,
Region("span", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("span", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[WorkItem(531360, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/531360")]
......@@ -97,7 +97,7 @@ class P {
}
";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[WorkItem(1070677, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1070677")]
......@@ -117,8 +117,8 @@ class P {
}
";
await VerifyRegionsAsync(code,
Region("span", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("span", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[WorkItem(1070677, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1070677")]
......@@ -139,8 +139,8 @@ void M()
}
";
await VerifyRegionsAsync(code,
Region("span", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("span", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[WorkItem(1070677, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1070677")]
......@@ -160,8 +160,8 @@ class P {
}
";
await VerifyRegionsAsync(code,
Region("span", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("span", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[WorkItem(1070677, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1070677")]
......@@ -190,8 +190,8 @@ class P {
}
";
await VerifyRegionsAsync(code,
Region("span", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("span", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[WorkItem(1100600, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1100600")]
......@@ -220,8 +220,8 @@ class P {
}
";
await VerifyRegionsAsync(code,
Region("span", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("span", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
src/EditorFeatures/CSharpTest/Outlining/DocumentationCommentOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/DocumentationCommentStructureTests.cs
浏览文件 @ 98e2791d
......@@ -7,11 +7,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class DocumentationCommentOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<DocumentationCommentTriviaSyntax>
public class DocumentationCommentStructureTests : AbstractCSharpSyntaxNodeStructureTests<DocumentationCommentTriviaSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new DocumentationCommentOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new DocumentationCommentStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestDocumentationCommentWithoutSummaryTag1()
......@@ -25,7 +25,7 @@ class Class3
{
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "/// XML doc comment ...", autoCollapse: true));
}
......@@ -42,7 +42,7 @@ class Class3
{
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "/** Block comment ...", autoCollapse: true));
}
......@@ -55,7 +55,7 @@ class Class3
{
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "/// <param name=\"tree\"></param> ...", autoCollapse: true));
}
......@@ -70,7 +70,7 @@ class Class3
{
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "/// <summary> Hello C#!", autoCollapse: true));
}
......@@ -85,7 +85,7 @@ class Class3
{
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "/// <summary> " + new string('x', 106) + " ...", autoCollapse: true));
}
......@@ -100,7 +100,7 @@ class Class3
{
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "/** <summary> Hello C#!", autoCollapse: true));
}
......@@ -115,7 +115,7 @@ class Class3
{
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "/// <summary> Hello C#!", autoCollapse: true));
}
......@@ -130,7 +130,7 @@ class Class3
{
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "/** <summary> Hello C#!", autoCollapse: true));
}
......@@ -143,7 +143,7 @@ class Class3
{
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "/// <summary> Hello C#!", autoCollapse: true));
}
......@@ -156,7 +156,7 @@ class Class3
{
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "/** <summary> Hello C#!", autoCollapse: true));
}
......@@ -169,7 +169,7 @@ class Class3
{
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "/// <summary> Hello C#!", autoCollapse: true));
}
......@@ -182,7 +182,7 @@ class Class3
{
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "/** <summary> Hello C#!", autoCollapse: true));
}
......@@ -198,7 +198,7 @@ class Class3
{
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "/// <summary> Hello C#!", autoCollapse: true));
}
......@@ -215,7 +215,7 @@ class Class3
{
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "/// <summary> Hello C#!", autoCollapse: true));
}
......@@ -233,7 +233,7 @@ class C
public void M<T>(T t) { }
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "/// <summary> Summary with SeeClass , SeeAlsoClass , null , T , t , and not-supported .", autoCollapse: true));
}
}
......
src/EditorFeatures/CSharpTest/Outlining/EnumDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/EnumDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -7,11 +7,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class EnumDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<EnumDeclarationSyntax>
public class EnumDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<EnumDeclarationSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new EnumDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new EnumDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestEnum()
......@@ -21,8 +21,8 @@ public async Task TestEnum()
{
}|}|}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: false));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: false));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -35,9 +35,9 @@ public async Task TestEnumWithLeadingComments()
{
}|}|}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// Foo ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: false));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: false));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -50,9 +50,9 @@ public async Task TestEnumWithNestedComments()
// Bar|}
}|}|}";
await VerifyRegionsAsync(code,
Region("collapse1", "hint1", CSharpOutliningHelpers.Ellipsis, autoCollapse: false),
await VerifyBlockSpansAsync(code,
Region("collapse1", "hint1", CSharpStructureHelpers.Ellipsis, autoCollapse: false),
Region("span2", "// Foo ...", autoCollapse: true));
}
}
}
}
\ No newline at end of file
src/EditorFeatures/CSharpTest/Outlining/EventDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/EventDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -7,11 +7,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class EventDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<EventDeclarationSyntax>
public class EventDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<EventDeclarationSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new EventDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new EventDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestEvent()
......@@ -26,8 +26,8 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -45,9 +45,9 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// Foo ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
src/EditorFeatures/CSharpTest/Outlining/EventFieldDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/EventFieldDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -7,11 +7,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class EventFieldDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<EventFieldDeclarationSyntax>
public class EventFieldDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<EventFieldDeclarationSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new EventFieldDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new EventFieldDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestEventFieldWithComments()
......@@ -24,7 +24,7 @@ class C
$$event EventHandler E;
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "// Foo ...", autoCollapse: true));
}
}
......
src/EditorFeatures/CSharpTest/Outlining/FieldDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/FieldDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -7,11 +7,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class FieldDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<FieldDeclarationSyntax>
public class FieldDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<FieldDeclarationSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new FieldDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new FieldDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestFieldWithComments()
......@@ -24,7 +24,7 @@ class C
$$int F;
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "// Foo ...", autoCollapse: true));
}
}
......
src/EditorFeatures/CSharpTest/Outlining/IndexerDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/IndexerDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -7,11 +7,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class IndexerDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<IndexerDeclarationSyntax>
public class IndexerDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<IndexerDeclarationSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new IndexerDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new IndexerDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestIndexer()
......@@ -25,8 +25,8 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -43,9 +43,9 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// Foo ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -59,7 +59,7 @@ class C
$$public string this[int index] => 0;
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "// Foo ...", autoCollapse: true));
}
}
......
src/EditorFeatures/CSharpTest/Outlining/MetadataAsSource/ConstructorDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/ConstructorDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -2,18 +2,18 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CSharp.Structure;
using Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Structure;
using Roslyn.Test.Utilities;
using Xunit;
using MaSOutliners = Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining.MetadataAsSource
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure.MetadataAsSource
{
public class ConstructorDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<ConstructorDeclarationSyntax>
public class ConstructorDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<ConstructorDeclarationSyntax>
{
protected override string WorkspaceKind => CodeAnalysis.WorkspaceKind.MetadataAsSource;
internal override AbstractSyntaxStructureProvider CreateOutliner() => new MaSOutliners.ConstructorDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new MetadataConstructorDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
public async Task NoCommentsOrAttributes()
......@@ -24,7 +24,7 @@ class C
$$C();
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -37,8 +37,8 @@ class C
|}$$C();|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -53,8 +53,8 @@ class C
|}$$C();|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -69,8 +69,8 @@ class C
|}$$public C();|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
}
\ No newline at end of file
src/EditorFeatures/CSharpTest/Outlining/MetadataAsSource/ConversionOperatorDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/ConversionOperatorDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -2,18 +2,18 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CSharp.Structure;
using Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Structure;
using Roslyn.Test.Utilities;
using Xunit;
using MaSOutliners = Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining.MetadataAsSource
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure.MetadataAsSource
{
public class ConversionOperatorDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<ConversionOperatorDeclarationSyntax>
public class ConversionOperatorDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<ConversionOperatorDeclarationSyntax>
{
protected override string WorkspaceKind => CodeAnalysis.WorkspaceKind.MetadataAsSource;
internal override AbstractSyntaxStructureProvider CreateOutliner() => new MaSOutliners.ConversionOperatorDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new MetadataConversionOperatorDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
public async Task NoCommentsOrAttributes()
......@@ -24,7 +24,7 @@ class C
public static explicit operator $$Foo(byte b);
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -37,8 +37,8 @@ class C
|}public static explicit operator $$Foo(byte b);|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -53,8 +53,8 @@ class C
|}public static explicit operator $$Foo(byte b);|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
}
\ No newline at end of file
src/EditorFeatures/CSharpTest/Outlining/MetadataAsSource/DelegateDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/DelegateDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -2,18 +2,18 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CSharp.Structure;
using Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Structure;
using Roslyn.Test.Utilities;
using Xunit;
using MaSOutliners = Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining.MetadataAsSource
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure.MetadataAsSource
{
public class DelegateDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<DelegateDeclarationSyntax>
public class DelegateDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<DelegateDeclarationSyntax>
{
protected override string WorkspaceKind => CodeAnalysis.WorkspaceKind.MetadataAsSource;
internal override AbstractSyntaxStructureProvider CreateOutliner() => new MaSOutliners.DelegateDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new MetadataDelegateDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
public async Task NoCommentsOrAttributes()
......@@ -21,7 +21,7 @@ public async Task NoCommentsOrAttributes()
const string code = @"
public delegate TResult $$Blah<in T, out TResult>(T arg);";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -31,8 +31,8 @@ public async Task WithAttributes()
{|hint:{|collapse:[Foo]
|}public delegate TResult $$Blah<in T, out TResult>(T arg);|}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -44,8 +44,8 @@ public async Task WithCommentsAndAttributes()
[Foo]
|}delegate TResult $$Blah<in T, out TResult>(T arg);|}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -57,8 +57,8 @@ public async Task WithCommentsAttributesAndModifiers()
[Foo]
|}public delegate TResult $$Blah<in T, out TResult>(T arg);|}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
}
\ No newline at end of file
src/EditorFeatures/CSharpTest/Outlining/MetadataAsSource/DestructorDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/DestructorDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -2,18 +2,18 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CSharp.Structure;
using Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Structure;
using Roslyn.Test.Utilities;
using Xunit;
using MaSOutliners = Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining.MetadataAsSource
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure.MetadataAsSource
{
public class DestructorDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<DestructorDeclarationSyntax>
public class DestructorDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<DestructorDeclarationSyntax>
{
protected override string WorkspaceKind => CodeAnalysis.WorkspaceKind.MetadataAsSource;
internal override AbstractSyntaxStructureProvider CreateOutliner() => new MaSOutliners.DestructorDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new MetadataDestructorDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
public async Task NoCommentsOrAttributes()
......@@ -24,7 +24,7 @@ class Foo
$$~Foo();
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -37,8 +37,8 @@ class Foo
|}$$~Foo();|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -53,8 +53,8 @@ class Foo
|}$$~Foo();|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
}
\ No newline at end of file
src/EditorFeatures/CSharpTest/Outlining/MetadataAsSource/EnumDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/EnumDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -2,18 +2,18 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CSharp.Structure;
using Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Structure;
using Roslyn.Test.Utilities;
using Xunit;
using MaSOutliners = Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining.MetadataAsSource
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure.MetadataAsSource
{
public class EnumDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<EnumDeclarationSyntax>
public class EnumDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<EnumDeclarationSyntax>
{
protected override string WorkspaceKind => CodeAnalysis.WorkspaceKind.MetadataAsSource;
internal override AbstractSyntaxStructureProvider CreateOutliner() => new MaSOutliners.EnumDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new MetadataEnumDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
public async Task NoCommentsOrAttributes()
......@@ -25,7 +25,7 @@ enum $$E
B
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -39,8 +39,8 @@ public async Task WithAttributes()
B
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -56,8 +56,8 @@ public async Task WithCommentsAndAttributes()
B
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -73,8 +73,8 @@ public async Task WithCommentsAttributesAndModifiers()
B
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
}
\ No newline at end of file
src/EditorFeatures/CSharpTest/Outlining/MetadataAsSource/EnumMemberDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/EnumMemberDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -2,18 +2,18 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CSharp.Structure;
using Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Structure;
using Roslyn.Test.Utilities;
using Xunit;
using MaSOutliners = Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining.MetadataAsSource
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure.MetadataAsSource
{
public class EnumMemberDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<EnumMemberDeclarationSyntax>
public class EnumMemberDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<EnumMemberDeclarationSyntax>
{
protected override string WorkspaceKind => CodeAnalysis.WorkspaceKind.MetadataAsSource;
internal override AbstractSyntaxStructureProvider CreateOutliner() => new MaSOutliners.EnumMemberDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new MetadataEnumMemberDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
public async Task NoCommentsOrAttributes()
......@@ -25,7 +25,7 @@ enum E
Bar
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -39,8 +39,8 @@ enum E
Bar
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -56,8 +56,8 @@ enum E
Bar
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
}
\ No newline at end of file
src/EditorFeatures/CSharpTest/Outlining/MetadataAsSource/EventDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/EventDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -2,18 +2,18 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CSharp.Structure;
using Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Structure;
using Roslyn.Test.Utilities;
using Xunit;
using MaSOutliners = Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining.MetadataAsSource
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure.MetadataAsSource
{
public class EventDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<EventDeclarationSyntax>
public class EventDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<EventDeclarationSyntax>
{
protected override string WorkspaceKind => CodeAnalysis.WorkspaceKind.MetadataAsSource;
internal override AbstractSyntaxStructureProvider CreateOutliner() => new MaSOutliners.EventDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new MetadataEventDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
public async Task NoCommentsOrAttributes()
......@@ -24,7 +24,7 @@ class Foo
public event EventArgs $$foo { add; remove; }
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -37,8 +37,8 @@ class Foo
|}public event EventArgs $$foo { add; remove; }|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -53,8 +53,8 @@ class Foo
|}event EventArgs $$foo { add; remove; }|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -69,8 +69,8 @@ class Foo
|}public event EventArgs $$foo { add; remove; }|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
}
\ No newline at end of file
src/EditorFeatures/CSharpTest/Outlining/MetadataAsSource/EventFieldDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/EventFieldDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -2,18 +2,18 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CSharp.Structure;
using Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Structure;
using Roslyn.Test.Utilities;
using Xunit;
using MaSOutliners = Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining.MetadataAsSource
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure.MetadataAsSource
{
public class EventFieldDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<EventFieldDeclarationSyntax>
public class EventFieldDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<EventFieldDeclarationSyntax>
{
protected override string WorkspaceKind => CodeAnalysis.WorkspaceKind.MetadataAsSource;
internal override AbstractSyntaxStructureProvider CreateOutliner() => new MaSOutliners.EventFieldDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new MetadataEventFieldDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
public async Task NoCommentsOrAttributes()
......@@ -24,7 +24,7 @@ class Foo
public event EventArgs $$foo
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -37,8 +37,8 @@ class Foo
|}event EventArgs $$foo|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -53,8 +53,8 @@ class Foo
|}event EventArgs $$foo|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -69,8 +69,8 @@ class Foo
|}public event EventArgs $$foo|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
}
\ No newline at end of file
src/EditorFeatures/CSharpTest/Outlining/MetadataAsSource/FieldDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/FieldDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -2,18 +2,18 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CSharp.Structure;
using Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Structure;
using Roslyn.Test.Utilities;
using Xunit;
using MaSOutliners = Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining.MetadataAsSource
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure.MetadataAsSource
{
public class FieldDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<FieldDeclarationSyntax>
public class FieldDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<FieldDeclarationSyntax>
{
protected override string WorkspaceKind => CodeAnalysis.WorkspaceKind.MetadataAsSource;
internal override AbstractSyntaxStructureProvider CreateOutliner() => new MaSOutliners.FieldDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new MetadataFieldDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
public async Task NoCommentsOrAttributes()
......@@ -24,7 +24,7 @@ class Foo
public int $$foo
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -37,8 +37,8 @@ class Foo
|}public int $$foo|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -53,8 +53,8 @@ class Foo
|}int $$foo|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -69,8 +69,8 @@ class Foo
|}public int $$foo|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
}
\ No newline at end of file
src/EditorFeatures/CSharpTest/Outlining/MetadataAsSource/IndexerDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/IndexerDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -2,18 +2,18 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CSharp.Structure;
using Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Structure;
using Roslyn.Test.Utilities;
using Xunit;
using MaSOutliners = Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining.MetadataAsSource
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure.MetadataAsSource
{
public class IndexerDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<IndexerDeclarationSyntax>
public class IndexerDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<IndexerDeclarationSyntax>
{
protected override string WorkspaceKind => CodeAnalysis.WorkspaceKind.MetadataAsSource;
internal override AbstractSyntaxStructureProvider CreateOutliner() => new MaSOutliners.IndexerDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new MetadataIndexerDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
public async Task NoCommentsOrAttributes()
......@@ -24,7 +24,7 @@ class Foo
public string $$this[int x] { get; set; }
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -37,8 +37,8 @@ class Foo
|}public string $$this[int x] { get; set; }|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -53,8 +53,8 @@ class Foo
|}string $$this[int x] { get; set; }|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -69,8 +69,8 @@ class Foo
|}public string $$this[int x] { get; set; }|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
}
\ No newline at end of file
src/EditorFeatures/CSharpTest/Outlining/MetadataAsSource/InvalidIdentifierTests.cs → src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/InvalidIdentifierStructureTests.cs
浏览文件 @ 98e2791d
......@@ -3,24 +3,24 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Editor.UnitTests.Outlining;
using Microsoft.CodeAnalysis.Editor.UnitTests.Structure;
using Microsoft.CodeAnalysis.Structure;
using Roslyn.Test.Utilities;
using Roslyn.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining.MetadataAsSource
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure.MetadataAsSource
{
/// <summary>
/// Identifiers coming from IL can be just about any valid string and since C# doesn't have a way to escape all possible
/// IL identifiers, we have to account for the possibility that an item's metadata name could lead to unparseable code.
/// </summary>
public class InvalidIdentifierTests : AbstractSyntaxOutlinerTests
public class InvalidIdentifierStructureTests : AbstractSyntaxStructureProviderTests
{
protected override string LanguageName => LanguageNames.CSharp;
protected override string WorkspaceKind => CodeAnalysis.WorkspaceKind.MetadataAsSource;
internal override async Task<BlockSpan[]> GetRegionsAsync(Document document, int position)
internal override async Task<BlockSpan[]> GetBlockSpansAsync(Document document, int position)
{
var outliningService = document.Project.LanguageServices.GetService<BlockStructureService>();
......@@ -38,7 +38,7 @@ public async Task PrependedDollarSign()
public void $Invoke();
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[WorkItem(1174405, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1174405")]
......@@ -51,7 +51,7 @@ public async Task SymbolsAndPunctuation()
public void !#$%^&*(()_-+=|\}]{[""':;?/>.<,~`();
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[WorkItem(1174405, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1174405")]
......@@ -64,7 +64,7 @@ public async Task IdentifierThatLooksLikeCode()
public void } } public class CodeInjection{ } /* now everything is commented ();
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
}
}
src/EditorFeatures/CSharpTest/Outlining/MetadataAsSource/MethodDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/MethodDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -2,18 +2,18 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CSharp.Structure;
using Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Structure;
using Roslyn.Test.Utilities;
using Xunit;
using MaSOutliners = Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining.MetadataAsSource
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure.MetadataAsSource
{
public class MethodDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<MethodDeclarationSyntax>
public class MethodDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<MethodDeclarationSyntax>
{
protected override string WorkspaceKind => CodeAnalysis.WorkspaceKind.MetadataAsSource;
internal override AbstractSyntaxStructureProvider CreateOutliner() => new MaSOutliners.MethodDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new MetadataMethodDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
public async Task NoCommentsOrAttributes()
......@@ -24,7 +24,7 @@ class Foo
public string $$Bar(int x);
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -37,8 +37,8 @@ class Foo
|}public string $$Bar(int x);|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -53,8 +53,8 @@ class Foo
|}string $$Bar(int x);|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -69,8 +69,8 @@ class Foo
|}public string $$Bar(int x);|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
\ No newline at end of file
src/EditorFeatures/CSharpTest/Outlining/MetadataAsSource/OperatorDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/OperatorDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -2,18 +2,18 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CSharp.Structure;
using Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Structure;
using Roslyn.Test.Utilities;
using Xunit;
using MaSOutliners = Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining.MetadataAsSource
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure.MetadataAsSource
{
public class OperatorDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<OperatorDeclarationSyntax>
public class OperatorDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<OperatorDeclarationSyntax>
{
protected override string WorkspaceKind => CodeAnalysis.WorkspaceKind.MetadataAsSource;
internal override AbstractSyntaxStructureProvider CreateOutliner() => new MaSOutliners.OperatorDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new MetadataOperatorDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
public async Task NoCommentsOrAttributes()
......@@ -24,7 +24,7 @@ class Foo
public static bool operator $$==(Foo a, Foo b);
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -37,8 +37,8 @@ class Foo
|}public static bool operator $$==(Foo a, Foo b);|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -53,8 +53,8 @@ class Foo
|}bool operator $$==(Foo a, Foo b);|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -69,8 +69,8 @@ class Foo
|}public static bool operator $$==(Foo a, Foo b);|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
\ No newline at end of file
src/EditorFeatures/CSharpTest/Outlining/MetadataAsSource/PropertyDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/PropertyDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -2,18 +2,18 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CSharp.Structure;
using Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Structure;
using Roslyn.Test.Utilities;
using Xunit;
using MaSOutliners = Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining.MetadataAsSource
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure.MetadataAsSource
{
public class PropertyDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<PropertyDeclarationSyntax>
public class PropertyDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<PropertyDeclarationSyntax>
{
protected override string WorkspaceKind => CodeAnalysis.WorkspaceKind.MetadataAsSource;
internal override AbstractSyntaxStructureProvider CreateOutliner() => new MaSOutliners.PropertyDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new MetadataPropertyDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
public async Task NoCommentsOrAttributes()
......@@ -24,7 +24,7 @@ class Foo
public string $$Prop { get; set; }
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -37,8 +37,8 @@ class Foo
|}public string $$Prop { get; set; }|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -53,8 +53,8 @@ class Foo
|}string $$Prop { get; set; }|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -69,8 +69,8 @@ class Foo
|}public string $$Prop { get; set; }|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
\ No newline at end of file
src/EditorFeatures/CSharpTest/Outlining/MetadataAsSource/RegionDirectiveOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/RegionDirectiveStructureTests.cs
浏览文件 @ 98e2791d
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Structure;
using Roslyn.Test.Utilities;
using Xunit;
using MaSOutliners = Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining.MetadataAsSource
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure.MetadataAsSource
{
public class RegionDirectiveOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<RegionDirectiveTriviaSyntax>
public class RegionDirectiveStructureTests : AbstractCSharpSyntaxNodeStructureTests<RegionDirectiveTriviaSyntax>
{
protected override string WorkspaceKind => CodeAnalysis.WorkspaceKind.MetadataAsSource;
internal override AbstractSyntaxStructureProvider CreateOutliner() => new MaSOutliners.RegionDirectiveOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new MetadataRegionDirectiveStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
public async Task FileHeader()
......@@ -22,7 +22,7 @@ public async Task FileHeader()
// C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\mscorlib.dll
#endregion|}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "Assembly mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", autoCollapse: true));
}
......@@ -34,7 +34,7 @@ public async Task EmptyFileHeader()
// C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\mscorlib.dll
#endregion|}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "#region", autoCollapse: true));
}
}
......
src/EditorFeatures/CSharpTest/Outlining/MetadataAsSource/TypeDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/TypeDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -2,18 +2,18 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CSharp.Structure;
using Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Structure;
using Roslyn.Test.Utilities;
using Xunit;
using MaSOutliners = Microsoft.CodeAnalysis.CSharp.Structure.MetadataAsSource;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining.MetadataAsSource
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure.MetadataAsSource
{
public class TypeDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<TypeDeclarationSyntax>
public class TypeDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<TypeDeclarationSyntax>
{
protected override string WorkspaceKind => CodeAnalysis.WorkspaceKind.MetadataAsSource;
internal override AbstractSyntaxStructureProvider CreateOutliner() => new MaSOutliners.TypeDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new MetadataTypeDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
public async Task NoCommentsOrAttributes()
......@@ -24,7 +24,7 @@ class $$C
void M();
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -38,8 +38,8 @@ public async Task WithAttributes()
void M();
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
......@@ -54,8 +54,8 @@ public async Task WithCommentsAndAttributes()
void M();
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
\ No newline at end of file
src/EditorFeatures/CSharpTest/Outlining/MethodDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/MethodDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -7,11 +7,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class MethodDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<MethodDeclarationSyntax>
public class MethodDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<MethodDeclarationSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new MethodDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new MethodDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestMethod()
......@@ -24,8 +24,8 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -39,8 +39,8 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -56,9 +56,9 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// Foo ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -72,7 +72,7 @@ class C
$$public string Foo() => ""Foo"";
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "// Foo ...", autoCollapse: true));
}
}
......
src/EditorFeatures/CSharpTest/Outlining/NamespaceDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/NamespaceDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -2,16 +2,16 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining;
using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure;
using Microsoft.CodeAnalysis.Structure;
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.CSharp.Structure.Outlining
{
public class NamespaceDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<NamespaceDeclarationSyntax>
public class NamespaceDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<NamespaceDeclarationSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new NamespaceDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new NamespaceDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestNamespace()
......@@ -24,8 +24,8 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: false));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: false));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -41,9 +41,9 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// Foo ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: false));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: false));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -59,9 +59,9 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
Region("collapse1", "hint1", CSharpOutliningHelpers.Ellipsis, autoCollapse: false),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse1", "hint1", CSharpStructureHelpers.Ellipsis, autoCollapse: false),
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -79,10 +79,10 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
Region("collapse1", "hint1", CSharpOutliningHelpers.Ellipsis, autoCollapse: false),
await VerifyBlockSpansAsync(code,
Region("collapse1", "hint1", CSharpStructureHelpers.Ellipsis, autoCollapse: false),
Region("span2", "// Foo ...", autoCollapse: true),
Region("collapse3", "hint3", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
Region("collapse3", "hint3", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -98,8 +98,8 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
Region("collapse1", "hint1", CSharpOutliningHelpers.Ellipsis, autoCollapse: false),
await VerifyBlockSpansAsync(code,
Region("collapse1", "hint1", CSharpStructureHelpers.Ellipsis, autoCollapse: false),
Region("span2", "// Foo ...", autoCollapse: true));
}
}
......
src/EditorFeatures/CSharpTest/Outlining/OperatorDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/OperatorDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -7,11 +7,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class OperatorDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<OperatorDeclarationSyntax>
public class OperatorDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<OperatorDeclarationSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new OperatorDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new OperatorDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestOperator()
......@@ -24,8 +24,8 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -41,9 +41,9 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// Foo ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
\ No newline at end of file
src/EditorFeatures/CSharpTest/Outlining/ParenthesizedLambdaOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/ParenthesizedLambdaStructureTests.cs
浏览文件 @ 98e2791d
......@@ -7,11 +7,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class ParenthesizedLambdaOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<ParenthesizedLambdaExpressionSyntax>
public class ParenthesizedLambdaStructureTests : AbstractCSharpSyntaxNodeStructureTests<ParenthesizedLambdaExpressionSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new ParenthesizedLambdaExpressionOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new ParenthesizedLambdaExpressionStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestLambda()
......@@ -27,8 +27,8 @@ void M()
}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: false));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: false));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -43,7 +43,7 @@ void M()
}
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -60,8 +60,8 @@ void M()
}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: false));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: false));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -78,8 +78,8 @@ void M()
}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: false));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: false));
}
}
}
\ No newline at end of file
src/EditorFeatures/CSharpTest/Outlining/PropertyDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/PropertyDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -7,11 +7,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class PropertyDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<PropertyDeclarationSyntax>
public class PropertyDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<PropertyDeclarationSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new PropertyDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new PropertyDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestProperty()
......@@ -26,8 +26,8 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -45,9 +45,9 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// Foo ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -61,7 +61,7 @@ class C
$$public int Foo => 0;
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "// Foo ...", autoCollapse: true));
}
......@@ -78,8 +78,8 @@ class C
}|}|}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: true));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true));
}
}
}
src/EditorFeatures/CSharpTest/Outlining/RegionDirectiveOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/RegionDirectiveStructureTests.cs
浏览文件 @ 98e2791d
......@@ -7,11 +7,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class RegionDirectiveOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<RegionDirectiveTriviaSyntax>
public class RegionDirectiveStructureTests : AbstractCSharpSyntaxNodeStructureTests<RegionDirectiveTriviaSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new RegionDirectiveOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new RegionDirectiveStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task BrokenRegion()
......@@ -19,7 +19,7 @@ public async Task BrokenRegion()
const string code = @"
$$#region Foo";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -29,7 +29,7 @@ public async Task SimpleRegion()
{|span:$$#region Foo
#endregion|}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "Foo", autoCollapse: true, isDefaultCollapsed: true));
}
......@@ -65,7 +65,7 @@ class Classic
}
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "TaoRegion", autoCollapse: true, isDefaultCollapsed: true));
}
......@@ -83,7 +83,7 @@ static void Main(string[] args)
#endregion|}
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "Region", autoCollapse: true, isDefaultCollapsed: true));
}
......@@ -101,7 +101,7 @@ static void Main(string[] args)
# endregion|}
}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span", "Region", autoCollapse: true, isDefaultCollapsed: true));
}
}
......
src/EditorFeatures/CSharpTest/Outlining/SimpleLambdaExpressionOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/SimpleLambdaExpressionStructureTests.cs
浏览文件 @ 98e2791d
......@@ -7,11 +7,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class SimpleLambdaExpressionOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<SimpleLambdaExpressionSyntax>
public class SimpleLambdaExpressionStructureTests : AbstractCSharpSyntaxNodeStructureTests<SimpleLambdaExpressionSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new SimpleLambdaExpressionOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new SimpleLambdaExpressionStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestLambda()
......@@ -27,8 +27,8 @@ void M()
}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: false));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: false));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -43,7 +43,7 @@ void M()
}
}";
await VerifyNoRegionsAsync(code);
await VerifyNoBlockSpansAsync(code);
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -60,8 +60,8 @@ void M()
}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: false));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: false));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -78,8 +78,8 @@ void M()
}
}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: false));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: false));
}
}
}
src/EditorFeatures/CSharpTest/Outlining/TypeDeclarationOutlinerTests.cs → src/EditorFeatures/CSharpTest/Structure/TypeDeclarationStructureTests.cs
浏览文件 @ 98e2791d
......@@ -7,11 +7,11 @@
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Structure
{
public class TypeDeclarationOutlinerTests : AbstractCSharpSyntaxNodeOutlinerTests<TypeDeclarationSyntax>
public class TypeDeclarationStructureTests : AbstractCSharpSyntaxNodeStructureTests<TypeDeclarationSyntax>
{
internal override AbstractSyntaxStructureProvider CreateOutliner() => new TypeDeclarationOutliner();
internal override AbstractSyntaxStructureProvider CreateProvider() => new TypeDeclarationStructureProvider();
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestClass()
......@@ -21,8 +21,8 @@ public async Task TestClass()
{
}|}|}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: false));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: false));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -35,9 +35,9 @@ public async Task TestClassWithLeadingComments()
{
}|}|}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// Foo ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: false));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: false));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -50,8 +50,8 @@ public async Task TestClassWithNestedComments()
// Bar|}
}|}|}";
await VerifyRegionsAsync(code,
Region("collapse1", "hint1", CSharpOutliningHelpers.Ellipsis, autoCollapse: false),
await VerifyBlockSpansAsync(code,
Region("collapse1", "hint1", CSharpStructureHelpers.Ellipsis, autoCollapse: false),
Region("span2", "// Foo ...", autoCollapse: true));
}
......@@ -63,8 +63,8 @@ public async Task TestInterface()
{
}|}|}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: false));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: false));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -77,9 +77,9 @@ public async Task TestInterfaceWithLeadingComments()
{
}|}|}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// Foo ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: false));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: false));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -92,8 +92,8 @@ public async Task TestInterfaceWithNestedComments()
// Bar|}
}|}|}";
await VerifyRegionsAsync(code,
Region("collapse1", "hint1", CSharpOutliningHelpers.Ellipsis, autoCollapse: false),
await VerifyBlockSpansAsync(code,
Region("collapse1", "hint1", CSharpStructureHelpers.Ellipsis, autoCollapse: false),
Region("span2", "// Foo ...", autoCollapse: true));
}
......@@ -105,8 +105,8 @@ public async Task TestStruct()
{
}|}|}";
await VerifyRegionsAsync(code,
Region("collapse", "hint", CSharpOutliningHelpers.Ellipsis, autoCollapse: false));
await VerifyBlockSpansAsync(code,
Region("collapse", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: false));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -119,9 +119,9 @@ public async Task TestStructWithLeadingComments()
{
}|}|}";
await VerifyRegionsAsync(code,
await VerifyBlockSpansAsync(code,
Region("span1", "// Foo ...", autoCollapse: true),
Region("collapse2", "hint2", CSharpOutliningHelpers.Ellipsis, autoCollapse: false));
Region("collapse2", "hint2", CSharpStructureHelpers.Ellipsis, autoCollapse: false));
}
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
......@@ -134,8 +134,8 @@ public async Task TestStructWithNestedComments()
// Bar|}
}|}|}";
await VerifyRegionsAsync(code,
Region("collapse1", "hint1", CSharpOutliningHelpers.Ellipsis, autoCollapse: false),
await VerifyBlockSpansAsync(code,
Region("collapse1", "hint1", CSharpStructureHelpers.Ellipsis, autoCollapse: false),
Region("span2", "// Foo ...", autoCollapse: true));
}
}
......
src/EditorFeatures/Core/Implementation/Structure/AbstractStructureTaggerProvider.cs
浏览文件 @ 98e2791d
......@@ -86,12 +86,12 @@ protected sealed override ITaggerEventSource CreateEventSource(ITextView textVie
{
try
{
var outliningService = TryGetOutliningService(context, documentSnapshotSpan);
var outliningService = TryGetService(context, documentSnapshotSpan);
if (outliningService != null)
{
var blockStructure = await outliningService.GetBlockStructureAsync(
documentSnapshotSpan.Document, context.CancellationToken).ConfigureAwait(false);
ProcessOutliningSpans(
ProcessSpans(
context, documentSnapshotSpan.SnapshotSpan, outliningService,
blockStructure.Spans);
}
......@@ -110,7 +110,7 @@ protected sealed override ITaggerEventSource CreateEventSource(ITextView textVie
{
try
{
var outliningService = TryGetOutliningService(context, documentSnapshotSpan);
var outliningService = TryGetService(context, documentSnapshotSpan);
if (outliningService != null)
{
var document = documentSnapshotSpan.Document;
......@@ -120,7 +120,7 @@ protected sealed override ITaggerEventSource CreateEventSource(ITextView textVie
// and make a blocking call against the async service.
var blockStructure = outliningService.GetBlockStructure(document, cancellationToken);
ProcessOutliningSpans(
ProcessSpans(
context, documentSnapshotSpan.SnapshotSpan, outliningService,
blockStructure.Spans);
}
......@@ -131,7 +131,7 @@ protected sealed override ITaggerEventSource CreateEventSource(ITextView textVie
}
}
private BlockStructureService TryGetOutliningService(
private BlockStructureService TryGetService(
TaggerContext<TRegionTag> context,
DocumentSnapshotSpan documentSnapshotSpan)
{
......@@ -148,21 +148,21 @@ protected sealed override ITaggerEventSource CreateEventSource(ITextView textVie
return null;
}
private void ProcessOutliningSpans(
private void ProcessSpans(
TaggerContext<TRegionTag> context,
SnapshotSpan snapshotSpan,
BlockStructureService outliningService,
ImmutableArray<BlockSpan> regions)
ImmutableArray<BlockSpan> spans)
{
if (regions != null)
if (spans != null)
{
var snapshot = snapshotSpan.Snapshot;
regions = GetMultiLineRegions(outliningService, regions, snapshot);
spans = GetMultiLineRegions(outliningService, spans, snapshot);
// Create the outlining tags.
var tagSpanStack = new Stack<TagSpan<TRegionTag>>();
foreach (var region in regions)
foreach (var region in spans)
{
var spanToCollapse = new SnapshotSpan(snapshot, region.TextSpan.ToSpan());
......
src/EditorFeatures/Next/EditorFeatures.Next.csproj
浏览文件 @ 98e2791d
......@@ -72,7 +72,7 @@
<Compile Include="IntelliSense\Completion\Presentation\VisualStudio15CompletionSet.cs" />
<Compile Include="Structure\BlockTag2.cs" />
<Compile Include="Structure\IBlockTag2.cs" />
<Compile Include="Structure\VisualStudio15OutliningTaggerProvider.cs" />
<Compile Include="Structure\VisualStudio15StructureTaggerProvider.cs" />
</ItemGroup>
<ItemGroup />
<Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
......
src/EditorFeatures/Next/Structure/VisualStudio15OutliningTaggerProvider.cs → src/EditorFeatures/Next/Structure/VisualStudio15StructureTaggerProvider.cs
浏览文件 @ 98e2791d
......@@ -16,14 +16,14 @@
namespace Microsoft.CodeAnalysis.Editor.Structure
{
[Export(typeof(ITaggerProvider))]
[Export(typeof(VisualStudio15OutliningTaggerProvider))]
[Export(typeof(VisualStudio15StructureTaggerProvider))]
[TagType(typeof(IBlockTag2))]
[ContentType(ContentTypeNames.RoslynContentType)]
internal partial class VisualStudio15OutliningTaggerProvider :
internal partial class VisualStudio15StructureTaggerProvider :
AbstractStructureTaggerProvider<IBlockTag2>
{
[ImportingConstructor]
public VisualStudio15OutliningTaggerProvider(
public VisualStudio15StructureTaggerProvider(
IForegroundNotificationService notificationService,
ITextEditorFactoryService textEditorFactoryService,
IEditorOptionsFactoryService editorOptionsFactoryService,
......
src/EditorFeatures/Test/EditorServicesTest.csproj
浏览文件 @ 98e2791d
......@@ -218,10 +218,10 @@
<Compile Include="Extensions\WorkspaceExtensions.cs" />
<Compile Include="GoToAdjacentMember\AbstractGoToAdjacentMemberTests.cs" />
<Compile Include="MoveType\AbstractMoveTypeTest.cs" />
<Compile Include="Outlining\AbstractSyntaxNodeOutlinerTests.cs" />
<Compile Include="Outlining\AbstractSyntaxOutlinerTests.cs" />
<Compile Include="Outlining\AbstractSyntaxTriviaOutlinerTests.cs" />
<Compile Include="Outlining\OutliningServiceTests.cs" />
<Compile Include="Structure\AbstractSyntaxNodeStructureProviderTests.cs" />
<Compile Include="Structure\AbstractSyntaxStructureProviderTests.cs" />
<Compile Include="Structure\AbstractSyntaxTriviaStructureProviderTests.cs" />
<Compile Include="Structure\BlockStructureServiceTests.cs" />
<Compile Include="Preview\MockPreviewPaneService.cs" />
<Compile Include="Preview\TestOnly_CompilerDiagnosticAnalyzerProviderService.cs" />
<Compile Include="DocCommentFormatting\DocCommentFormattingTests.cs" />
......@@ -269,8 +269,8 @@
<Compile Include="MinimalTestExportProvider.cs" />
<Compile Include="NavigateTo\NavigateToTestAggregator.Callback.cs" />
<Compile Include="NavigateTo\NavigateToTestAggregator.cs" />
<Compile Include="Outlining\OutliningSpanTests.cs" />
<Compile Include="Outlining\OutliningTaggerTests.cs" />
<Compile Include="Structure\BlockSpanTests.cs" />
<Compile Include="Structure\StructureTaggerTests.cs" />
<Compile Include="Preview\PreviewWorkspaceTests.cs" />
<Compile Include="QuickInfo\AbstractQuickInfoSourceTests.cs" />
<Compile Include="QuickInfo\AbstractSemanticQuickInfoSourceTests.cs" />
......@@ -339,4 +339,4 @@
<ItemGroup />
<Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
<Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
</Project>
</Project>
\ No newline at end of file
src/EditorFeatures/Test/Outlining/AbstractSyntaxNodeOutlinerTests.cs → src/EditorFeatures/Test/Structure/AbstractSyntaxNodeStructureProviderTests.cs
浏览文件 @ 98e2791d
......@@ -8,14 +8,14 @@
using Roslyn.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.UnitTests.Structure
{
public abstract class AbstractSyntaxNodeOutlinerTests<TSyntaxNode> : AbstractSyntaxOutlinerTests
public abstract class AbstractSyntaxNodeStructureProviderTests<TSyntaxNode> : AbstractSyntaxStructureProviderTests
where TSyntaxNode : SyntaxNode
{
internal abstract AbstractSyntaxStructureProvider CreateOutliner();
internal abstract AbstractSyntaxStructureProvider CreateProvider();
internal sealed override async Task<BlockSpan[]> GetRegionsAsync(Document document, int position)
internal sealed override async Task<BlockSpan[]> GetBlockSpansAsync(Document document, int position)
{
var root = await document.GetSyntaxRootAsync(CancellationToken.None);
var token = root.FindToken(position, findInsideTrivia: true);
......@@ -36,7 +36,7 @@ internal sealed override async Task<BlockSpan[]> GetRegionsAsync(Document docume
}
}
var outliner = CreateOutliner();
var outliner = CreateProvider();
var actualRegions = ImmutableArray.CreateBuilder<BlockSpan>();
outliner.CollectBlockSpans(document, node, actualRegions, CancellationToken.None);
......
src/EditorFeatures/Test/Outlining/AbstractSyntaxOutlinerTests.cs → src/EditorFeatures/Test/Structure/AbstractSyntaxStructureProviderTests.cs
浏览文件 @ 98e2791d
......@@ -9,17 +9,17 @@
using Microsoft.CodeAnalysis.Text;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.UnitTests.Structure
{
public abstract class AbstractSyntaxOutlinerTests
public abstract class AbstractSyntaxStructureProviderTests
{
protected abstract string LanguageName { get; }
protected virtual string WorkspaceKind => TestWorkspace.WorkspaceName;
internal abstract Task<BlockSpan[]> GetRegionsAsync(Document document, int position);
internal abstract Task<BlockSpan[]> GetBlockSpansAsync(Document document, int position);
protected async Task VerifyRegionsAsync(string markupCode, params Tuple<string, string, string, bool, bool>[] expectedRegionData)
protected async Task VerifyBlockSpansAsync(string markupCode, params Tuple<string, string, string, bool, bool>[] expectedRegionData)
{
using (var workspace = await TestWorkspace.CreateAsync(WorkspaceKind, LanguageName, compilationOptions: null, parseOptions: null, content: markupCode))
{
......@@ -27,10 +27,10 @@ protected async Task VerifyRegionsAsync(string markupCode, params Tuple<string,
Assert.True(hostDocument.CursorPosition.HasValue, "Test must specify a position.");
var position = hostDocument.CursorPosition.Value;
var expectedRegions = expectedRegionData.Select(data => CreateOutliningSpan(data, hostDocument.AnnotatedSpans)).ToArray();
var expectedRegions = expectedRegionData.Select(data => CreateBlockSpan(data, hostDocument.AnnotatedSpans)).ToArray();
var document = workspace.CurrentSolution.GetDocument(hostDocument.Id);
var actualRegions = await GetRegionsAsync(document, position);
var actualRegions = await GetBlockSpansAsync(document, position);
Assert.True(expectedRegions.Length == actualRegions.Length, $"Expected {expectedRegions.Length} regions but there were {actualRegions.Length}");
......@@ -41,7 +41,7 @@ protected async Task VerifyRegionsAsync(string markupCode, params Tuple<string,
}
}
protected async Task VerifyNoRegionsAsync(string markupCode)
protected async Task VerifyNoBlockSpansAsync(string markupCode)
{
using (var workspace = await TestWorkspace.CreateAsync(WorkspaceKind, LanguageName, compilationOptions: null, parseOptions: null, content: markupCode))
{
......@@ -50,7 +50,7 @@ protected async Task VerifyNoRegionsAsync(string markupCode)
var position = hostDocument.CursorPosition.Value;
var document = workspace.CurrentSolution.GetDocument(hostDocument.Id);
var actualRegions = await GetRegionsAsync(document, position);
var actualRegions = await GetBlockSpansAsync(document, position);
Assert.True(actualRegions.Length == 0, $"Expected no regions but found {actualRegions.Length}.");
}
......@@ -66,7 +66,7 @@ protected async Task VerifyNoRegionsAsync(string markupCode)
return Tuple.Create(collapseSpanName, collapseSpanName, bannerText, autoCollapse, isDefaultCollapsed);
}
private static BlockSpan CreateOutliningSpan(Tuple<string, string, string, bool, bool> regionData, IDictionary<string, IList<TextSpan>> spans)
private static BlockSpan CreateBlockSpan(Tuple<string, string, string, bool, bool> regionData, IDictionary<string, IList<TextSpan>> spans)
{
var collapseSpanName = regionData.Item1;
var hintSpanName = regionData.Item2;
......
src/EditorFeatures/Test/Outlining/AbstractSyntaxTriviaOutlinerTests.cs → src/EditorFeatures/Test/Structure/AbstractSyntaxTriviaStructureProviderTests.cs
浏览文件 @ 98e2791d
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Editor.Implementation.Structure;
using Microsoft.CodeAnalysis.Structure;
using Roslyn.Utilities;
namespace Microsoft.CodeAnalysis.Editor.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.UnitTests.Structure
{
public abstract class AbstractSyntaxTriviaOutlinerTests : AbstractSyntaxOutlinerTests
public abstract class AbstractSyntaxTriviaStructureProviderTests : AbstractSyntaxStructureProviderTests
{
internal abstract AbstractSyntaxStructureProvider CreateOutliner();
internal abstract AbstractSyntaxStructureProvider CreateProvider();
internal sealed override async Task<BlockSpan[]> GetRegionsAsync(Document document, int position)
internal sealed override async Task<BlockSpan[]> GetBlockSpansAsync(Document document, int position)
{
var root = await document.GetSyntaxRootAsync(CancellationToken.None);
var trivia = root.FindTrivia(position, findInsideTrivia: true);
var outliner = CreateOutliner();
var outliner = CreateProvider();
var actualRegions = ImmutableArray.CreateBuilder<BlockSpan>();
outliner.CollectBlockSpans(document, trivia, actualRegions, CancellationToken.None);
......
src/EditorFeatures/Test/Outlining/OutliningSpanTests.cs → src/EditorFeatures/Test/Structure/BlockSpanTests.cs
浏览文件 @ 98e2791d
......@@ -4,9 +4,9 @@
using Microsoft.CodeAnalysis.Text;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.UnitTests.Structure
{
public class OutliningSpanTests
public class BlockSpanTests
{
[Fact]
public void TestProperties()
......
src/EditorFeatures/Test/Outlining/OutliningServiceTests.cs → src/EditorFeatures/Test/Structure/BlockStructureServiceTests.cs
浏览文件 @ 98e2791d
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Editor.Implementation.Structure;
using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
using Microsoft.CodeAnalysis.Structure;
using Roslyn.Test.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.UnitTests.Structure
{
public class OutliningServiceTests
public class BlockStructureServiceTests
{
[Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task TestSimpleLambda()
......
src/EditorFeatures/Test/Outlining/OutliningTaggerTests.cs → src/EditorFeatures/Test/Structure/StructureTaggerTests.cs
浏览文件 @ 98e2791d
......@@ -15,9 +15,9 @@
using Roslyn.Utilities;
using Xunit;
namespace Microsoft.CodeAnalysis.Editor.UnitTests.Outlining
namespace Microsoft.CodeAnalysis.Editor.UnitTests.Structure
{
public class OutliningTaggerTests
public class StructureTaggerTests
{
[WpfFact, Trait(Traits.Feature, Traits.Features.Outlining)]
public async Task CSharpOutliningTagger()
......
src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj
浏览文件 @ 98e2791d
......@@ -256,7 +256,6 @@
<Compile Include="Formatting\Indentation\SmartIndentProviderTests.vb" />
<Compile Include="Formatting\Indentation\SmartTokenFormatter_FormatTokenTests.vb" />
<Compile Include="Formatting\XmlLiterals.Designer.vb" />
<Compile Include="Outlining\AbstractVisualBasicSyntaxTriviaOutlinerTests.vb" />
<Compile Include="GoToAdjacentMember\VisualBasicGoToAdjacentMemberTests.vb" />
<Compile Include="KeywordHighlighting\AbstractVisualBasicKeywordHighlighterTests.vb" />
<Compile Include="KeywordHighlighting\AccessorDeclarationHighlighterTests.vb" />
......@@ -299,39 +298,6 @@
<Compile Include="Organizing\OrganizeImportsTests.vb" />
<Compile Include="Organizing\OrganizeModifiersTests.vb" />
<Compile Include="Organizing\OrganizeTypeDeclarationTests.vb" />
<Compile Include="Outlining\AbstractVisualBasicSyntaxNodeOutlinerTests.vb" />
<Compile Include="Outlining\AccessorDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\CommentTests.vb" />
<Compile Include="Outlining\CompilationUnitOutlinerTests.vb" />
<Compile Include="Outlining\ConstructorDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\DelegateDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\DisabledCodeOutlinerTests.vb" />
<Compile Include="Outlining\DocumentationCommentOutlinerTests.vb" />
<Compile Include="Outlining\EnumDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\EventDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\ExternalMethodDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\FieldDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\MetadataAsSource\ConstructorDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\MetadataAsSource\DelegateDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\MetadataAsSource\EnumDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\MetadataAsSource\EnumMemberDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\MetadataAsSource\EventDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\MetadataAsSource\FieldDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\MetadataAsSource\InvalidIdentifierTests.vb" />
<Compile Include="Outlining\MetadataAsSource\MethodDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\MetadataAsSource\OperatorDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\MetadataAsSource\PropertyDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\MetadataAsSource\RegionDirectiveOutlinerTests.vb" />
<Compile Include="Outlining\MetadataAsSource\TypeDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\MethodDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\MultilineLambdaOutlinerTests.vb" />
<Compile Include="Outlining\NamespaceDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\OperatorDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\OverallOutliningTests.vb" />
<Compile Include="Outlining\PropertyDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\RegionDirectiveOutlinerTests.vb" />
<Compile Include="Outlining\TypeDeclarationOutlinerTests.vb" />
<Compile Include="Outlining\XmlExpressionOutlinerTests.vb" />
<Compile Include="PopulateSwitch\PopulateSwitchTests.vb" />
<Compile Include="PopulateSwitch\PopulateSwitchTests_FixAllTests.vb" />
<Compile Include="QuickInfo\SemanticQuickInfoSourceTests.vb" />
......@@ -486,6 +452,40 @@
<Compile Include="SignatureHelp\PredefinedCastExpressionSignatureHelpProviderTests.vb" />
<Compile Include="SignatureHelp\RaiseEventStatementSignatureHelpProviderTests.vb" />
<Compile Include="Squiggles\ErrorSquiggleProducerTests.vb" />
<Compile Include="Structure\AbstractVisualBasicSyntaxNodeStructureTests.vb" />
<Compile Include="Structure\AbstractVisualBasicSyntaxTriviaStructureTests.vb" />
<Compile Include="Structure\AccessorDeclarationStructureTests.vb" />
<Compile Include="Structure\CommentStructureTests.vb" />
<Compile Include="Structure\CompilationUnitStructureTests.vb" />
<Compile Include="Structure\ConstructorDeclarationStructureTests.vb" />
<Compile Include="Structure\DelegateDeclarationStructureTests.vb" />
<Compile Include="Structure\DisabledCodeStructureTests.vb" />
<Compile Include="Structure\DocumentationCommentStructureTests.vb" />
<Compile Include="Structure\EnumDeclarationStructureTests.vb" />
<Compile Include="Structure\EventDeclarationStructureTests.vb" />
<Compile Include="Structure\ExternalMethodDeclarationStructureTests.vb" />
<Compile Include="Structure\FieldDeclarationStructureTests.vb" />
<Compile Include="Structure\MetadataAsSource\ConstructorDeclarationStructureTests.vb" />
<Compile Include="Structure\MetadataAsSource\DelegateDeclarationStructureTests.vb" />
<Compile Include="Structure\MetadataAsSource\EnumDeclarationStructureTests.vb" />
<Compile Include="Structure\MetadataAsSource\EnumMemberDeclarationStructureTests.vb" />
<Compile Include="Structure\MetadataAsSource\EventDeclarationStructureTests.vb" />
<Compile Include="Structure\MetadataAsSource\FieldDeclarationStructureTests.vb" />
<Compile Include="Structure\MetadataAsSource\InvalidIdentifierStructureTests.vb" />
<Compile Include="Structure\MetadataAsSource\MethodDeclarationStructureTests.vb" />
<Compile Include="Structure\MetadataAsSource\OperatorDeclarationStructureTests.vb" />
<Compile Include="Structure\MetadataAsSource\PropertyDeclarationStructureTests.vb" />
<Compile Include="Structure\MetadataAsSource\RegionDirectiveStructureTests.vb" />
<Compile Include="Structure\MetadataAsSource\TypeDeclarationStructureTests.vb" />
<Compile Include="Structure\MethodDeclarationStructureTests.vb" />
<Compile Include="Structure\MultilineLambdaStructureTests.vb" />
<Compile Include="Structure\NamespaceDeclarationStructureTests.vb" />
<Compile Include="Structure\OperatorDeclarationStructureTests.vb" />
<Compile Include="Structure\OverallStructureTests.vb" />
<Compile Include="Structure\PropertyDeclarationStructureTests.vb" />
<Compile Include="Structure\RegionDirectiveStructureTests.vb" />
<Compile Include="Structure\TypeDeclarationStructureTests.vb" />
<Compile Include="Structure\XmlExpressionStructureTests.vb" />
<Compile Include="SymbolId\SymbolKeyCompilationsTests.vb" />
<Compile Include="SymbolId\SymbolKeyMetadataVsSourceTests.vb" />
<Compile Include="SymbolId\SymbolKeyTestBase.vb" />
......@@ -614,4 +614,4 @@
</ItemGroup>
<Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
<Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
</Project>
</Project>
\ No newline at end of file
src/EditorFeatures/VisualBasicTest/Outlining/AbstractVisualBasicSyntaxNodeOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/AbstractVisualBasicSyntaxNodeStructureTests.vb
浏览文件 @ 98e2791d
' 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 Microsoft.CodeAnalysis.Editor.UnitTests.Outlining
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Structure
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public MustInherit Class AbstractVisualBasicSyntaxNodeOutlinerTests(Of TSyntaxNode As SyntaxNode)
Inherits AbstractSyntaxNodeOutlinerTests(Of TSyntaxNode)
Public MustInherit Class AbstractVisualBasicSyntaxNodeStructureProviderTests(Of TSyntaxNode As SyntaxNode)
Inherits AbstractSyntaxNodeStructureProviderTests(Of TSyntaxNode)
Protected NotOverridable Overrides ReadOnly Property LanguageName As String
Get
......
src/EditorFeatures/VisualBasicTest/Outlining/AbstractVisualBasicSyntaxTriviaOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/AbstractVisualBasicSyntaxTriviaStructureTests.vb
浏览文件 @ 98e2791d
' 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 Microsoft.CodeAnalysis.Editor.UnitTests.Outlining
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Structure
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public MustInherit Class AbstractVisualBasicSyntaxTriviaOutlinerTests
Inherits AbstractSyntaxTriviaOutlinerTests
Public MustInherit Class AbstractVisualBasicSyntaxTriviaStructureProviderTests
Inherits AbstractSyntaxTriviaStructureProviderTests
Protected NotOverridable Overrides ReadOnly Property LanguageName As String
Get
......
src/EditorFeatures/VisualBasicTest/Outlining/AccessorDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/AccessorDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -5,11 +5,11 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public Class AccessorDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of AccessorStatementSyntax)
Public Class AccessorDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of AccessorStatementSyntax)
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New AccessorDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New AccessorDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
......@@ -24,7 +24,7 @@ Class C1
EndClass
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Get ...", autoCollapse:=True))
End Function
......@@ -42,7 +42,7 @@ Class C1
EndClass
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "' My ...", autoCollapse:=True),
Region("span2", "Get ...", autoCollapse:=True))
End Function
......@@ -61,7 +61,7 @@ Class C1
EndClass
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Get ...", autoCollapse:=True))
End Function
......@@ -81,7 +81,7 @@ Class C1
EndClass
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "' My ...", autoCollapse:=True),
Region("span2", "Get ...", autoCollapse:=True))
End Function
......@@ -98,7 +98,7 @@ Class C1
EndClass
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Set(ByVal value As Integer) ...", autoCollapse:=True))
End Function
......@@ -116,7 +116,7 @@ Class C1
EndClass
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "' My ...", autoCollapse:=True),
Region("span2", "Set(ByVal value As Integer) ...", autoCollapse:=True))
End Function
......@@ -135,7 +135,7 @@ Class C1
EndClass
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Set(value As Integer) ...", autoCollapse:=True))
End Function
......@@ -153,7 +153,7 @@ Class C1
EndClass
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Private Set(value As Integer) ...", autoCollapse:=True))
End Function
......@@ -173,7 +173,7 @@ Class C1
EndClass
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "' My ...", autoCollapse:=True),
Region("span2", "Private Set(value As Integer) ...", autoCollapse:=True))
End Function
......@@ -193,7 +193,7 @@ Class C1
EndClass
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "AddHandler(ByVal value As EventHandler) ...", autoCollapse:=True))
End Function
......@@ -214,7 +214,7 @@ Class C1
EndClass
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "' My ...", autoCollapse:=True),
Region("span2", "AddHandler(ByVal value As EventHandler) ...", autoCollapse:=True))
End Function
......@@ -234,7 +234,7 @@ Class C1
EndClass
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "RemoveHandler(ByVal value As EventHandler) ...", autoCollapse:=True))
End Function
......@@ -255,7 +255,7 @@ Class C1
EndClass
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "' My ...", autoCollapse:=True),
Region("span2", "RemoveHandler(ByVal value As EventHandler) ...", autoCollapse:=True))
End Function
......@@ -275,7 +275,7 @@ Class C1
EndClass
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "RaiseEvent(ByVal sender As Object, ByVal e As EventArgs) ...", autoCollapse:=True))
End Function
......@@ -296,7 +296,7 @@ Class C1
EndClass
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "' My ...", autoCollapse:=True),
Region("span2", "RaiseEvent(ByVal sender As Object, ByVal e As EventArgs) ...", autoCollapse:=True))
End Function
......
src/EditorFeatures/VisualBasicTest/Outlining/CommentTests.vb → src/EditorFeatures/VisualBasicTest/Structure/CommentStructureTests.vb
浏览文件 @ 98e2791d
' 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 Microsoft.CodeAnalysis.Editor.UnitTests.Outlining
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Structure
Imports Microsoft.CodeAnalysis.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public Class CommentTests
Inherits AbstractSyntaxOutlinerTests
Inherits AbstractSyntaxStructureProviderTests
Protected Overrides ReadOnly Property LanguageName As String
Get
......@@ -14,7 +14,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
End Get
End Property
Friend Overrides Async Function GetRegionsAsync(document As Document, position As Integer) As Task(Of BlockSpan())
Friend Overrides Async Function GetBlockSpansAsync(document As Document, position As Integer) As Task(Of BlockSpan())
Dim root = Await document.GetSyntaxRootAsync()
Dim trivia = root.FindTrivia(position, findInsideTrivia:=True)
......@@ -38,7 +38,7 @@ Class C1
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "' Hello ...", autoCollapse:=True))
End Function
......@@ -52,7 +52,7 @@ Class C1
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "' Hello ...", autoCollapse:=True))
End Function
......@@ -66,7 +66,7 @@ Class C1
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "' Hello ...", autoCollapse:=True))
End Function
......@@ -81,7 +81,7 @@ Class C1
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "' Hello ...", autoCollapse:=True))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/CompilationUnitOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/CompilationUnitStructureTests.vb
浏览文件 @ 98e2791d
......@@ -6,11 +6,11 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public Class CompilationUnitOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of CompilationUnitSyntax)
Public Class CompilationUnitStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of CompilationUnitSyntax)
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New CompilationUnitOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New CompilationUnitStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
......@@ -21,7 +21,7 @@ Imports System.Linq|}
Class C1
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Imports ...", autoCollapse:=True))
End Function
......@@ -33,7 +33,7 @@ Imports linq = System.Linq|}
Class C1
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Imports ...", autoCollapse:=True))
End Function
......@@ -49,7 +49,7 @@ End Class
'Of
'File|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "' Top ...", autoCollapse:=True),
Region("span2", "' Bottom ...", autoCollapse:=True))
End Function
......@@ -66,7 +66,7 @@ Imports System.Linq|}
'Of
'File|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "' Top ...", autoCollapse:=True),
Region("span2", "Imports ...", autoCollapse:=True),
Region("span3", "' Bottom ...", autoCollapse:=True))
......
src/EditorFeatures/VisualBasicTest/Outlining/ConstructorDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/ConstructorDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -5,11 +5,11 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public Class ConstructorDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of SubNewStatementSyntax)
Public Class ConstructorDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of SubNewStatementSyntax)
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New ConstructorDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New ConstructorDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
......@@ -20,7 +20,7 @@ Class C1
End Sub|}
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Sub New() ...", autoCollapse:=True))
End Function
......@@ -32,7 +32,7 @@ Class C1
End Sub|}
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Sub New() ...", autoCollapse:=True))
End Function
......@@ -44,7 +44,7 @@ Class C1
End Sub|} ' .ctor
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Sub New() ...", autoCollapse:=True))
End Function
......@@ -56,7 +56,7 @@ Class C1
End Sub|}
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Private Sub New() ...", autoCollapse:=True))
End Function
......@@ -70,7 +70,7 @@ Class C1
End Sub|}
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "' My ...", autoCollapse:=True),
Region("span2", "Sub New() ...", autoCollapse:=True))
End Function
......
src/EditorFeatures/VisualBasicTest/Outlining/DelegateDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/DelegateDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -5,11 +5,11 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public Class DelegateDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of DelegateStatementSyntax)
Public Class DelegateDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of DelegateStatementSyntax)
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New DelegateDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New DelegateDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
......@@ -19,7 +19,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
'World|}
Delegate Sub $$Foo()
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "' Hello ...", autoCollapse:=True))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/DisabledCodeOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/DisabledCodeStructureTests.vb
浏览文件 @ 98e2791d
......@@ -4,11 +4,11 @@ Imports Microsoft.CodeAnalysis.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public Class DisabledCodeOutlinerTests
Inherits AbstractVisualBasicSyntaxTriviaOutlinerTests
Public Class DisabledCodeStructureProviderTests
Inherits AbstractVisualBasicSyntaxTriviaStructureProviderTests
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New DisabledTextTriviaOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New DisabledTextTriviaStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
......@@ -20,7 +20,7 @@ Blah
Blah|}
#End If
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
......@@ -34,7 +34,7 @@ Blah
Blah|}
#End If
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
......@@ -48,7 +48,7 @@ Blah
Blah|}
#End If
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/DocumentationCommentOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/DocumentationCommentStructureTests.vb
浏览文件 @ 98e2791d
......@@ -5,11 +5,11 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public Class DocumentationCommentOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of DocumentationCommentTriviaSyntax)
Public Class DocumentationCommentStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of DocumentationCommentTriviaSyntax)
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New DocumentationCommentOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New DocumentationCommentStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
......@@ -23,7 +23,7 @@ Class C1
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "''' XML doc comment ...", autoCollapse:=True))
End Function
......@@ -35,7 +35,7 @@ Class C1
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "''' <param name=""syntaxTree""></param> ...", autoCollapse:=True))
End Function
......@@ -49,7 +49,7 @@ Class C1
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "''' <summary> Hello VB!", autoCollapse:=True))
End Function
......@@ -63,7 +63,7 @@ Class C1
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "''' <summary> " & New String("x"c, 106) & " ...", autoCollapse:=True))
End Function
......@@ -77,7 +77,7 @@ End Class
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "''' <summary> Hello VB!", autoCollapse:=True))
End Function
......@@ -89,7 +89,7 @@ Class C1
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "''' <summary> Hello VB!", autoCollapse:=True))
End Function
......@@ -101,7 +101,7 @@ End Class
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "''' <summary> Hello VB!", autoCollapse:=True))
End Function
......@@ -116,7 +116,7 @@ Class C1
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "''' <summary> Hello VB!", autoCollapse:=True))
End Function
......@@ -132,7 +132,7 @@ Class C1
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "''' <summary> Hello VB!", autoCollapse:=True))
End Function
......@@ -150,7 +150,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "''' <summary> Summary with SeeClass , SeeAlsoClass , Nothing , T , t , and not-supported .", autoCollapse:=True))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/EnumDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/EnumDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -5,11 +5,11 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public Class EnumDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of EnumStatementSyntax)
Public Class EnumDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of EnumStatementSyntax)
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New EnumDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New EnumDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
......@@ -19,7 +19,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
End Enum|} ' Foo
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Enum E1 ...", autoCollapse:=True))
End Function
......@@ -32,7 +32,7 @@ End Enum|} ' Foo
End Enum|} ' Foo
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "' Hello ...", autoCollapse:=True),
Region("span2", "Enum E1 ...", autoCollapse:=True))
End Function
......@@ -46,7 +46,7 @@ End Enum|} ' Foo
End Enum|} ' Foo
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "Enum E1 ...", autoCollapse:=True),
Region("span2", "' Hello ...", autoCollapse:=True))
End Function
......
src/EditorFeatures/VisualBasicTest/Outlining/EventDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/EventDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -5,11 +5,11 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public Class EventDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of EventStatementSyntax)
Public Class EventDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of EventStatementSyntax)
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New EventDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New EventDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
......@@ -20,7 +20,7 @@ Class C1
End Class
"
Await VerifyNoRegionsAsync(code)
Await VerifyNoBlockSpansAsync(code)
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
......@@ -33,7 +33,7 @@ Class C1
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "' My ...", autoCollapse:=True))
End Function
......@@ -52,7 +52,7 @@ Class C1
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Custom Event eventName As EventHandler ...", autoCollapse:=True))
End Function
......@@ -71,7 +71,7 @@ Class C1
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Private Custom Event eventName As EventHandler ...", autoCollapse:=True))
End Function
......@@ -92,7 +92,7 @@ Class C1
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "' My ...", autoCollapse:=True),
Region("span2", "Custom Event eventName As EventHandler ...", autoCollapse:=True))
End Function
......
src/EditorFeatures/VisualBasicTest/Outlining/ExternalMethodDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/ExternalMethodDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -5,11 +5,11 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public Class ExternalMethodDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of DeclareStatementSyntax)
Public Class ExternalMethodDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of DeclareStatementSyntax)
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New ExternalMethodDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New ExternalMethodDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
......@@ -22,7 +22,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "' Hello ...", autoCollapse:=True))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/FieldDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/FieldDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -5,11 +5,11 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public Class FieldDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of FieldDeclarationSyntax)
Public Class FieldDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of FieldDeclarationSyntax)
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New FieldDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New FieldDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
......@@ -22,7 +22,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "' Hello ...", autoCollapse:=True))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/MetadataAsSource/ConstructorDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/MetadataAsSource/ConstructorDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -2,12 +2,12 @@
Imports Microsoft.CodeAnalysis.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports MaSOutliners = Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.MetadataAsSource
Public Class ConstructorDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of SubNewStatementSyntax)
Public Class ConstructorDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of SubNewStatementSyntax)
Protected Overrides ReadOnly Property WorkspaceKind As String
Get
......@@ -15,8 +15,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.Metadata
End Get
End Property
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New MaSOutliners.ConstructorDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New MetadataConstructorDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)>
......@@ -28,7 +28,7 @@ Class C
End Class
"
Await VerifyNoRegionsAsync(code)
Await VerifyNoBlockSpansAsync(code)
End Function
......@@ -43,7 +43,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
......@@ -59,7 +59,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
......@@ -75,7 +75,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/MetadataAsSource/DelegateDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/MetadataAsSource/DelegateDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -2,12 +2,12 @@
Imports Microsoft.CodeAnalysis.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports MaSOutliners = Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.MetadataAsSource
Public Class DelegateDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of DelegateStatementSyntax)
Public Class DelegateDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of DelegateStatementSyntax)
Protected Overrides ReadOnly Property WorkspaceKind As String
Get
......@@ -15,8 +15,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.Metadata
End Get
End Property
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New MaSOutliners.DelegateDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New MetadataDelegateDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)>
......@@ -25,7 +25,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.Metadata
Delegate Sub $$Bar()
"
Await VerifyNoRegionsAsync(code)
Await VerifyNoBlockSpansAsync(code)
End Function
Public Delegate Sub Bar(x As Int16)
......@@ -37,7 +37,7 @@ Delegate Sub $$Bar()
|}Delegate Sub $$Bar()|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
......@@ -50,7 +50,7 @@ Delegate Sub $$Bar()
|}Delegate Sub $$Bar()|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
......@@ -63,7 +63,7 @@ Delegate Sub $$Bar()
|}Public Delegate Sub $$Bar()|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/MetadataAsSource/EnumDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/MetadataAsSource/EnumDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -2,12 +2,12 @@
Imports Microsoft.CodeAnalysis.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports MaSOutliners = Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.MetadataAsSource
Public Class EnumDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of EnumStatementSyntax)
Public Class EnumDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of EnumStatementSyntax)
Protected Overrides ReadOnly Property WorkspaceKind As String
Get
......@@ -15,8 +15,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.Metadata
End Get
End Property
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New MaSOutliners.EnumDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New MetadataEnumDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)>
......@@ -28,7 +28,7 @@ Enum $$Foo
End Enum
"
Await VerifyNoRegionsAsync(code)
Await VerifyNoBlockSpansAsync(code)
End Function
<Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)>
......@@ -41,7 +41,7 @@ End Enum
End Enum
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
......@@ -57,7 +57,7 @@ End Enum
End Enum
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
......@@ -73,7 +73,7 @@ End Enum
End Enum
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/MetadataAsSource/EnumMemberDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/MetadataAsSource/EnumMemberDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -2,12 +2,12 @@
Imports Microsoft.CodeAnalysis.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports MaSOutliners = Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.MetadataAsSource
Public Class EnumMemberDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of EnumMemberDeclarationSyntax)
Public Class EnumMemberDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of EnumMemberDeclarationSyntax)
Protected Overrides ReadOnly Property WorkspaceKind As String
Get
......@@ -15,8 +15,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.Metadata
End Get
End Property
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New MaSOutliners.EnumMemberDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New MetadataEnumMemberDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)>
......@@ -28,7 +28,7 @@ Enum E
End Enum
"
Await VerifyNoRegionsAsync(code)
Await VerifyNoBlockSpansAsync(code)
End Function
<Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)>
......@@ -41,7 +41,7 @@ Enum E
End Enum
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
......@@ -57,7 +57,7 @@ Enum E
End Enum
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/MetadataAsSource/EventDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/MetadataAsSource/EventDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -2,12 +2,12 @@
Imports Microsoft.CodeAnalysis.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports MaSOutliners = Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.MetadataAsSource
Public Class EventDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of EventStatementSyntax)
Public Class EventDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of EventStatementSyntax)
Protected Overrides ReadOnly Property WorkspaceKind As String
Get
......@@ -15,8 +15,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.Metadata
End Get
End Property
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New MaSOutliners.EventDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New MetadataEventDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)>
......@@ -27,7 +27,7 @@ Class C
End Class
"
Await VerifyNoRegionsAsync(code)
Await VerifyNoBlockSpansAsync(code)
End Function
<Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)>
......@@ -39,7 +39,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
......@@ -54,7 +54,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
......@@ -69,7 +69,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/MetadataAsSource/FieldDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/MetadataAsSource/FieldDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -2,12 +2,12 @@
Imports Microsoft.CodeAnalysis.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports MaSOutliners = Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.MetadataAsSource
Public Class FieldDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of FieldDeclarationSyntax)
Public Class FieldDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of FieldDeclarationSyntax)
Protected Overrides ReadOnly Property WorkspaceKind As String
Get
......@@ -15,8 +15,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.Metadata
End Get
End Property
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New MaSOutliners.FieldDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New MetadataFieldDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)>
......@@ -27,7 +27,7 @@ Class C
End Class
"
Await VerifyNoRegionsAsync(code)
Await VerifyNoBlockSpansAsync(code)
End Function
<Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)>
......@@ -39,7 +39,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
......@@ -54,7 +54,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/MetadataAsSource/InvalidIdentifierTests.vb → src/EditorFeatures/VisualBasicTest/Structure/MetadataAsSource/InvalidIdentifierStructureTests.vb
浏览文件 @ 98e2791d
' 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.Threading
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Outlining
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Structure
Imports Microsoft.CodeAnalysis.Structure
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.MetadataAsSource
......@@ -10,7 +10,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.Metadata
''' IL identifiers, we have to account for the possibility that an item's metadata name could lead to unparseable code.
''' </summary>
Public Class InvalidIdentifierTests
Inherits AbstractSyntaxOutlinerTests
Inherits AbstractSyntaxStructureProviderTests
Protected Overrides ReadOnly Property LanguageName As String
Get
......@@ -24,7 +24,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.Metadata
End Get
End Property
Friend Overrides Async Function GetRegionsAsync(document As Document, position As Integer) As Task(Of BlockSpan())
Friend Overrides Async Function GetBlockSpansAsync(document As Document, position As Integer) As Task(Of BlockSpan())
Dim outliningService = document.Project.LanguageServices.GetService(Of BlockStructureService)()
Return (Await outliningService.GetBlockStructureAsync(document, CancellationToken.None)) _
......@@ -41,7 +41,7 @@ $$Class C
Public Sub $Invoke()
End Class
"
Await VerifyNoRegionsAsync(code)
Await VerifyNoBlockSpansAsync(code)
End Function
<WorkItem(1174405, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1174405")>
......@@ -52,7 +52,7 @@ $$Class C
Public Sub !#$%^&*(()_-+=|\}]{[""':;?/>.<,~`()
End Class
"
Await VerifyNoRegionsAsync(code)
Await VerifyNoBlockSpansAsync(code)
End Function
<WorkItem(1174405, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1174405")>
......@@ -63,7 +63,7 @@ $$Class C
Public Sub : End Sub : End Class "" now the document is a string until the next quote ()
End Class
"
Await VerifyNoRegionsAsync(code)
Await VerifyNoBlockSpansAsync(code)
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/MetadataAsSource/MethodDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/MetadataAsSource/MethodDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -2,12 +2,12 @@
Imports Microsoft.CodeAnalysis.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports MaSOutliners = Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.MetadataAsSource
Public Class MethodDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of MethodStatementSyntax)
Public Class MethodDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of MethodStatementSyntax)
Protected Overrides ReadOnly Property WorkspaceKind As String
Get
......@@ -15,8 +15,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.Metadata
End Get
End Property
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New MaSOutliners.MethodDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New MetadataMethodDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)>
......@@ -28,7 +28,7 @@ Class C
End Class
"
Await VerifyNoRegionsAsync(code)
Await VerifyNoBlockSpansAsync(code)
End Function
<Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)>
......@@ -41,7 +41,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
......@@ -57,7 +57,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
......@@ -73,7 +73,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/MetadataAsSource/OperatorDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/MetadataAsSource/OperatorDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -2,12 +2,12 @@
Imports Microsoft.CodeAnalysis.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports MaSOutliners = Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.MetadataAsSource
Public Class OperatorDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of OperatorStatementSyntax)
Public Class OperatorDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of OperatorStatementSyntax)
Protected Overrides ReadOnly Property WorkspaceKind As String
Get
......@@ -15,8 +15,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.Metadata
End Get
End Property
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New MaSOutliners.OperatorDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New MetadataOperatorDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)>
......@@ -27,7 +27,7 @@ Class C
End Class
"
Await VerifyNoRegionsAsync(code)
Await VerifyNoBlockSpansAsync(code)
End Function
<Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)>
......@@ -39,7 +39,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
......@@ -54,7 +54,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
......@@ -69,7 +69,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/MetadataAsSource/PropertyDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/MetadataAsSource/PropertyDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -2,12 +2,12 @@
Imports Microsoft.CodeAnalysis.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports MaSOutliners = Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.MetadataAsSource
Public Class PropertyDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of PropertyStatementSyntax)
Public Class PropertyDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of PropertyStatementSyntax)
Protected Overrides ReadOnly Property WorkspaceKind As String
Get
......@@ -15,8 +15,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.Metadata
End Get
End Property
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New MaSOutliners.PropertyDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New MetadataPropertyDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)>
......@@ -27,7 +27,7 @@ Class C
End Class
"
Await VerifyNoRegionsAsync(code)
Await VerifyNoBlockSpansAsync(code)
End Function
<Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)>
......@@ -39,7 +39,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
......@@ -54,7 +54,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
......@@ -69,7 +69,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/MetadataAsSource/RegionDirectiveOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/MetadataAsSource/RegionDirectiveStructureTests.vb
浏览文件 @ 98e2791d
' 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 Microsoft.CodeAnalysis.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports MaSOutliners = Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.MetadataAsSource
Public Class RegionDirectiveOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of RegionDirectiveTriviaSyntax)
Public Class RegionDirectiveStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of RegionDirectiveTriviaSyntax)
Protected Overrides ReadOnly Property WorkspaceKind As String
Get
......@@ -14,8 +14,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.Metadata
End Get
End Property
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New MaSOutliners.RegionDirectiveOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New MetadataRegionDirectiveStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)>
......@@ -25,7 +25,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.Metadata
' C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\mscorlib.dll
#End Region|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Assembly mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", autoCollapse:=True, isDefaultCollapsed:=False))
End Function
......@@ -36,7 +36,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.Metadata
' C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\mscorlib.dll
#End Region|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "#Region", autoCollapse:=True, isDefaultCollapsed:=False))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/MetadataAsSource/TypeDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/MetadataAsSource/TypeDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -2,12 +2,12 @@
Imports Microsoft.CodeAnalysis.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports MaSOutliners = Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.MetadataAsSource
Public Class TypeDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of TypeStatementSyntax)
Public Class TypeDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of TypeStatementSyntax)
Protected Overrides ReadOnly Property WorkspaceKind As String
Get
......@@ -15,8 +15,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.Metadata
End Get
End Property
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New MaSOutliners.TypeDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New MetadataTypeDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)>
......@@ -26,7 +26,7 @@ Class $$C
End Class
"
Await VerifyNoRegionsAsync(code)
Await VerifyNoBlockSpansAsync(code)
End Function
<Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)>
......@@ -37,7 +37,7 @@ End Class
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
......@@ -51,7 +51,7 @@ End Class
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
......@@ -65,7 +65,7 @@ End Class
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("collapse", "hint", VisualBasicOutliningHelpers.Ellipsis, autoCollapse:=True))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/MethodDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/MethodDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -5,11 +5,11 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public Class MethodDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of MethodStatementSyntax)
Public Class MethodDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of MethodStatementSyntax)
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New MethodDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New MethodDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
......@@ -21,7 +21,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Sub Foo() ...", autoCollapse:=True))
End Function
......@@ -34,7 +34,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Sub Foo(Of T)() ...", autoCollapse:=True))
End Function
......@@ -47,7 +47,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Sub Foo(Of T As Class)() ...", autoCollapse:=True))
End Function
......@@ -60,7 +60,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Sub Foo(Of T As {Class, New})() ...", autoCollapse:=True))
End Function
......@@ -73,7 +73,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Private Sub Foo() ...", autoCollapse:=True))
End Function
......@@ -86,7 +86,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Sub Foo(ByRef i As Integer) ...", autoCollapse:=True))
End Function
......@@ -99,7 +99,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Sub Foo(ByVal i As Integer) ...", autoCollapse:=True))
End Function
......@@ -112,7 +112,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Sub Foo(Optional i As Integer = 1) ...", autoCollapse:=True))
End Function
......@@ -125,7 +125,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Sub Foo() Handles Bar.Baz ...", autoCollapse:=True))
End Function
......@@ -138,7 +138,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Sub Foo() Implements Bar.Baz ...", autoCollapse:=True))
End Function
......@@ -153,7 +153,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "' My ...", autoCollapse:=True),
Region("span2", "Sub Foo() Implements Bar.Baz ...", autoCollapse:=True))
End Function
......@@ -171,7 +171,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Public Function myFunction(myFunc1 As Func(Of System.String, System.String, System.String), myFunc2 As Func(Of System.String, System.String, System.String)) ...", autoCollapse:=True))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/MultilineLambdaOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/MultilineLambdaStructureTests.vb
浏览文件 @ 98e2791d
......@@ -5,11 +5,11 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public Class MultilineLambdaOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of MultiLineLambdaExpressionSyntax)
Public Class MultilineLambdaStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of MultiLineLambdaExpressionSyntax)
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New MultilineLambdaOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New MultilineLambdaStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
......@@ -21,7 +21,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Sub() ...", autoCollapse:=False))
End Function
......@@ -36,7 +36,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Sub() ...", autoCollapse:=False))
End Function
......@@ -49,7 +49,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Function(x As Integer, y As List(Of String)) As Func(Of Integer, Func(Of String, Integer)) ...", autoCollapse:=False))
End Function
......@@ -65,7 +65,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Function(x As Integer, y As List(Of String)) As List(Of List(Of String)) ...", autoCollapse:=False))
End Function
......@@ -81,7 +81,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Function(x) As Integer ...", autoCollapse:=False))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/NamespaceDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/NamespaceDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -5,11 +5,11 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public Class NamespaceDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of NamespaceStatementSyntax)
Public Class NamespaceDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of NamespaceStatementSyntax)
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New NamespaceDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New NamespaceDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
......@@ -19,7 +19,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
End Namespace|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Namespace N1 ...", autoCollapse:=False))
End Function
......@@ -32,7 +32,7 @@ End Namespace|}
End Namespace|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "' My ...", autoCollapse:=True),
Region("span2", "Namespace N1 ...", autoCollapse:=False))
End Function
......@@ -46,7 +46,7 @@ End Namespace|}
End Namespace|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "Namespace N1 ...", autoCollapse:=False),
Region("span2", "' My ...", autoCollapse:=True))
End Function
......
src/EditorFeatures/VisualBasicTest/Outlining/OperatorDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/OperatorDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -5,11 +5,11 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public Class OperatorDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of OperatorStatementSyntax)
Public Class OperatorDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of OperatorStatementSyntax)
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New OperatorDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New OperatorDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
......@@ -21,7 +21,7 @@ Class Base
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Public Shared Widening Operator CType(b As Base) As Integer ...", autoCollapse:=True))
End Function
......@@ -36,7 +36,7 @@ Class Base
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "' Hello ...", autoCollapse:=True),
Region("span2", "Public Shared Widening Operator CType(b As Base) As Integer ...", autoCollapse:=True))
End Function
......
src/EditorFeatures/VisualBasicTest/Outlining/OverallOutliningTests.vb → src/EditorFeatures/VisualBasicTest/Structure/OverallStructureTests.vb
浏览文件 @ 98e2791d
' 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.Threading
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Outlining
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Structure
Imports Microsoft.CodeAnalysis.Structure
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public Class OverallOutliningTests
Inherits AbstractSyntaxOutlinerTests
Public Class OverallStructureTests
Inherits AbstractSyntaxStructureProviderTests
Protected Overrides ReadOnly Property LanguageName As String
Get
......@@ -14,7 +14,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
End Get
End Property
Friend Overrides Async Function GetRegionsAsync(document As Document, position As Integer) As Task(Of BlockSpan())
Friend Overrides Async Function GetBlockSpansAsync(document As Document, position As Integer) As Task(Of BlockSpan())
Dim outliningService = document.Project.LanguageServices.GetService(Of BlockStructureService)()
Return (Await outliningService.GetBlockStructureAsync(document, CancellationToken.None)) _
......@@ -33,7 +33,7 @@ End Class|}
#End Region|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "Class C ...", autoCollapse:=False),
Region("span2", "Something", autoCollapse:=False, isDefaultCollapsed:=True))
End Function
......
src/EditorFeatures/VisualBasicTest/Outlining/PropertyDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/PropertyDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -5,11 +5,11 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public Class PropertyDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of PropertyStatementSyntax)
Public Class PropertyDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of PropertyStatementSyntax)
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New PropertyDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New PropertyDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
......@@ -24,7 +24,7 @@ Class C1
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "ReadOnly Property P1 As Integer ...", autoCollapse:=True))
End Function
......@@ -39,7 +39,7 @@ Class C1
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "WriteOnly Property P1 As Integer ...", autoCollapse:=True))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/RegionDirectiveOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/RegionDirectiveStructureTests.vb
浏览文件 @ 98e2791d
......@@ -5,11 +5,11 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public Class RegionDirectiveOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of RegionDirectiveTriviaSyntax)
Public Class RegionDirectiveStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of RegionDirectiveTriviaSyntax)
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New RegionDirectiveOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New RegionDirectiveStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
......@@ -18,7 +18,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
$$#Region ""Foo""
"
Await VerifyNoRegionsAsync(code)
Await VerifyNoBlockSpansAsync(code)
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
......@@ -28,7 +28,7 @@ $$#Region ""Foo""
#End Region|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Foo", autoCollapse:=False, isDefaultCollapsed:=True))
End Function
......@@ -39,7 +39,7 @@ $$#Region ""Foo""
#End Region|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "#Region", autoCollapse:=False, isDefaultCollapsed:=True))
End Function
......@@ -50,7 +50,7 @@ $$#Region ""Foo""
#End Region|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "#Region", autoCollapse:=False, isDefaultCollapsed:=True))
End Function
......@@ -63,7 +63,7 @@ End Class
{|span:$$#Region
#End Region|}"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "#Region", autoCollapse:=False, isDefaultCollapsed:=True))
End Function
End Class
......
src/EditorFeatures/VisualBasicTest/Outlining/TypeDeclarationOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/TypeDeclarationStructureTests.vb
浏览文件 @ 98e2791d
......@@ -5,11 +5,11 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public Class TypeDeclarationOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of TypeStatementSyntax)
Public Class TypeDeclarationStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of TypeStatementSyntax)
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New TypeDeclarationOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New TypeDeclarationStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
......@@ -19,7 +19,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
End Class|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Class C1 ...", autoCollapse:=False))
End Function
......@@ -30,7 +30,7 @@ End Class|}
End Class|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Friend Class C1 ...", autoCollapse:=False))
End Function
......@@ -43,7 +43,7 @@ End Class|}
End Class|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "' Hello ...", autoCollapse:=True),
Region("span2", "Class C1 ...", autoCollapse:=False))
End Function
......@@ -57,7 +57,7 @@ End Class|}
End Class|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "Class C1 ...", autoCollapse:=False),
Region("span2", "' Hello ...", autoCollapse:=True))
End Function
......@@ -69,7 +69,7 @@ End Class|}
End Module|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Module M1 ...", autoCollapse:=False))
End Function
......@@ -82,7 +82,7 @@ End Module|}
End Module|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "' Hello ...", autoCollapse:=True),
Region("span2", "Module M1 ...", autoCollapse:=False))
End Function
......@@ -96,7 +96,7 @@ End Module|}
End Module|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "Module M1 ...", autoCollapse:=False),
Region("span2", "' Hello ...", autoCollapse:=True))
End Function
......@@ -108,7 +108,7 @@ End Module|}
End Interface|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Interface I1 ...", autoCollapse:=False))
End Function
......@@ -121,7 +121,7 @@ End Interface|}
End Interface|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "' Hello ...", autoCollapse:=True),
Region("span2", "Interface I1 ...", autoCollapse:=False))
End Function
......@@ -135,7 +135,7 @@ End Interface|}
End Interface|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "Interface I1 ...", autoCollapse:=False),
Region("span2", "' Hello ...", autoCollapse:=True))
End Function
......@@ -147,7 +147,7 @@ End Interface|}
End Structure|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "Structure S1 ...", autoCollapse:=False))
End Function
......@@ -160,7 +160,7 @@ End Structure|}
End Structure|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "' Hello ...", autoCollapse:=True),
Region("span2", "Structure S1 ...", autoCollapse:=False))
End Function
......@@ -174,7 +174,7 @@ End Structure|}
End Structure|}
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span1", "Structure S1 ...", autoCollapse:=False),
Region("span2", "' Hello ...", autoCollapse:=True))
End Function
......
src/EditorFeatures/VisualBasicTest/Outlining/XmlExpressionOutlinerTests.vb → src/EditorFeatures/VisualBasicTest/Structure/XmlExpressionStructureTests.vb
浏览文件 @ 98e2791d
......@@ -5,11 +5,11 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Structure
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
Public Class XmlDocumentOutlinerTests
Inherits AbstractVisualBasicSyntaxNodeOutlinerTests(Of XmlNodeSyntax)
Public Class XmlDocumentStructureProviderTests
Inherits AbstractVisualBasicSyntaxNodeStructureProviderTests(Of XmlNodeSyntax)
Friend Overrides Function CreateOutliner() As AbstractSyntaxStructureProvider
Return New XmlExpressionOutliner()
Friend Overrides Function CreateProvider() As AbstractSyntaxStructureProvider
Return New XmlExpressionStructureProvider()
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
......@@ -22,7 +22,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "<?xml version=""1.0""?> ...", autoCollapse:=False))
End Function
......@@ -35,7 +35,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "<?xml version=""1.0""?><foo> ...", autoCollapse:=False))
End Function
......@@ -48,7 +48,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "<foo> ...", autoCollapse:=False))
End Function
......@@ -63,7 +63,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "<bar> ...", autoCollapse:=False))
End Function
......@@ -76,7 +76,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "<?foo ...", autoCollapse:=False))
End Function
......@@ -89,7 +89,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "<!-- Foo ...", autoCollapse:=False))
End Function
......@@ -102,7 +102,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "<![CDATA[ ...", autoCollapse:=False))
End Function
......@@ -118,7 +118,7 @@ Class C
End Class
"
Await VerifyRegionsAsync(code,
Await VerifyBlockSpansAsync(code,
Region("span", "<%= ...", autoCollapse:=False))
End Function
......@@ -132,7 +132,7 @@ Class C
End Class
"
Await VerifyNoRegionsAsync(code)
Await VerifyNoBlockSpansAsync(code)
End Function
End Class
End Namespace
\ No newline at end of file
src/Features/CSharp/Portable/CSharpFeatures.csproj
浏览文件 @ 98e2791d
......@@ -353,46 +353,46 @@
<Compile Include="Organizing\Organizers\PropertyDeclarationOrganizer.cs" />
<Compile Include="Organizing\Organizers\StructDeclarationOrganizer.cs" />
<Compile Include="Structure\CSharpBlockStructureProvider.cs" />
<Compile Include="Structure\CSharpOutliningHelpers.cs" />
<Compile Include="Structure\CSharpStructureHelpers.cs" />
<Compile Include="Structure\CSharpBlockStructureService.cs" />
<Compile Include="Structure\Outliners\AccessorDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\AnonymousMethodExpressionOutliner.cs" />
<Compile Include="Structure\Outliners\CompilationUnitOutliner.cs" />
<Compile Include="Structure\Outliners\ConstructorDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\ConversionOperatorDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\DelegateDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\DestructorDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\DisabledTextTriviaOutliner.cs" />
<Compile Include="Structure\Outliners\DocumentationCommentOutliner.cs" />
<Compile Include="Structure\Outliners\EnumDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\EventDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\EventFieldDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\FieldDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\IndexerDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\MetadataAsSource\AbstractMetadataAsSourceOutliner.cs" />
<Compile Include="Structure\Outliners\MetadataAsSource\ConstructorDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\MetadataAsSource\ConversionOperatorDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\MetadataAsSource\DelegateDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\MetadataAsSource\DestructorDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\MetadataAsSource\EnumDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\MetadataAsSource\EnumMemberDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\MetadataAsSource\EventDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\MetadataAsSource\EventFieldDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\MetadataAsSource\FieldDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\MetadataAsSource\IndexerDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\MetadataAsSource\MethodDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\MetadataAsSource\OperatorDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\MetadataAsSource\PropertyDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\MetadataAsSource\RegionDirectiveOutliner.cs" />
<Compile Include="Structure\Outliners\MetadataAsSource\TypeDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\MethodDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\NamespaceDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\OperatorDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\ParenthesizedLambdaExpressionOutliner.cs" />
<Compile Include="Structure\Outliners\PropertyDeclarationOutliner.cs" />
<Compile Include="Structure\Outliners\RegionDirectiveOutliner.cs" />
<Compile Include="Structure\Outliners\SimpleLambdaExpressionOutliner.cs" />
<Compile Include="Structure\Outliners\TypeDeclarationOutliner.cs" />
<Compile Include="Structure\Providers\AccessorDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\AnonymousMethodExpressionStructureProvider.cs" />
<Compile Include="Structure\Providers\CompilationUnitStructureProvider.cs" />
<Compile Include="Structure\Providers\ConstructorDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\ConversionOperatorDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\DelegateDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\DestructorDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\DisabledTextTriviaStructureProvider.cs" />
<Compile Include="Structure\Providers\DocumentationCommentStructureProvider.cs" />
<Compile Include="Structure\Providers\EnumDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\EventDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\EventFieldDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\FieldDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\IndexerDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\MetadataAsSource\AbstractMetadataAsSourceStructureProvider.cs" />
<Compile Include="Structure\Providers\MetadataAsSource\ConstructorDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\MetadataAsSource\ConversionOperatorDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\MetadataAsSource\DelegateDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\MetadataAsSource\DestructorDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\MetadataAsSource\EnumDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\MetadataAsSource\EnumMemberDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\MetadataAsSource\EventDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\MetadataAsSource\EventFieldDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\MetadataAsSource\FieldDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\MetadataAsSource\IndexerDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\MetadataAsSource\MethodDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\MetadataAsSource\OperatorDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\MetadataAsSource\PropertyDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\MetadataAsSource\RegionDirectiveStructureProvider.cs" />
<Compile Include="Structure\Providers\MetadataAsSource\TypeDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\MethodDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\NamespaceDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\OperatorDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\ParenthesizedLambdaExpressionStructureProvider.cs" />
<Compile Include="Structure\Providers\PropertyDeclarationStructureProvider.cs" />
<Compile Include="Structure\Providers\RegionDirectiveStructureProvider.cs" />
<Compile Include="Structure\Providers\SimpleLambdaExpressionStructureProvider.cs" />
<Compile Include="Structure\Providers\TypeDeclarationStructureProvider.cs" />
<Compile Include="RemoveUnnecessaryImports\CSharpRemoveUnnecessaryImportsService.cs" />
<Compile Include="RemoveUnnecessaryImports\CSharpRemoveUnnecessaryImportsService.Rewriter.cs" />
<Compile Include="ReplaceMethodWithProperty\CSharpReplaceMethodWithPropertyService.cs" />
......
src/Features/CSharp/Portable/Structure/CSharpOutliningHelpers.cs → src/Features/CSharp/Portable/Structure/CSharpStructureHelpers.cs
浏览文件 @ 98e2791d
......@@ -4,7 +4,6 @@
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq;
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Extensions;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Shared.Extensions;
......@@ -14,7 +13,7 @@
namespace Microsoft.CodeAnalysis.CSharp.Structure
{
internal static class CSharpOutliningHelpers
internal static class CSharpStructureHelpers
{
public const string Ellipsis = "...";
public const string MultiLineCommentSuffix = "*/";
......@@ -337,4 +336,4 @@ public static BlockSpan CreateRegion(IEnumerable<SyntaxNode> syntaxList, bool au
autoCollapse: autoCollapse);
}
}
}
}
\ No newline at end of file
src/Features/CSharp/Portable/Structure/Outliners/AccessorDeclarationOutliner.cs → src/Features/CSharp/Portable/Structure/Providers/AccessorDeclarationStructureProvider.cs
浏览文件 @ 98e2791d
......@@ -7,14 +7,14 @@
namespace Microsoft.CodeAnalysis.CSharp.Structure
{
internal class AccessorDeclarationOutliner : AbstractSyntaxNodeStructureProvider<AccessorDeclarationSyntax>
internal class AccessorDeclarationStructureProvider : AbstractSyntaxNodeStructureProvider<AccessorDeclarationSyntax>
{
protected override void CollectBlockSpans(
AccessorDeclarationSyntax accessorDeclaration,
ImmutableArray<BlockSpan>.Builder spans,
CancellationToken cancellationToken)
{
CSharpOutliningHelpers.CollectCommentRegions(accessorDeclaration, spans);
CSharpStructureHelpers.CollectCommentRegions(accessorDeclaration, spans);
// fault tolerance
if (accessorDeclaration.Body == null ||
......@@ -24,7 +24,7 @@ internal class AccessorDeclarationOutliner : AbstractSyntaxNodeStructureProvider
return;
}
spans.Add(CSharpOutliningHelpers.CreateRegion(
spans.Add(CSharpStructureHelpers.CreateRegion(
accessorDeclaration,
accessorDeclaration.Keyword,
autoCollapse: true));
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或