Attempt to make VisualBasicSyntaxFactsServiceFactory ( FAILED x thousands )

src/EditorFeatures/Test/SolutionCrawler/WorkCoordinatorTests.cs

@@ -690,11 +690,16 @@ End Property
 
             var root = Microsoft.CodeAnalysis.VisualBasic.SyntaxFactory.ParseCompilationUnit(code);
             var property = root.FindToken(position).Parent.FirstAncestorOrSelf<Microsoft.CodeAnalysis.VisualBasic.Syntax.PropertyBlockSyntax>();
-            var memberId = Microsoft.CodeAnalysis.VisualBasic.VisualBasicSyntaxFactsService.Default.GetMethodLevelMemberId(root, property);
+            var memberId =  _Facts.GetMethodLevelMemberId(root, property);
 
             Assert.Equal(0, memberId);
         }
 
+     [Import(nameof(Microsoft.CodeAnalysis.VisualBasic.VisualBasicSyntaxFactsServiceFactory.VisualBasicSyntaxFactsService))]
+       internal Microsoft.CodeAnalysis.VisualBasic.VisualBasicSyntaxFactsServiceFactory.VisualBasicSyntaxFactsService _Facts { get; set; } 
+
+
+
         [Fact, WorkItem(739943, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/739943")]
         public async Task SemanticChange_Propagation_Transitive()
         {

src/EditorFeatures/Test/TestExportProvider.cs

@@ -92,7 +92,7 @@ private static Type[] GetNeutralAndCSharpAndVisualBasicTypes()
                 typeof(CodeAnalysis.CSharp.CodeGeneration.CSharpCodeGenerationServiceFactory),
                 typeof(CodeAnalysis.VisualBasic.CodeGeneration.VisualBasicCodeGenerationServiceFactory),
                 typeof(Microsoft.CodeAnalysis.CSharp.CSharpSyntaxFactsService),
-                typeof(Microsoft.CodeAnalysis.VisualBasic.VisualBasicSyntaxFactsService),
+                typeof(Microsoft.CodeAnalysis.VisualBasic.VisualBasicSyntaxFactsServiceFactory),
                 typeof(CodeAnalysis.CSharp.CSharpSymbolDeclarationService),
                 typeof(CodeAnalysis.VisualBasic.VisualBasicSymbolDeclarationService),
                 typeof(CodeAnalysis.Editor.CSharp.LanguageServices.CSharpSymbolDisplayServiceFactory),

src/EditorFeatures/VisualBasicTest/Diagnostics/Suppression/SuppressionAllCodeTests.vb

+Option Strict Off
 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-Option Strict Off
+Imports System.ComponentModel.Composition
 Imports Microsoft.CodeAnalysis.CodeFixes.Suppression
 Imports Microsoft.CodeAnalysis.Editor.UnitTests.Diagnostics
 Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
@@ -24,15 +25,17 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics.Suppre
             Await TestPragmaAsync(TestResource.AllInOneVisualBasicCode, VisualBasicParseOptions.Default, verifier:=Function(t) t.IndexOf("#Disable Warning", StringComparison.Ordinal) >= 0)
         End Function
 
+        <Import(NameOf(VisualBasicSyntaxFactsServiceFactory.VisualBasicSyntaxFactsService))>
+        Private Property _Facts As VisualBasicSyntaxFactsServiceFactory.VisualBasicSyntaxFactsService
+
+
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsSuppression)>
         Public Async Function TestSuppressionWithAttributeOnEveryNodes() As Threading.Tasks.Task
-            Dim facts = VisualBasicSyntaxFactsService.Default
-
             Await TestSuppressionWithAttributeAsync(
                 TestResource.AllInOneVisualBasicCode,
                 VisualBasicParseOptions.Default,
                 digInto:=Function(n)
-                             Dim member = facts.GetContainingMemberDeclaration(n, n.Span.Start)
+                             Dim member = _Facts.GetContainingMemberDeclaration(n, n.Span.Start)
                              If member Is Nothing OrElse member Is n Then
                                  Return True
                              End If

src/Workspaces/VisualBasic/Portable/Extensions/SyntaxTokenExtensions.vb

 ' 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.Composition
 Imports System.Runtime.CompilerServices
 Imports System.Threading
 Imports Microsoft.CodeAnalysis
@@ -237,9 +238,12 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Extensions
                       token)
         End Function
 
+        <Import(NameOf(VisualBasicSyntaxFactsServiceFactory.VisualBasicSyntaxFactsService))>
+        Private Property _Facts As VisualBasicSyntaxFactsServiceFactory.VisualBasicSyntaxFactsService
+
         <Extension>
         Public Function IsWord(token As SyntaxToken) As Boolean
-            Return VisualBasicSyntaxFactsService.Default.IsWord(token)
+            Return _Facts.IsWord(token)
         End Function
 
         <Extension()>

src/Workspaces/VisualBasic/Portable/PublicAPI.Unshipped.txt

+Microsoft.CodeAnalysis.VisualBasic.VisualBasicSyntaxFactsServiceFactory
+Microsoft.CodeAnalysis.VisualBasic.VisualBasicSyntaxFactsServiceFactory.CreateLanguageService(languageServices As Microsoft.CodeAnalysis.Host.HostLanguageServices) -> Microsoft.CodeAnalysis.Host.ILanguageService
+Microsoft.CodeAnalysis.VisualBasic.VisualBasicSyntaxFactsServiceFactory.New() -> Void
\ No newline at end of file

src/Workspaces/VisualBasicTest/VisualBasicSyntaxFactsServiceTests.vb

 ' 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.ComponentModel.Composition
 Imports Microsoft.CodeAnalysis.Text
 Imports Roslyn.Test.Utilities
 Imports Xunit
@@ -221,9 +222,12 @@ End Class"))
             MarkupTestFile.GetSpan(markup, code, span)
             Dim tree = SyntaxFactory.ParseSyntaxTree(code)
             Dim node = tree.GetRoot().FindNode(span)
-            Dim service = VisualBasicSyntaxFactsService.Default
+            Dim service = _Facts
             Return service.IsMethodLevelMember(node)
         End Function
 
+        <Import(GetType(Microsoft.CodeAnalysis.LanguageServices.ISyntaxFactsService))>
+        Private Property _Facts As VisualBasicSyntaxFactsServiceFactory.VisualBasicSyntaxFactsService
+
     End Class
 End Namespace