Don't implicitly reference resources.

src/EditorFeatures/Test2/IntelliSense/VisualBasicCompletionCommandHandlerTests.vb

@@ -1839,7 +1839,7 @@ End Class
                 Await state.WaitForAsynchronousOperationsAsync()
                 Await state.AssertSelectedCompletionItem("GetType", VBFeaturesResources.GettypeFunction + vbCrLf +
                     VBWorkspaceResources.ReturnsSystemTypeObject + vbCrLf +
-                    $"GetType({Typename}) As Type")
+                    $"GetType({VBWorkspaceResources.Typename}) As Type")
             End Using
         End Function
 

src/EditorFeatures/Test2/NavigationBar/VisualBasicNavigationBarTests.vb

@@ -72,7 +72,7 @@ End Class
                     </Project>
                 </Workspace>,
                 Item("C", Glyph.ClassInternal, bolded:=True, children:={
-                    Item(NavigationItemNew, Glyph.MethodPublic, bolded:=False, hasNavigationSymbolId:=False),
+                    Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, bolded:=False, hasNavigationSymbolId:=False),
                     Item("Finalize", Glyph.MethodProtected, bolded:=False, hasNavigationSymbolId:=False),
                     Item("Operator +(C, C) As C", Glyph.Operator, bolded:=True),
                     Item("Operator +(C, Integer) As C", Glyph.Operator, bolded:=True),
@@ -94,7 +94,7 @@ End Class
                     </Project>
                 </Workspace>,
                 Item("C", Glyph.ClassInternal, bolded:=True, children:={
-                    Item(NavigationItemNew, Glyph.MethodPublic, bolded:=False, hasNavigationSymbolId:=False),
+                    Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, bolded:=False, hasNavigationSymbolId:=False),
                     Item("Finalize", Glyph.MethodProtected, bolded:=False, hasNavigationSymbolId:=False),
                     Item("Narrowing Operator CType", Glyph.Operator, bolded:=True)}))
         End Function
@@ -118,7 +118,7 @@ End Class
                     </Project>
                 </Workspace>,
                 Item("C", Glyph.ClassInternal, bolded:=True, children:={
-                    Item(NavigationItemNew, Glyph.MethodPublic, bolded:=False, hasNavigationSymbolId:=False),
+                    Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, bolded:=False, hasNavigationSymbolId:=False),
                     Item("Finalize", Glyph.MethodProtected, bolded:=False, hasNavigationSymbolId:=False),
                     Item("Narrowing Operator CType(C) As Integer", Glyph.Operator, bolded:=True),
                     Item("Narrowing Operator CType(C) As String", Glyph.Operator, bolded:=True)}))
@@ -187,7 +187,7 @@ End Class
                     </Project>
                 </Workspace>,
                 Item("C", Glyph.ClassInternal, bolded:=True, children:={
-                     Item(NavigationItemNew, Glyph.MethodPublic, bolded:=False, hasNavigationSymbolId:=False),
+                     Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, bolded:=False, hasNavigationSymbolId:=False),
                      Item("Finalize", Glyph.MethodProtected, bolded:=False, hasNavigationSymbolId:=False),
                      Item("S()", Glyph.MethodPublic, bolded:=True),
                      Item("S(Of T)()", Glyph.MethodPublic, bolded:=True)}))
@@ -207,7 +207,7 @@ End Class
                     </Project>
                 </Workspace>,
                 Item("C", Glyph.ClassInternal, bolded:=True, children:={
-                     Item(NavigationItemNew, Glyph.MethodPublic, bolded:=False, hasNavigationSymbolId:=False),
+                     Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, bolded:=False, hasNavigationSymbolId:=False),
                      Item("Finalize", Glyph.MethodProtected, bolded:=False, hasNavigationSymbolId:=False),
                      Item("S(Of T)()", Glyph.MethodPublic, bolded:=True)}))
         End Function
@@ -226,7 +226,7 @@ End Class
                     </Project>
                 </Workspace>,
                 Item("C", Glyph.ClassInternal, bolded:=True, children:={
-                     Item(NavigationItemNew, Glyph.MethodPublic, bolded:=False, hasNavigationSymbolId:=False),
+                     Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, bolded:=False, hasNavigationSymbolId:=False),
                      Item("Finalize", Glyph.MethodProtected, bolded:=False, hasNavigationSymbolId:=False),
                      Item("S(Of T)() As Integer", Glyph.MethodPublic, bolded:=True)}))
         End Function
@@ -245,7 +245,7 @@ End Class
                     </Project>
                 </Workspace>,
                 Item("C", Glyph.ClassInternal, bolded:=True, children:={
-                     Item(NavigationItemNew, Glyph.MethodPublic, bolded:=False, hasNavigationSymbolId:=False),
+                     Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, bolded:=False, hasNavigationSymbolId:=False),
                      Item("Finalize", Glyph.MethodProtected, bolded:=False, hasNavigationSymbolId:=False),
                      Item("S", Glyph.MethodPublic, bolded:=True)}))
         End Function
@@ -298,7 +298,7 @@ End Class
                     </Project>
                 </Workspace>,
                 Item("C", Glyph.ClassInternal, bolded:=True, children:={
-                    Item(NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
+                    Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
                     Item("Finalize", Glyph.MethodProtected, bolded:=True)}))
         End Function
 
@@ -316,7 +316,7 @@ End Class
                     </Project>
                 </Workspace>,
                 Item("C", Glyph.ClassInternal, bolded:=True, children:={
-                    Item(NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
+                    Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
                     Item("Finalize", Glyph.MethodProtected, hasNavigationSymbolId:=False),
                     Item("Co", Glyph.ConstantPrivate, bolded:=True),
                     Item("F", Glyph.FieldPrivate, bolded:=True)}))
@@ -354,7 +354,7 @@ End Class
                         </Document>
                     </Project>
                 </Workspace>,
-                "C", NavigationItemNew,
+                "C", VBEditorResources.NavigationItemNew,
                 <Result>
 Class C
     Public Sub New()
@@ -379,16 +379,16 @@ End Class
                         </Document>
                     </Project>
                 </Workspace>,
-                "C", NavigationItemNew,
+                "C", VBEditorResources.NavigationItemNew,
                 <Result>
 &lt;Microsoft.VisualBasic.CompilerServices.DesignerGeneratedAttribute&gt;
 Class C
     Public Sub New()
 
-        ' <%= ThisCallIsRequiredByTheDesigner %>
+        ' <%= VBEditorResources.ThisCallIsRequiredByTheDesigner %>
         InitializeComponent()
 
-        ' <%= AddAnyInitializationAfter %>
+        ' <%= VBEditorResources.AddAnyInitializationAfter %>
 
     End Sub
 
@@ -443,7 +443,7 @@ End Class
                     </Project>
                 </Workspace>,
                 Item("C", Glyph.ClassInternal, bolded:=True, children:={
-                     Item(NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
+                     Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
                      Item("Finalize", Glyph.MethodProtected, hasNavigationSymbolId:=False),
                      Item("Foo", Glyph.MethodPublic, grayed:=True)}))
         End Function
