Get BlockTag tooltips working again.

src/EditorFeatures/Next/EditorFeatures.Next.csproj

@@ -66,6 +66,7 @@
     <Compile Include="Options\EditorConfigDocumentOptionsProvider.DocumentOptions.cs" />
     <Compile Include="Options\EditorConfigDocumentOptionsProvider.EmptyCodingConventionContext.cs" />
     <Compile Include="Structure\BlockContextProvider.cs" />
+    <Compile Include="Structure\RoslynBlockTag.cs" />
     <Compile Include="Structure\VisualStudio15StructureTaggerProvider.cs" />
     <Compile Include="Options\EditorConfigDocumentOptionsProviderFactory.cs" />
     <Compile Include="Options\EditorConfigDocumentOptionsProvider.cs" />

src/EditorFeatures/Next/Structure/BlockContextProvider.cs

 // 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;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Threading;
@@ -62,7 +61,7 @@ public void Dispose()
             public Task<IBlockContext> GetBlockContextAsync(
                 IBlockTag blockTag, ITextView view, CancellationToken token)
             {
-                if (blockTag is RoslynOutliningRegionTag)
+                if (blockTag is RoslynBlockTag)
                 {
                     var result = new RoslynBlockContext(_provider, blockTag, view);
                     return Task.FromResult<IBlockContext>(result);

src/EditorFeatures/Next/Structure/RoslynBlockTag.cs

+// 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.Implementation.Structure;
+using Microsoft.CodeAnalysis.Structure;
+using Microsoft.CodeAnalysis.Text.Shared.Extensions;
+using Microsoft.VisualStudio.Text;
+using Microsoft.VisualStudio.Text.Editor;
+using Microsoft.VisualStudio.Text.Projection;
+using Microsoft.VisualStudio.Text.Tagging;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.Editor.Structure
+{
+
+    internal class RoslynBlockTag : BlockTag
+    {
+        private readonly BlockTagState _state;
+
+        public override int Level { get; }
+
+        public RoslynBlockTag(
+            ITextEditorFactoryService textEditorFactoryService,
+            IProjectionBufferFactoryService projectionBufferFactoryService,
+            IEditorOptionsFactoryService editorOptionsFactoryService,
+            IBlockTag parent,
+            ITextSnapshot snapshot,
+            BlockSpan blockSpan) :
+            base(span: blockSpan.TextSpan.ToSnapshotSpan(snapshot),
+                 statementSpan: blockSpan.HintSpan.ToSnapshotSpan(snapshot),
+                 parent: parent,
+                 type: blockSpan.Type,
+                 isCollapsible: blockSpan.IsCollapsible,
+                 isDefaultCollapsed: blockSpan.IsDefaultCollapsed,
+                 isImplementation: blockSpan.AutoCollapse,
+                 collapsedForm: null,
+                 collapsedHintForm: null)
+        {
+            _state = new BlockTagState(
+                textEditorFactoryService, projectionBufferFactoryService,
+                editorOptionsFactoryService, snapshot, blockSpan);
+            Level = parent == null ? 0 : parent.Level + 1;
+        }
+
+        public override object CollapsedForm => _state.CollapsedForm;
+        public override object CollapsedHintForm => _state.CollapsedHintForm;
+
+        public override bool Equals(object obj)
+            => Equals(obj as RoslynBlockTag);
+
+        /// <summary>
+        /// This is only called if the spans for the tags were the same.  However, even if we 
+        /// have the same span as the previous tag (taking into account span mapping) that 
+        /// doesn't mean we can use the old block tag.  Specifically, the editor will look at
+        /// other fields in the tags So we need to make sure that these values have not changed
+        /// if we want to reuse the old block tag.  For example, perhaps the item's type changed
+        /// (i.e. from class to struct).  It will have the same span, but might have a new 
+        /// presentation as the 'Type' will be different.
+        /// </summary>
+        public bool Equals(RoslynBlockTag tag)
+        {
+            return _state.Equals(tag._state) &&
+                   IsCollapsible == tag.IsCollapsible &&
+                   Level == tag.Level &&
+                   Type == tag.Type &&
+                   StatementSpan == tag.StatementSpan &&
+                   Span == tag.Span;
+        }
+
+        public override int GetHashCode()
+        {
+            return Hash.Combine(base.GetHashCode(),
+                   Hash.Combine(this.IsCollapsible,
+                   Hash.Combine(this.Level,
+                   Hash.Combine(this.Type,
+                   Hash.Combine(this.StatementSpan.GetHashCode(), this.Span.GetHashCode())))));
+        }
+    }
+}
\ No newline at end of file

src/EditorFeatures/Next/Structure/VisualStudio15StructureTaggerProvider.cs

@@ -6,13 +6,11 @@
 using Microsoft.CodeAnalysis.Editor.Implementation.Structure;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 using Microsoft.CodeAnalysis.Structure;
-using Microsoft.CodeAnalysis.Text.Shared.Extensions;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Projection;
 using Microsoft.VisualStudio.Text.Tagging;
 using Microsoft.VisualStudio.Utilities;
-using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.Structure
 {
@@ -43,69 +41,5 @@ internal partial class VisualStudio15StructureTaggerProvider :
                 this.EditorOptionsFactoryService,
                 parentTag, snapshot, region);
         }
-
-        private class RoslynBlockTag : BlockTag
-        {
-            private readonly BlockTagState _state;
-
-            public override int Level { get; }
-
-            public RoslynBlockTag(
-                ITextEditorFactoryService textEditorFactoryService,
-                IProjectionBufferFactoryService projectionBufferFactoryService,
-                IEditorOptionsFactoryService editorOptionsFactoryService,
-                IBlockTag parent,
-                ITextSnapshot snapshot,
-                BlockSpan blockSpan) :
-                base(span: blockSpan.TextSpan.ToSnapshotSpan(snapshot),
-                     statementSpan: blockSpan.HintSpan.ToSnapshotSpan(snapshot),
-                     parent: parent,
-                     type: blockSpan.Type,
-                     isCollapsible: blockSpan.IsCollapsible,
-                     isDefaultCollapsed: blockSpan.IsDefaultCollapsed,
-                     isImplementation: blockSpan.AutoCollapse,
-                     collapsedForm: null,
-                     collapsedHintForm: null)
-            {
-                _state = new BlockTagState(
-                    textEditorFactoryService, projectionBufferFactoryService,
-                    editorOptionsFactoryService, snapshot, blockSpan);
-                Level = parent == null ? 0 : parent.Level + 1;
-            }
-
-            public override object CollapsedForm => _state.CollapsedForm;
-            public override object CollapsedHintForm => _state.CollapsedHintForm;
-
-            public override bool Equals(object obj)
-                => Equals(obj as RoslynBlockTag);
-
-            /// <summary>
-            /// This is only called if the spans for the tags were the same.  However, even if we 
-            /// have the same span as the previous tag (taking into account span mapping) that 
-            /// doesn't mean we can use the old block tag.  Specifically, the editor will look at
-            /// other fields in the tags So we need to make sure that these values have not changed
-            /// if we want to reuse the old block tag.  For example, perhaps the item's type changed
-            /// (i.e. from class to struct).  It will have the same span, but might have a new 
-            /// presentation as the 'Type' will be different.
-            /// </summary>
-            public bool Equals(RoslynBlockTag tag)
-            {
-                return _state.Equals(tag._state) &&
-                       IsCollapsible == tag.IsCollapsible &&
-                       Level == tag.Level &&
-                       Type == tag.Type &&
-                       StatementSpan == tag.StatementSpan &&
-                       Span == tag.Span;
-            }
-
-            public override int GetHashCode()
-            {
-                return Hash.Combine(base.GetHashCode(),
-                       Hash.Combine(this.IsCollapsible,
-                       Hash.Combine(this.Level,
-                       Hash.Combine(this.Type, 
-                       Hash.Combine(this.StatementSpan.GetHashCode(), this.Span.GetHashCode())))));
-            }
-        }
     }
 }
\ No newline at end of file