NodeLocator doesn't need a CodeModelService just to get language name

Author: jasonmalinowski

src/VisualStudio/CSharp/Impl/CodeModel/CSharpCodeModelService.NodeLocator.cs

@@ -19,20 +19,14 @@ internal partial class CSharpCodeModelService
     {
         protected override AbstractNodeLocator CreateNodeLocator()
         {
-            return new NodeLocator(this);
+            return new NodeLocator();
         }
 
         private class NodeLocator : AbstractNodeLocator
         {
-            public NodeLocator(CSharpCodeModelService codeModelService)
-                : base(codeModelService)
-            {
-            }
+            protected override string LanguageName => LanguageNames.CSharp;
 
-            protected override EnvDTE.vsCMPart DefaultPart
-            {
-                get { return EnvDTE.vsCMPart.vsCMPartWholeWithAttributes; }
-            }
+            protected override EnvDTE.vsCMPart DefaultPart => EnvDTE.vsCMPart.vsCMPartWholeWithAttributes;
 
             protected override VirtualTreePoint? GetStartPoint(SourceText text, OptionSet options, SyntaxNode node, EnvDTE.vsCMPart part)
             {

src/VisualStudio/Core/Impl/CodeModel/AbstractCodeModelService.AbstractNodeLocator.cs

@@ -14,12 +14,7 @@ internal partial class AbstractCodeModelService : ICodeModelService
 
         protected abstract class AbstractNodeLocator
         {
-            private readonly AbstractCodeModelService _codeModelService;
-
-            protected AbstractNodeLocator(AbstractCodeModelService codeModelService)
-            {
-                _codeModelService = codeModelService;
-            }
+            protected abstract string LanguageName { get; }
 
             protected abstract EnvDTE.vsCMPart DefaultPart { get; }
 
@@ -28,7 +23,7 @@ protected AbstractNodeLocator(AbstractCodeModelService codeModelService)
 
             protected int GetTabSize(OptionSet options)
             {
-                return options.GetOption(FormattingOptions.TabSize, _codeModelService.Language);
+                return options.GetOption(FormattingOptions.TabSize, LanguageName);
             }
 
             public VirtualTreePoint? GetStartPoint(SyntaxNode node, OptionSet options, EnvDTE.vsCMPart? part)

src/VisualStudio/VisualBasic/Impl/CodeModel/VisualBasicCodeModelService.NodeLocator.vb

@@ -14,15 +14,17 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.CodeModel
     Partial Friend Class VisualBasicCodeModelService
 
         Protected Overrides Function CreateNodeLocator() As AbstractNodeLocator
-            Return New NodeLocator(Me)
+            Return New NodeLocator()
         End Function
 
         Private Class NodeLocator
             Inherits AbstractNodeLocator
 
-            Public Sub New(codeModelService As VisualBasicCodeModelService)
-                MyBase.New(codeModelService)
-            End Sub
+            Protected Overrides ReadOnly Property LanguageName As String
+                Get
+                    Return LanguageNames.VisualBasic
+                End Get
+            End Property
 
             Protected Overrides ReadOnly Property DefaultPart As EnvDTE.vsCMPart
                 Get