@@ -461,7 +461,7 @@ End Class
                     </Project>
                 </Workspace>,
                 Item("C", Glyph.ClassInternal, bolded:=True, children:={
-                     Item(NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
+                     Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
                      Item("Finalize", Glyph.MethodProtected, hasNavigationSymbolId:=False)}),
                 Item("foo", Glyph.FieldPrivate, bolded:=False, hasNavigationSymbolId:=False, indent:=1, children:={
                      Item("CancelKeyPress", Glyph.EventPublic, hasNavigationSymbolId:=False)}))
@@ -499,7 +499,7 @@ End Class
                 Item("I3", Glyph.InterfaceInternal, bolded:=True, children:={
                      Item("I3Event", Glyph.EventPublic, bolded:=True)}),
                 Item("Test", Glyph.ClassInternal, bolded:=True, children:={
-                     Item(NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
+                     Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
                      Item("Finalize", Glyph.MethodProtected, hasNavigationSymbolId:=False)}),
                 Item("i3", Glyph.FieldPrivate, hasNavigationSymbolId:=False, indent:=1, children:={
                      Item("I1Event", Glyph.EventPublic, hasNavigationSymbolId:=False),
@@ -530,19 +530,19 @@ End Class
                     </Project>
                 </Workspace>,
                 Item("B", Glyph.ClassInternal, bolded:=True, children:={
-                     Item(NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
+                     Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
                      Item("Finalize", Glyph.MethodProtected, hasNavigationSymbolId:=False),
                      Item("E", Glyph.EventPublic, bolded:=True)}),
                 Item(String.Format(VBEditorResources.Events, "B"), Glyph.EventPublic, hasNavigationSymbolId:=False, indent:=1, children:={
                      Item("E", Glyph.EventPublic, hasNavigationSymbolId:=False)}),
                 Item("C", Glyph.ClassInternal, bolded:=True, children:={
-                     Item(NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
+                     Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
                      Item("Finalize", Glyph.MethodProtected, hasNavigationSymbolId:=False),
                      Item("E", Glyph.EventPublic, bolded:=True)}),
                 Item(String.Format(VBEditorResources.Events, "C"), Glyph.EventPublic, hasNavigationSymbolId:=False, indent:=1, children:={
                      Item("E", Glyph.EventPublic, hasNavigationSymbolId:=False)}), ' Only one E under the "(C Events)" node
                 Item("Test", Glyph.ClassInternal, bolded:=True, children:={
-                     Item(NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
+                     Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
                      Item("Finalize", Glyph.MethodProtected, hasNavigationSymbolId:=False)}),
                 Item("c", Glyph.FieldPrivate, hasNavigationSymbolId:=False, indent:=1, children:={
                      Item("E", Glyph.EventPublic, hasNavigationSymbolId:=False)})) ' Only one E for WithEvents handling
@@ -565,13 +565,13 @@ End Class
                     </Project>
                 </Workspace>,
                 Item("C", Glyph.ClassInternal, bolded:=True, children:={
-                     Item(NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
+                     Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
                      Item("Finalize", Glyph.MethodProtected, hasNavigationSymbolId:=False),
                      Item("E", Glyph.EventPublic, bolded:=True)}),
                 Item(String.Format(VBEditorResources.Events, "C"), Glyph.EventPublic, hasNavigationSymbolId:=False, indent:=1, children:={
                      Item("E", Glyph.EventPublic, hasNavigationSymbolId:=False)}),
                 Item("D", Glyph.ClassInternal, bolded:=True, children:={
-                     Item(NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
+                     Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
                      Item("Finalize", Glyph.MethodProtected, hasNavigationSymbolId:=False)}),
                 Item(String.Format(VBEditorResources.Events, "D"), Glyph.EventPublic, hasNavigationSymbolId:=False, indent:=1, children:={
                      Item("E", Glyph.EventPublic, hasNavigationSymbolId:=False)}))
@@ -595,13 +595,13 @@ End Class
                     </Project>
                 </Workspace>,
                 Item("C", Glyph.ClassInternal, bolded:=True, children:={
-                     Item(NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
+                     Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
                      Item("Finalize", Glyph.MethodProtected, hasNavigationSymbolId:=False),
                      Item("E", Glyph.EventPrivate, bolded:=True)}),
                 Item(String.Format(VBEditorResources.Events, "C"), Glyph.EventPublic, hasNavigationSymbolId:=False, indent:=1, children:={
                      Item("E", Glyph.EventPrivate, hasNavigationSymbolId:=False)}),
                 Item("D", Glyph.ClassInternal, bolded:=True, children:={
-                     Item(NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
+                     Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
                      Item("Finalize", Glyph.MethodProtected, hasNavigationSymbolId:=False)}))
         End Function
 
@@ -636,7 +636,7 @@ End Class
                     </Project>
                 </Workspace>,
                 Item("C", Glyph.ClassInternal, bolded:=True, children:={
-                     Item(NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
+                     Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
                      Item("Finalize", Glyph.MethodProtected, hasNavigationSymbolId:=False),
                      Item("E0", Glyph.EventPublic, bolded:=True),
                      Item("E1", Glyph.EventProtected, bolded:=True),
@@ -646,23 +646,23 @@ End Class
                      Item("E1", Glyph.EventProtected, hasNavigationSymbolId:=False),
                      Item("E2", Glyph.EventPrivate, hasNavigationSymbolId:=False)}),
                 Item("D2", Glyph.ClassInternal, bolded:=True, children:={
-                     Item(NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
+                     Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
                      Item("Finalize", Glyph.MethodProtected, hasNavigationSymbolId:=False)}),
                 Item(String.Format(VBEditorResources.Events, "D2"), Glyph.EventPublic, hasNavigationSymbolId:=False, indent:=1, children:={
                      Item("E0", Glyph.EventPublic, hasNavigationSymbolId:=False),
                      Item("E1", Glyph.EventProtected, hasNavigationSymbolId:=False)}),
                 Item("N1 (C)", Glyph.ClassPublic, bolded:=True, children:={
-                     Item(NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
+                     Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
                      Item("Finalize", Glyph.MethodProtected, hasNavigationSymbolId:=False)}),
                 Item("N2 (C.N1)", Glyph.ClassPublic, bolded:=True, children:={
-                     Item(NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
+                     Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
                      Item("Finalize", Glyph.MethodProtected, hasNavigationSymbolId:=False)}),
                 Item(String.Format(VBEditorResources.Events, "N2"), Glyph.EventPublic, hasNavigationSymbolId:=False, indent:=1, children:={
                      Item("E0", Glyph.EventPublic, hasNavigationSymbolId:=False),
                      Item("E1", Glyph.EventProtected, hasNavigationSymbolId:=False),
                      Item("E2", Glyph.EventPrivate, hasNavigationSymbolId:=False)}),
                 Item("T", Glyph.ClassInternal, bolded:=True, children:={
-                     Item(NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
+                     Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
                      Item("Finalize", Glyph.MethodProtected, hasNavigationSymbolId:=False)}),
                 Item("c", Glyph.FieldPrivate, hasNavigationSymbolId:=False, indent:=1, children:={
                      Item("E0", Glyph.EventPublic, hasNavigationSymbolId:=False)}))
@@ -762,7 +762,7 @@ End Class
                     </Project>
                 </Workspace>,
                 Item("C", Glyph.ClassInternal, children:={
-                    Item(NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
+                    Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
                     Item("Finalize", Glyph.MethodProtected, hasNavigationSymbolId:=False),
                     Item("BindingError", Glyph.EventPublic, hasNavigationSymbolId:=True, bolded:=True)},
                     bolded:=True))
@@ -837,7 +837,7 @@ End Class
                     </Project>
                 </Workspace>,
                 Item("Base", Glyph.ClassPublic, children:={
-                    Item(NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
+                    Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
                     Item("Finalize", Glyph.MethodProtected, hasNavigationSymbolId:=False)},
                     bolded:=True),
                 Item("o1", Glyph.FieldPublic, children:={
@@ -851,7 +851,7 @@ End Class
                      hasNavigationSymbolId:=False,
                      indent:=1),
                 Item("Class1 (Base)", Glyph.ClassPublic, children:={
-                     Item(NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
+                     Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, hasNavigationSymbolId:=False),
                      Item("Finalize", Glyph.MethodProtected, hasNavigationSymbolId:=False),
                      Item("Ev_Event", Glyph.EventPublic, bolded:=True)},
                      bolded:=True),
@@ -1066,7 +1066,7 @@ End Class
                     </Project>
                 </Workspace>,
                 Item("C", Glyph.ClassInternal, bolded:=True, children:={
-                    Item(NavigationItemNew, Glyph.MethodPublic, bolded:=False, hasNavigationSymbolId:=False),
+                    Item(VBEditorResources.NavigationItemNew, Glyph.MethodPublic, bolded:=False, hasNavigationSymbolId:=False),
                     Item("Finalize", Glyph.MethodProtected, bolded:=False, hasNavigationSymbolId:=False),
                     Item("Get_P", Glyph.MethodPublic, bolded:=True),
                     Item("P", Glyph.PropertyPublic, bolded:=True)}))

src/EditorFeatures/VisualBasic/BasicEditorFeatures.vbproj

@@ -244,7 +244,7 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="VBEditorResources.resx">
-      <CustomToolNamespace>Microsoft.CodeAnalysis.Editor.VisualBasic</CustomToolNamespace>
+      <CustomToolNamespace>Microsoft.CodeAnalysis.Editor.VisualBasic.VBEditorResources</CustomToolNamespace>
       <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
       <LastGenOutput>VBEditorResources.Designer.vb</LastGenOutput>
       <SubType>Designer</SubType>

src/EditorFeatures/VisualBasic/VBEditorResources.Designer.vb

@@ -13,7 +13,7 @@ Option Explicit On
 
 Imports System
 
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic
+Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.VBEditorResources
     
     'This class was auto-generated by the StronglyTypedResourceBuilder
     'class via a tool like ResGen or Visual Studio.

src/EditorFeatures/VisualBasicTest/EndConstructGeneration/MethodBlockTests.vb

@@ -49,10 +49,10 @@ End Class",
 Class c1
     Sub New()
 
-        ' {ThisCallIsRequiredByTheDesigner}
+        ' {VBEditorResources.ThisCallIsRequiredByTheDesigner}
         InitializeComponent()
 
-        ' {AddAnyInitializationAfter}
+        ' {VBEditorResources.AddAnyInitializationAfter}
 
     End Sub
 

src/EditorFeatures/VisualBasicTest/QuickInfo/SemanticQuickInfoSourceTests.vb

@@ -1076,23 +1076,23 @@ End Module
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestBinaryConditionalExpression() As Task
             Await TestInMethodAsync("Dim x = If$$(True, False)",
-                MainDescription($"If({Expression1}, {ExpressionIfNothing}) As Boolean"),
-                Documentation(ExpressionEvalReturns))
+                MainDescription($"If({VBWorkspaceResources.Expression1}, {VBWorkspaceResources.ExpressionIfNothing}) As Boolean"),
+                Documentation(VBWorkspaceResources.ExpressionEvalReturns))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestTernaryConditionalExpression() As Task
             Await TestInMethodAsync("Dim x = If$$(True, ""Foo"", ""Bar"")",
-                MainDescription($"If({Condition} As Boolean, {ExpressionIfTrue}, {ExpressionIfFalse}) As String"),
-                Documentation(IfConditionReturnsResults))
+                MainDescription($"If({VBWorkspaceResources.Condition} As Boolean, {VBWorkspaceResources.ExpressionIfTrue}, {VBWorkspaceResources.ExpressionIfFalse}) As String"),
+                Documentation(VBWorkspaceResources.IfConditionReturnsResults))
         End Function
 
         <WorkItem(957082, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/957082")>
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestAddHandlerStatement() As Task
             Await TestInMethodAsync("$$AddHandler foo, bar",
-                MainDescription($"AddHandler {Event1}, {Handler}"),
-                Documentation(AssociatesAnEvent),
+                MainDescription($"AddHandler {VBWorkspaceResources.Event1}, {VBWorkspaceResources.Handler}"),
+                Documentation(VBWorkspaceResources.AssociatesAnEvent),
                 SymbolGlyph(Glyph.Keyword))
         End Function
 
@@ -1100,8 +1100,8 @@ End Module
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestRemoveHandlerStatement() As Task
             Await TestInMethodAsync("$$RemoveHandler foo, bar",
-                MainDescription($"RemoveHandler {Event1}, {Handler}"),
-                Documentation(RemovesEventAssociation),
+                MainDescription($"RemoveHandler {VBWorkspaceResources.Event1}, {VBWorkspaceResources.Handler}"),
+                Documentation(VBWorkspaceResources.RemovesEventAssociation),
                 SymbolGlyph(Glyph.Keyword))
         End Function
 
@@ -1109,7 +1109,7 @@ End Module
         Public Async Function TestGetTypeExpression() As Task
             Await TestInMethodAsync("Dim x = GetType$$(String)",
                 MainDescription("GetType(String) As Type"),
-                Documentation(ReturnsSystemTypeObject))
+                Documentation(VBWorkspaceResources.ReturnsSystemTypeObject))
         End Function
 
         <WorkItem(544140, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544140")>
@@ -1124,155 +1124,155 @@ class C
 end class
                 </text>.NormalizedValue,
                 {GetType(System.Xml.XmlAttribute).Assembly.Location, GetType(System.Xml.Linq.XAttribute).Assembly.Location},
-                MainDescription($"GetXmlNamespace([{XmlNamespacePrefix}]) As Xml.Linq.XNamespace"),
-                Documentation(ReturnsXNamespaceObject))
+                MainDescription($"GetXmlNamespace([{VBWorkspaceResources.XmlNamespacePrefix}]) As Xml.Linq.XNamespace"),
+                Documentation(VBWorkspaceResources.ReturnsXNamespaceObject))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestTryCastExpression() As Task
             Await TestInMethodAsync("Dim x = TryCast$$(a, String)",
-                MainDescription($"TryCast({Expression1}, String) As String"),
-                Documentation(IntroducesSafeTypeConversion))
+                MainDescription($"TryCast({VBWorkspaceResources.Expression1}, String) As String"),
+                Documentation(VBWorkspaceResources.IntroducesSafeTypeConversion))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestDirectCastExpression() As Task
             Await TestInMethodAsync("Dim x = DirectCast$$(a, String)",
-                MainDescription($"DirectCast({Expression1}, String) As String"),
-                Documentation(IntroducesTypeConversion))
+                MainDescription($"DirectCast({VBWorkspaceResources.Expression1}, String) As String"),
+                Documentation(VBWorkspaceResources.IntroducesTypeConversion))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestCTypeCastExpression() As Task
             Await TestInMethodAsync("Dim x = CType$$(a, String)",
-                MainDescription($"CType({Expression1}, String) As String"),
-                Documentation(ReturnsConvertResult))
+                MainDescription($"CType({VBWorkspaceResources.Expression1}, String) As String"),
+                Documentation(VBWorkspaceResources.ReturnsConvertResult))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestCBoolExpression() As Task
             Await TestInMethodAsync("Dim x = CBool$$(a)",
-                MainDescription($"CBool({Expression1}) As Boolean"),
-                Documentation(String.Format(ConvertsToDataType, "Boolean")))
+                MainDescription($"CBool({VBWorkspaceResources.Expression1}) As Boolean"),
+                Documentation(String.Format(VBWorkspaceResources.ConvertsToDataType, "Boolean")))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestCByteExpression() As Task
             Await TestInMethodAsync("Dim x = CByte$$(a)",
-                MainDescription($"CByte({Expression1}) As Byte"),
-                Documentation(String.Format(ConvertsToDataType, "Byte")))
+                MainDescription($"CByte({VBWorkspaceResources.Expression1}) As Byte"),
+                Documentation(String.Format(VBWorkspaceResources.ConvertsToDataType, "Byte")))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestCCharExpression() As Task
             Await TestInMethodAsync("Dim x = CChar$$(a)",
-                MainDescription($"CChar({Expression1}) As Char"),
-                Documentation(String.Format(ConvertsToDataType, "Char")))
+                MainDescription($"CChar({VBWorkspaceResources.Expression1}) As Char"),
+                Documentation(String.Format(VBWorkspaceResources.ConvertsToDataType, "Char")))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestCDateExpression() As Task
             Await TestInMethodAsync("Dim x = CDate$$(a)",
-                MainDescription($"CDate({Expression1}) As Date"),
-                Documentation(String.Format(ConvertsToDataType, "Date")))
+                MainDescription($"CDate({VBWorkspaceResources.Expression1}) As Date"),
+                Documentation(String.Format(VBWorkspaceResources.ConvertsToDataType, "Date")))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestCDblExpression() As Task
             Await TestInMethodAsync("Dim x = CDbl$$(a)",
-                MainDescription($"CDbl({Expression1}) As Double"),
-                Documentation(String.Format(ConvertsToDataType, "Double")))
+                MainDescription($"CDbl({VBWorkspaceResources.Expression1}) As Double"),
+                Documentation(String.Format(VBWorkspaceResources.ConvertsToDataType, "Double")))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestCDecExpression() As Task
             Await TestInMethodAsync("Dim x = CDec$$(a)",
-                MainDescription($"CDec({Expression1}) As Decimal"),
-                Documentation(String.Format(ConvertsToDataType, "Decimal")))
+                MainDescription($"CDec({VBWorkspaceResources.Expression1}) As Decimal"),
+                Documentation(String.Format(VBWorkspaceResources.ConvertsToDataType, "Decimal")))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestCIntExpression() As Task
             Await TestInMethodAsync("Dim x = CInt$$(a)",
-                MainDescription($"CInt({Expression1}) As Integer"),
-                Documentation(String.Format(ConvertsToDataType, "Integer")))
+                MainDescription($"CInt({VBWorkspaceResources.Expression1}) As Integer"),
+                Documentation(String.Format(VBWorkspaceResources.ConvertsToDataType, "Integer")))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestCLngExpression() As Task
             Await TestInMethodAsync("Dim x = CLng$$(a)",
-                MainDescription($"CLng({Expression1}) As Long"),
-                Documentation(String.Format(ConvertsToDataType, "Long")))
+                MainDescription($"CLng({VBWorkspaceResources.Expression1}) As Long"),
+                Documentation(String.Format(VBWorkspaceResources.ConvertsToDataType, "Long")))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestCObjExpression() As Task
             Await TestInMethodAsync("Dim x = CObj$$(a)",
-                MainDescription($"CObj({Expression1}) As Object"),
-                Documentation(String.Format(ConvertsToDataType, "Object")))
+                MainDescription($"CObj({VBWorkspaceResources.Expression1}) As Object"),
+                Documentation(String.Format(VBWorkspaceResources.ConvertsToDataType, "Object")))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestCSByteExpression() As Task
             Await TestInMethodAsync("Dim x = CSByte$$(a)",
-                MainDescription($"CSByte({Expression1}) As SByte"),
-                Documentation(String.Format(ConvertsToDataType, "SByte")))
+                MainDescription($"CSByte({VBWorkspaceResources.Expression1}) As SByte"),
+                Documentation(String.Format(VBWorkspaceResources.ConvertsToDataType, "SByte")))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestCShortExpression() As Task
             Await TestInMethodAsync("Dim x = CShort$$(a)",
-                MainDescription($"CShort({Expression1}) As Short"),
-                Documentation(String.Format(ConvertsToDataType, "Short")))
+                MainDescription($"CShort({VBWorkspaceResources.Expression1}) As Short"),
+                Documentation(String.Format(VBWorkspaceResources.ConvertsToDataType, "Short")))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestCSngExpression() As Task
             Await TestInMethodAsync("Dim x = CSng$$(a)",
-                MainDescription($"CSng({Expression1}) As Single"),
-                Documentation(String.Format(ConvertsToDataType, "Single")))
+                MainDescription($"CSng({VBWorkspaceResources.Expression1}) As Single"),
+                Documentation(String.Format(VBWorkspaceResources.ConvertsToDataType, "Single")))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestCStrExpression() As Task
             Await TestInMethodAsync("Dim x = CStr$$(a)",
-                MainDescription($"CStr({Expression1}) As String"),
-                Documentation(String.Format(ConvertsToDataType, "String")))
+                MainDescription($"CStr({VBWorkspaceResources.Expression1}) As String"),
+                Documentation(String.Format(VBWorkspaceResources.ConvertsToDataType, "String")))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestCUIntExpression() As Task
             Await TestInMethodAsync("Dim x = CUInt$$(a)",
-                MainDescription($"CUInt({Expression1}) As UInteger"),
-                Documentation(String.Format(ConvertsToDataType, "UInteger")))
+                MainDescription($"CUInt({VBWorkspaceResources.Expression1}) As UInteger"),
+                Documentation(String.Format(VBWorkspaceResources.ConvertsToDataType, "UInteger")))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestCULngExpression() As Task
             Await TestInMethodAsync("Dim x = CULng$$(a)",
-                MainDescription($"CULng({Expression1}) As ULong"),
-                Documentation(String.Format(ConvertsToDataType, "ULong")))
+                MainDescription($"CULng({VBWorkspaceResources.Expression1}) As ULong"),
+                Documentation(String.Format(VBWorkspaceResources.ConvertsToDataType, "ULong")))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestCUShortExpression() As Task
             Await TestInMethodAsync("Dim x = CUShort$$(a)",
-                MainDescription($"CUShort({Expression1}) As UShort"),
-                Documentation(String.Format(ConvertsToDataType, "UShort")))
+                MainDescription($"CUShort({VBWorkspaceResources.Expression1}) As UShort"),
+                Documentation(String.Format(VBWorkspaceResources.ConvertsToDataType, "UShort")))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestMidAssignmentStatement1() As Task
             Await TestInMethodAsync("$$Mid(""foo"", 0) = ""bar""",
-                MainDescription($"Mid({StringName}, {StartIndex}, [{Length}]) = {StringExpression}"),
-                Documentation(ReplacesChars))
+                MainDescription($"Mid({VBWorkspaceResources.StringName}, {VBWorkspaceResources.StartIndex}, [{VBWorkspaceResources.Length}]) = {VBWorkspaceResources.StringExpression}"),
+                Documentation(VBWorkspaceResources.ReplacesChars))
         End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.QuickInfo)>
         Public Async Function TestMidAssignmentStatement2() As Task
             Await TestInMethodAsync("$$Mid(""foo"", 0, 0) = ""bar""",
-                MainDescription($"Mid({StringName}, {StartIndex}, [{Length}]) = {StringExpression}"),
-                Documentation(ReplacesChars))
+                MainDescription($"Mid({VBWorkspaceResources.StringName}, {VBWorkspaceResources.StartIndex}, [{VBWorkspaceResources.Length}]) = {VBWorkspaceResources.StringExpression}"),
+                Documentation(VBWorkspaceResources.ReplacesChars))
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.QuickInfo)>

src/EditorFeatures/VisualBasicTest/Recommendations/EventHandling/AddHandlerKeywordRecommenderTests.vb

@@ -9,8 +9,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.Ev
         Public Async Function AddHandlerHelpTextTest() As Task
             Await VerifyRecommendationDescriptionTextIsAsync(<MethodBody>|</MethodBody>, "AddHandler",
 $"{VBFeaturesResources.AddhandlerStatement}
-{AssociatesAnEvent}
-AddHandler {Event1}, {Handler}")
+{VBWorkspaceResources.AssociatesAnEvent}
+AddHandler {VBWorkspaceResources.Event1}, {VBWorkspaceResources.Handler}")
         End Function
 
         <Fact>

src/EditorFeatures/VisualBasicTest/Recommendations/EventHandling/RemoveHandlerKeywordRecommenderTests.vb

@@ -9,8 +9,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.Ev
         Public Async Function RemoveHandlerHelpTextTest() As Task
             Await VerifyRecommendationDescriptionTextIsAsync(<MethodBody>|</MethodBody>, "RemoveHandler",
 $"{VBFeaturesResources.RemovehandlerStatement}
-{RemovesEventAssociation}
-RemoveHandler {Event1}, {Handler}")
+{VBWorkspaceResources.RemovesEventAssociation}
+RemoveHandler {VBWorkspaceResources.Event1}, {VBWorkspaceResources.Handler}")
         End Function
 
         <Fact>

src/EditorFeatures/VisualBasicTest/Recommendations/Expressions/CastOperatorsKeywordRecommenderTests.vb

@@ -20,32 +20,32 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.Ex
         Public Async Function DirectCastHelpTextTest() As Task
             Await VerifyRecommendationDescriptionTextIsAsync(<MethodBody>Return |</MethodBody>, "DirectCast",
 $"{VBFeaturesResources.DirectcastFunction}
-{IntroducesTypeConversion}
-DirectCast({Expression1}, {VBWorkspaceResources.Typename}) As {Result}")
+{VBWorkspaceResources.IntroducesTypeConversion}
+DirectCast({VBWorkspaceResources.Expression1}, {VBWorkspaceResources.Typename}) As {VBWorkspaceResources.Result}")
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)>
         Public Async Function TryCastHelpTextTest() As Task
             Await VerifyRecommendationDescriptionTextIsAsync(<MethodBody>Return |</MethodBody>, "TryCast",
 $"{VBFeaturesResources.TrycastFunction}
-{IntroducesSafeTypeConversion}
-TryCast({Expression1}, {VBWorkspaceResources.Typename}) As {Result}")
+{VBWorkspaceResources.IntroducesSafeTypeConversion}
+TryCast({VBWorkspaceResources.Expression1}, {VBWorkspaceResources.Typename}) As {VBWorkspaceResources.Result}")
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)>
         Public Async Function CTypeHelpTextTest() As Task
             Await VerifyRecommendationDescriptionTextIsAsync(<MethodBody>Return |</MethodBody>, "CType",
 $"{VBFeaturesResources.CtypeFunction}
-{ReturnsConvertResult}
-CType({Expression1}, {VBWorkspaceResources.Typename}) As {Result}")
+{VBWorkspaceResources.ReturnsConvertResult}
+CType({VBWorkspaceResources.Expression1}, {VBWorkspaceResources.Typename}) As {VBWorkspaceResources.Result}")
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)>
         Public Async Function CBoolHelpTextTest() As Task
             Await VerifyRecommendationDescriptionTextIsAsync(<MethodBody>Return |</MethodBody>, "CBool",
 $"{String.Format(VBFeaturesResources.Function1, "CBool")}
-{String.Format(ConvertsToDataType, "Boolean")}
-CBool({Expression1}) As Boolean")
+{String.Format(VBWorkspaceResources.ConvertsToDataType, "Boolean")}
+CBool({VBWorkspaceResources.Expression1}) As Boolean")
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)>

src/EditorFeatures/VisualBasicTest/Recommendations/Expressions/GetTypeKeywordRecommenderTests.vb

@@ -6,7 +6,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.Ex
         Public Async Function GetTypeHelpTextTest() As Task
             Await VerifyRecommendationDescriptionTextIsAsync(<MethodBody>Return |</MethodBody>, "GetType",
 $"{VBFeaturesResources.GettypeFunction}
-{ReturnsSystemTypeObject}
+{VBWorkspaceResources.ReturnsSystemTypeObject}
 GetType({VBWorkspaceResources.Typename}) As Type")
         End Function
 

src/EditorFeatures/VisualBasicTest/Recommendations/Expressions/GetXmlNamespaceKeywordRecommenderTests.vb

@@ -6,8 +6,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.Ex
         Public Async Function GetXmlNamespaceHelpTextTest() As Task
             Await VerifyRecommendationDescriptionTextIsAsync(<MethodBody>Return |</MethodBody>, "GetXmlNamespace",
 $"{VBFeaturesResources.GetxmlnamespaceFunction}
-{ReturnsXNamespaceObject}
-GetXmlNamespace([{XmlNamespacePrefix}]) As System.Xml.Linq.XNamespace")
+{VBWorkspaceResources.ReturnsXNamespaceObject}
+GetXmlNamespace([{VBWorkspaceResources.XmlNamespacePrefix}]) As System.Xml.Linq.XNamespace")
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)>

src/EditorFeatures/VisualBasicTest/Recommendations/Expressions/IfKeywordRecommenderTests.vb

@@ -6,8 +6,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.Ex
         Public Async Function IfHelpTextTest() As Task
             Await VerifyRecommendationDescriptionTextIsAsync(<MethodBody>Return |</MethodBody>, "If",
 $"{String.Format(VBFeaturesResources.Function1, "If")} (+1 {FeaturesResources.Overload})
-{IfConditionReturnsResults}
-If({Condition} As Boolean, {ExpressionIfTrue}, {ExpressionIfFalse}) As {Result}")
+{VBWorkspaceResources.IfConditionReturnsResults}
+If({VBWorkspaceResources.Condition} As Boolean, {VBWorkspaceResources.ExpressionIfTrue}, {VBWorkspaceResources.ExpressionIfFalse}) As {VBWorkspaceResources.Result}")
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)>

src/EditorFeatures/VisualBasicTest/Recommendations/Statements/MidKeywordRecommenderTests.vb

@@ -7,8 +7,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.St
         Public Async Function MidHelpTextTest() As Task
             Await VerifyRecommendationDescriptionTextIsAsync(<MethodBody>|</MethodBody>, "Mid",
 $"{VBFeaturesResources.MidStatement}
-{ReplacesChars}
-Mid({StringName}, {StartIndex}, [{Length}]) = {StringExpression}")
+{VBWorkspaceResources.ReplacesChars}
+Mid({VBWorkspaceResources.StringName}, {VBWorkspaceResources.StartIndex}, [{VBWorkspaceResources.Length}]) = {VBWorkspaceResources.StringExpression}")
         End Function
 
         <Fact>

src/EditorFeatures/VisualBasicTest/SignatureHelp/AddRemoveHandlerSignatureHelpProviderTests.vb

@@ -29,9 +29,9 @@ End Class
 
             Dim expectedOrderedItems = New List(Of SignatureHelpTestItem)()
             expectedOrderedItems.Add(New SignatureHelpTestItem(
-                                     $"AddHandler {Event1}, {Handler}",
-                                     AssociatesAnEvent,
-                                     EventToAssociate,
+                                     $"AddHandler {VBWorkspaceResources.Event1}, {VBWorkspaceResources.Handler}",
+                                     VBWorkspaceResources.AssociatesAnEvent,
+                                     VBWorkspaceResources.EventToAssociate,
                                      currentParameterIndex:=0))
 
             Await TestAsync(markup, expectedOrderedItems)
@@ -49,9 +49,9 @@ End Class
 
             Dim expectedOrderedItems = New List(Of SignatureHelpTestItem)()
             expectedOrderedItems.Add(New SignatureHelpTestItem(
-                                     $"AddHandler {Event1}, {Handler}",
-                                     AssociatesAnEvent,
-                                     EventHandlerToAssociate,
+                                     $"AddHandler {VBWorkspaceResources.Event1}, {VBWorkspaceResources.Handler}",
+                                     VBWorkspaceResources.AssociatesAnEvent,
+                                     VBWorkspaceResources.EventHandlerToAssociate,
                                      currentParameterIndex:=1))
 
             Await TestAsync(markup, expectedOrderedItems)
@@ -71,9 +71,9 @@ End Class
 
             Dim expectedOrderedItems = New List(Of SignatureHelpTestItem)()
             expectedOrderedItems.Add(New SignatureHelpTestItem(
-                                     $"RemoveHandler {Event1}, {Handler}",
-                                     RemovesEventAssociation,
-                                     EventToDisassociate,
+                                     $"RemoveHandler {VBWorkspaceResources.Event1}, {VBWorkspaceResources.Handler}",
+                                     VBWorkspaceResources.RemovesEventAssociation,
+                                     VBWorkspaceResources.EventToDisassociate,
                                      currentParameterIndex:=0))
 
             Await TestAsync(markup, expectedOrderedItems)
@@ -91,9 +91,9 @@ End Class
 
             Dim expectedOrderedItems = New List(Of SignatureHelpTestItem)()
             expectedOrderedItems.Add(New SignatureHelpTestItem(
-                                     $"RemoveHandler {Event1}, {Handler}",
-                                     RemovesEventAssociation,
-                                     EventHandlerToDisassociate,
+                                     $"RemoveHandler {VBWorkspaceResources.Event1}, {VBWorkspaceResources.Handler}",
+                                     VBWorkspaceResources.RemovesEventAssociation,
+                                     VBWorkspaceResources.EventHandlerToDisassociate,
                                      currentParameterIndex:=1))
 
             Await TestAsync(markup, expectedOrderedItems)

src/EditorFeatures/VisualBasicTest/SignatureHelp/CastExpressionSignatureHelpProviderTests.vb

@@ -29,9 +29,9 @@ End Class
 
             Dim expectedOrderedItems = New List(Of SignatureHelpTestItem)()
             expectedOrderedItems.Add(New SignatureHelpTestItem(
-                                     $"CType({Expression1}, {VBWorkspaceResources.Typename}) As {Result}",
-                                     ReturnsConvertResult,
-                                     ExpressionToConvert,
+                                     $"CType({VBWorkspaceResources.Expression1}, {VBWorkspaceResources.Typename}) As {VBWorkspaceResources.Result}",
+                                     VBWorkspaceResources.ReturnsConvertResult,
+                                     VBWorkspaceResources.ExpressionToConvert,
                                      currentParameterIndex:=0))
 
             Await TestAsync(markup, expectedOrderedItems)
@@ -49,9 +49,9 @@ End Class
 
             Dim expectedOrderedItems = New List(Of SignatureHelpTestItem)()
             expectedOrderedItems.Add(New SignatureHelpTestItem(
-                                     $"CType({Expression1}, {VBWorkspaceResources.Typename}) As {Result}",
-                                     ReturnsConvertResult,
-                                     NameOfTypeToConvert,
+                                     $"CType({VBWorkspaceResources.Expression1}, {VBWorkspaceResources.Typename}) As {VBWorkspaceResources.Result}",
+                                     VBWorkspaceResources.ReturnsConvertResult,
+                                     VBWorkspaceResources.NameOfTypeToConvert,
                                      currentParameterIndex:=1))
 
             Await TestAsync(markup, expectedOrderedItems)
@@ -70,9 +70,9 @@ End Class
 
             Dim expectedOrderedItems = New List(Of SignatureHelpTestItem)()
             expectedOrderedItems.Add(New SignatureHelpTestItem(
-                                     $"DirectCast({Expression1}, {VBWorkspaceResources.Typename}) As {Result}",
-                                     IntroducesTypeConversion,
-                                     ExpressionToConvert,
+                                     $"DirectCast({VBWorkspaceResources.Expression1}, {VBWorkspaceResources.Typename}) As {VBWorkspaceResources.Result}",
+                                     VBWorkspaceResources.IntroducesTypeConversion,
+                                     VBWorkspaceResources.ExpressionToConvert,
                                      currentParameterIndex:=0))
 
             Await TestAsync(markup, expectedOrderedItems)
@@ -91,9 +91,9 @@ End Class
 
             Dim expectedOrderedItems = New List(Of SignatureHelpTestItem)()
             expectedOrderedItems.Add(New SignatureHelpTestItem(
-                                     $"TryCast({Expression1}, {VBWorkspaceResources.Typename}) As {Result}",
-                                     IntroducesSafeTypeConversion,
-                                     ExpressionToConvert,
+                                     $"TryCast({VBWorkspaceResources.Expression1}, {VBWorkspaceResources.Typename}) As {VBWorkspaceResources.Result}",
+                                     VBWorkspaceResources.IntroducesSafeTypeConversion,
+                                     VBWorkspaceResources.ExpressionToConvert,
                                      currentParameterIndex:=0))
 
             Await TestAsync(markup, expectedOrderedItems)

src/EditorFeatures/VisualBasicTest/SignatureHelp/ConditionalExpressionSignatureHelpProviderTests.vb

@@ -29,14 +29,14 @@ End Class
 
             Dim expectedOrderedItems = New List(Of SignatureHelpTestItem)()
             expectedOrderedItems.Add(New SignatureHelpTestItem(
-                                     $"If({Expression1}, {ExpressionIfNothing}) As {Result}",
-                                     ExpressionEvalReturns,
-                                     ReturnedIfINotNothing,
+                                     $"If({VBWorkspaceResources.Expression1}, {VBWorkspaceResources.ExpressionIfNothing}) As {VBWorkspaceResources.Result}",
+                                     VBWorkspaceResources.ExpressionEvalReturns,
+                                     VBWorkspaceResources.ReturnedIfINotNothing,
                                      currentParameterIndex:=0))
             expectedOrderedItems.Add(New SignatureHelpTestItem(
-                                     $"If({Condition} As Boolean, {ExpressionIfTrue}, {ExpressionIfFalse}) As {Result}",
-                                     IfConditionReturnsResults,
-                                     ExpressionToEvaluate,
+                                     $"If({VBWorkspaceResources.Condition} As Boolean, {VBWorkspaceResources.ExpressionIfTrue}, {VBWorkspaceResources.ExpressionIfFalse}) As {VBWorkspaceResources.Result}",
+                                     VBWorkspaceResources.IfConditionReturnsResults,
+                                     VBWorkspaceResources.ExpressionToEvaluate,
                                      currentParameterIndex:=0))
             Await TestAsync(markup, expectedOrderedItems)
         End Function
@@ -53,14 +53,14 @@ End Class
 
             Dim expectedOrderedItems = New List(Of SignatureHelpTestItem)()
             expectedOrderedItems.Add(New SignatureHelpTestItem(
-                                     $"If({Expression1}, {ExpressionIfNothing}) As {Result}",
-                                     ExpressionEvalReturns,
-                                     ReturnedIfNothing,
+                                     $"If({VBWorkspaceResources.Expression1}, {VBWorkspaceResources.ExpressionIfNothing}) As {VBWorkspaceResources.Result}",
+                                     VBWorkspaceResources.ExpressionEvalReturns,
+                                     VBWorkspaceResources.ReturnedIfNothing,
                                      currentParameterIndex:=1))
             expectedOrderedItems.Add(New SignatureHelpTestItem(
-                                     $"If({Condition} As Boolean, {ExpressionIfTrue}, {ExpressionIfFalse}) As {Result}",
-                                     IfConditionReturnsResults,
-                                     EvaluatedAndReturnedIfTrue,
+                                     $"If({VBWorkspaceResources.Condition} As Boolean, {VBWorkspaceResources.ExpressionIfTrue}, {VBWorkspaceResources.ExpressionIfFalse}) As {VBWorkspaceResources.Result}",
+                                     VBWorkspaceResources.IfConditionReturnsResults,
+                                     VBWorkspaceResources.EvaluatedAndReturnedIfTrue,
                                      currentParameterIndex:=1))
             Await TestAsync(markup, expectedOrderedItems)
         End Function

src/EditorFeatures/VisualBasicTest/SignatureHelp/FunctionAggregationSignatureHelpProviderTests.vb

@@ -32,7 +32,7 @@ End Module
 
             Dim expectedOrderedItems = New List(Of SignatureHelpTestItem)()
             expectedOrderedItems.Add(New SignatureHelpTestItem($"<{VBFeaturesResources.Extension}> Count() As Integer", String.Empty, Nothing, currentParameterIndex:=0))
-            expectedOrderedItems.Add(New SignatureHelpTestItem($"<{VBFeaturesResources.Extension}> Count({Expression1} As Boolean) As Integer", String.Empty, Nothing, currentParameterIndex:=0))
+            expectedOrderedItems.Add(New SignatureHelpTestItem($"<{VBFeaturesResources.Extension}> Count({VBWorkspaceResources.Expression1} As Boolean) As Integer", String.Empty, Nothing, currentParameterIndex:=0))
 
             Await TestAsync(markup, expectedOrderedItems)
         End Function

src/EditorFeatures/VisualBasicTest/SignatureHelp/GetTypeExpressionSignatureHelpProviderTests.vb

@@ -30,8 +30,8 @@ End Class
             Dim expectedOrderedItems = New List(Of SignatureHelpTestItem)()
             expectedOrderedItems.Add(New SignatureHelpTestItem(
                                      $"GetType({VBWorkspaceResources.Typename}) As System.Type",
-                                     ReturnsSystemTypeObject,
-                                     TypeToReturnObjectFor,
+                                     VBWorkspaceResources.ReturnsSystemTypeObject,
+                                     VBWorkspaceResources.TypeToReturnObjectFor,
                                      currentParameterIndex:=0))
             Await TestAsync(markup, expectedOrderedItems)
         End Function

src/EditorFeatures/VisualBasicTest/SignatureHelp/GetXmlNamespaceExpressionSignatureHelpProviderTests.vb

@@ -29,9 +29,9 @@ End Class
 
             Dim expectedOrderedItems = New List(Of SignatureHelpTestItem)()
             expectedOrderedItems.Add(New SignatureHelpTestItem(
-                                     $"GetXmlNamespace([{XmlNamespacePrefix}]) As System.Xml.Linq.XNamespace",
-                                     ReturnsXNamespaceObject,
-                                     XMLNSToReturnObjectFor,
+                                     $"GetXmlNamespace([{VBWorkspaceResources.XmlNamespacePrefix}]) As System.Xml.Linq.XNamespace",
+                                     VBWorkspaceResources.ReturnsXNamespaceObject,
+                                     VBWorkspaceResources.XMLNSToReturnObjectFor,
                                      currentParameterIndex:=0))
             Await TestAsync(markup, expectedOrderedItems)
         End Function

src/EditorFeatures/VisualBasicTest/SignatureHelp/MidAssignmentSignatureHelpProviderTests.vb

@@ -29,9 +29,9 @@ End Class
 
             Dim expectedOrderedItems = New List(Of SignatureHelpTestItem)()
             expectedOrderedItems.Add(New SignatureHelpTestItem(
-                                     $"Mid({StringName}, {StartIndex}, [{Length}]) = {StringExpression}",
-                                     ReplacesChars,
-                                     NameOfStringVariable,
+                                     $"Mid({VBWorkspaceResources.StringName}, {VBWorkspaceResources.StartIndex}, [{VBWorkspaceResources.Length}]) = {VBWorkspaceResources.StringExpression}",
+                                     VBWorkspaceResources.ReplacesChars,
+                                     VBWorkspaceResources.NameOfStringVariable,
                                      currentParameterIndex:=0))
             Await TestAsync(markup, expectedOrderedItems)
             Await TestAsync(markup, expectedOrderedItems, usePreviousCharAsTrigger:=True)
@@ -49,9 +49,9 @@ End Class
 
             Dim expectedOrderedItems = New List(Of SignatureHelpTestItem)()
             expectedOrderedItems.Add(New SignatureHelpTestItem(
-                                     $"Mid({StringName}, {StartIndex}, [{Length}]) = {StringExpression}",
-                                     ReplacesChars,
-                                     OneBasedStartPos,
+                                     $"Mid({VBWorkspaceResources.StringName}, {VBWorkspaceResources.StartIndex}, [{VBWorkspaceResources.Length}]) = {VBWorkspaceResources.StringExpression}",
+                                     VBWorkspaceResources.ReplacesChars,
+                                     VBWorkspaceResources.OneBasedStartPos,
                                      currentParameterIndex:=1))
             Await TestAsync(markup, expectedOrderedItems)
             Await TestAsync(markup, expectedOrderedItems, usePreviousCharAsTrigger:=True)
@@ -69,9 +69,9 @@ End Class
 
             Dim expectedOrderedItems = New List(Of SignatureHelpTestItem)()
             expectedOrderedItems.Add(New SignatureHelpTestItem(
-                                     $"Mid({StringName}, {StartIndex}, [{Length}]) = {StringExpression}",
-                                     ReplacesChars,
-                                     NumberOfCharsToReplace,
+                                     $"Mid({VBWorkspaceResources.StringName}, {VBWorkspaceResources.StartIndex}, [{VBWorkspaceResources.Length}]) = {VBWorkspaceResources.StringExpression}",
+                                     VBWorkspaceResources.ReplacesChars,
+                                     VBWorkspaceResources.NumberOfCharsToReplace,
                                      currentParameterIndex:=2))
             Await TestAsync(markup, expectedOrderedItems)
             Await TestAsync(markup, expectedOrderedItems, usePreviousCharAsTrigger:=True)

src/EditorFeatures/VisualBasicTest/SignatureHelp/PredefinedCastExpressionSignatureHelpProviderTests.vb

@@ -29,9 +29,9 @@ End Class
 
             Dim expectedOrderedItems = New List(Of SignatureHelpTestItem)()
             expectedOrderedItems.Add(New SignatureHelpTestItem(
-                                     $"CBool({Expression1}) As Boolean",
-                                     String.Format(ConvertsToDataType, "Boolean"),
-                                     ExpressionToConvert,
+                                     $"CBool({VBWorkspaceResources.Expression1}) As Boolean",
+                                     String.Format(VBWorkspaceResources.ConvertsToDataType, "Boolean"),
+                                     VBWorkspaceResources.ExpressionToConvert,
                                      currentParameterIndex:=0))
             Await TestAsync(markup, expectedOrderedItems)
         End Function

src/Workspaces/VisualBasic/Portable/BasicWorkspace.vbproj

@@ -256,7 +256,7 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="VBWorkspaceResources.resx">
-      <CustomToolNamespace>Microsoft.CodeAnalysis.VisualBasic</CustomToolNamespace>
+      <CustomToolNamespace>Microsoft.CodeAnalysis.VisualBasic.VBWorkspaceResources</CustomToolNamespace>
       <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
       <LastGenOutput>VBWorkspaceResources.Designer.vb</LastGenOutput>
     </EmbeddedResource>

src/Workspaces/VisualBasic/Portable/Utilities/IntrinsicOperators/AbstractIntrinsicOperatorDocumentation.vb

@@ -59,7 +59,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Utilities.IntrinsicOperators
                     Return suffixParts
                 End If
 
-                suffixParts.Add(New SymbolDisplayPart(SymbolDisplayPartKind.Text, Nothing, Result))
+                suffixParts.Add(New SymbolDisplayPart(SymbolDisplayPartKind.Text, Nothing, VBWorkspaceResources.Result))
             End If
 
             Return suffixParts

src/Workspaces/VisualBasic/Portable/VBWorkspaceResources.Designer.vb

 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:4.0.30319.0
+'     Runtime Version:4.0.30319.42000
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -14,8 +14,8 @@ Option Explicit On
 Imports System
 Imports System.Reflection
 
-Namespace Microsoft.CodeAnalysis.VisualBasic
-    
+Namespace Microsoft.CodeAnalysis.VisualBasic.VBWorkspaceResources
+
     'This class was auto-generated by the StronglyTypedResourceBuilder
     'class via a tool like ResGen or Visual Studio.
     'To add or remove a member, edit your .ResX file then rerun ResGen
@@ -23,20 +23,20 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
     '''<summary>
     '''  A strongly-typed resource class, for looking up localized strings, etc.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"),  _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"),
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),
+     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>
     Friend Module VBWorkspaceResources
-        
+
         Private resourceMan As Global.System.Resources.ResourceManager
-        
+
         Private resourceCulture As Global.System.Globalization.CultureInfo
-        
+
         '''<summary>
         '''  Returns the cached ResourceManager instance used by this class.
         '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
@@ -46,18 +46,18 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
                 Return resourceMan
             End Get
         End Property
-        
+
         '''<summary>
         '''  Overrides the current thread's CurrentUICulture property for all
         '''  resource lookups using this strongly typed resource class.
         '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>
         Friend Property Culture() As Global.System.Globalization.CultureInfo
             Get
                 Return resourceCulture
             End Get
             Set
-                resourceCulture = value
+                resourceCulture = Value
             End Set
         End Property