Ensure that an EnvDTE.CodeParameter.Name returns the correct value for...

Ensure that an EnvDTE.CodeParameter.Name returns the correct value for parameters defined in metadata

The issue is that the symbol display system will not return a name for a parameter unless
SymbolDisplayParameterOptions.IncludeName is set. This behavior seems like it might ultimately be
a bug in symbol display as that option is intended to control the display the parameters owned
by the targeted symbol, but probably shouldn't affect the display of the targeted symbol. However,
rather than updating symbol display (which would potentially have larger downstream impact), we'll
just include the option in this case.

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

@@ -58,14 +58,16 @@ internal partial class CSharpCodeModelService : AbstractCodeModelService
 
         private static readonly SymbolDisplayFormat s_externalNameFormat =
             new SymbolDisplayFormat(
-                miscellaneousOptions: SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers);
+                miscellaneousOptions: SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers,
+                parameterOptions: SymbolDisplayParameterOptions.IncludeName);
 
         private static readonly SymbolDisplayFormat s_externalFullNameFormat =
             new SymbolDisplayFormat(
                 typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces,
                 memberOptions: SymbolDisplayMemberOptions.IncludeContainingType | SymbolDisplayMemberOptions.IncludeExplicitInterface,
                 genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters,
-                miscellaneousOptions: SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers);
+                miscellaneousOptions: SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers,
+                parameterOptions: SymbolDisplayParameterOptions.IncludeName);
 
         private static readonly SymbolDisplayFormat s_setTypeFormat =
             new SymbolDisplayFormat(

src/VisualStudio/Core/Impl/CodeModel/ExternalElements/ExternalCodeParameter.cs

@@ -2,7 +2,6 @@
 
 using System.Runtime.InteropServices;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.LanguageServices.Implementation.Interop;
 using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
 

src/VisualStudio/Core/Test/CodeModel/AbstractCodeParameterTests.vb

@@ -2,7 +2,6 @@
 
 Imports EnvDTE
 Imports EnvDTE80
-Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions
 
 Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
     Public MustInherit Class AbstractCodeParameterTests

src/VisualStudio/Core/Test/CodeModel/CSharp/CodeParameterTests.vb

@@ -101,6 +101,55 @@ class C : System.Console
 
 #End Region
 
+#Region "Name tests"
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestName1() As Task
+            Dim code =
+<Code>
+class C
+{
+    void Foo(string $$s)
+    {
+    }
+}
+</Code>
+
+            Await TestName(code, "s")
+        End Function
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestName2() As Task
+            Dim code =
+<Code>
+class C
+{
+    void Foo(ref string $$s)
+    {
+    }
+}
+</Code>
+
+            Await TestName(code, "s")
+        End Function
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestName3() As Task
+            Dim code =
+<Code>
+class C
+{
+    void Foo(out string $$s)
+    {
+    }
+}
+</Code>
+
+            Await TestName(code, "s")
+        End Function
+
+#End Region
+
 #Region "FullName tests"
 
         <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
@@ -118,6 +167,36 @@ class C
             TestFullName(code, "s")
         End Sub
 
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestFullName2() As Task
+            Dim code =
+<Code>
+class C
+{
+    void Foo(ref string $$s)
+    {
+    }
+}
+</Code>
+
+            Await TestFullName(code, "s")
+        End Function
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestFullName3() As Task
+            Dim code =
+<Code>
+class C
+{
+    void Foo(out string $$s)
+    {
+    }
+}
+</Code>
+
+            Await TestFullName(code, "s")
+        End Function
+
 #End Region
 
 #Region "Kind tests"

src/VisualStudio/Core/Test/CodeModel/CSharp/ExternalCodeFunctionTests.vb

+Imports System.Threading.Tasks
+Imports Microsoft.CodeAnalysis
+Imports Roslyn.Test.Utilities
+
+Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel.CSharp
+    Public Class ExternalCodeFunctionTests
+        Inherits AbstractCodeFunctionTests
+
+#Region "FullName tests"
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestFullName1() As Task
+            Dim code =
+<Code>
+class C
+{
+    void $$Foo(string s)
+    {
+    }
+}
+</Code>
+
+            Await TestFullName(code, "C.Foo")
+        End Function
+
+#End Region
+
+#Region "Name tests"
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestName1() As Task
+            Dim code =
+<Code>
+class C
+{
+    void $$Foo(string s)
+    {
+    }
+}
+</Code>
+
+            Await TestName(code, "Foo")
+        End Function
+
+#End Region
+
+        Protected Overrides ReadOnly Property LanguageName As String = LanguageNames.CSharp
+        Protected Overrides ReadOnly Property TargetExternalCodeElements As Boolean = True
+
+    End Class
+End Namespace
\ No newline at end of file

src/VisualStudio/Core/Test/CodeModel/CSharp/ExternalCodeParameterTests.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.Threading.Tasks
+Imports Microsoft.CodeAnalysis
+Imports Roslyn.Test.Utilities
+
+Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel.CSharp
+    Public Class ExternalCodeParameterTests
+        Inherits AbstractCodeParameterTests
+
+#Region "FullName tests"
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestFullName1() As Task
+            Dim code =
+<Code>
+class C
+{
+    void Foo(string $$s)
+    {
+    }
+}
+</Code>
+
+            Await TestFullName(code, "s")
+        End Function
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestFullName2() As Task
+            Dim code =
+<Code>
+class C
+{
+    void Foo(ref string $$s)
+    {
+    }
+}
+</Code>
+
+            Await TestFullName(code, "s")
+        End Function
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestFullName3() As Task
+            Dim code =
+<Code>
+class C
+{
+    void Foo(out string $$s)
+    {
+    }
+}
+</Code>
+
+            Await TestFullName(code, "s")
+        End Function
+
+#End Region
+
+#Region "Name tests"
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestName1() As Task
+            Dim code =
+<Code>
+class C
+{
+    void Foo(string $$s)
+    {
+    }
+}
+</Code>
+
+            Await TestName(code, "s")
+        End Function
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestName2() As Task
+            Dim code =
+<Code>
+class C
+{
+    void Foo(ref string $$s)
+    {
+    }
+}
+</Code>
+
+            Await TestName(code, "s")
+        End Function
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestName3() As Task
+            Dim code =
+<Code>
+class C
+{
+    void Foo(out string $$s)
+    {
+    }
+}
+</Code>
+
+            Await TestName(code, "s")
+        End Function
+
+#End Region
+
+        Protected Overrides ReadOnly Property LanguageName As String = LanguageNames.CSharp
+        Protected Overrides ReadOnly Property TargetExternalCodeElements As Boolean = True
+
+    End Class
+End Namespace
\ No newline at end of file

src/VisualStudio/Core/Test/CodeModel/CodeModelTestHelpers.vb

@@ -8,6 +8,7 @@ Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
 Imports Microsoft.CodeAnalysis.Test.Utilities
 Imports Microsoft.VisualStudio.ComponentModelHost
 Imports Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel
+Imports Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.ExternalElements
 Imports Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.InternalElements
 Imports Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Interop
 Imports Microsoft.VisualStudio.LanguageServices.Implementation.Interop
@@ -173,6 +174,14 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
             Assert.True(codeElement IsNot Nothing, "Expected code element")
             Assert.True(codeElement.InfoLocation = EnvDTE.vsCMInfoLocation.vsCMInfoLocationProject, "Expected internal code element")
 
+            If TypeOf codeElement Is EnvDTE.CodeParameter Then
+                Dim codeParameter = DirectCast(codeElement, EnvDTE.CodeParameter)
+                Dim externalParentCodeElement = codeParameter.Parent.AsExternal()
+                Dim externalParentCodeElementImpl = ComAggregate.GetManagedObject(Of AbstractExternalCodeMember)(externalParentCodeElement)
+
+                Return DirectCast(externalParentCodeElementImpl.Parameters.Item(codeParameter.Name), T)
+            End If
+
             Dim codeElementImpl = ComAggregate.GetManagedObject(Of AbstractCodeElement)(codeElement)
             Dim state = codeElementImpl.State
             Dim projectId = codeElementImpl.FileCodeModel.GetProjectId()

src/VisualStudio/Core/Test/CodeModel/VisualBasic/ExternalCodeFunctionTests.vb

+Imports System.Threading.Tasks
+Imports Microsoft.CodeAnalysis
+Imports Roslyn.Test.Utilities
+
+Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel.CSharp.VisualBasic
+    Public Class ExternalCodeFunctionTests
+        Inherits AbstractCodeFunctionTests
+
+#Region "FullName tests"
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestFullName1() As Task
+            Dim code =
+<Code>
+Class C
+    Sub $$Foo(string s)
+    End Sub
+End Class
+</Code>
+
+            Await TestFullName(code, "C.Foo")
+        End Function
+
+#End Region
+
+#Region "Name tests"
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestName1() As Task
+            Dim code =
+<Code>
+Class C
+    Sub $$Foo(string s)
+    End Sub
+End Class
+</Code>
+
+            Await TestName(code, "Foo")
+        End Function
+
+#End Region
+
+        Protected Overrides ReadOnly Property LanguageName As String = LanguageNames.VisualBasic
+        Protected Overrides ReadOnly Property TargetExternalCodeElements As Boolean = True
+
+    End Class
+End Namespace
\ No newline at end of file

src/VisualStudio/Core/Test/CodeModel/VisualBasic/ExternalCodeParameterTests.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.Threading.Tasks
+Imports Microsoft.CodeAnalysis
+Imports Roslyn.Test.Utilities
+
+Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel.VisualBasic
+    Public Class ExternalCodeParameterTests
+        Inherits AbstractCodeParameterTests
+
+#Region "FullName tests"
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestFullName1() As Task
+            Dim code =
+<Code>
+Class C
+    Sub Foo($$s As String)
+    End Sub
+End Class
+</Code>
+
+            Await TestFullName(code, "s")
+        End Function
+#End Region
+
+#Region "Name tests"
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestName_NoModifiers() As Task
+            Dim code =
+<Code>
+Public Class C1
+
+   Public Sub S1($$p1 As Integer)
+   End Sub
+
+End Class
+</Code>
+
+            Await TestName(code, "p1")
+        End Function
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestName_ByValModifier() As Task
+            Dim code =
+<Code>
+Public Class C1
+
+   Public Sub S2(ByVal $$p2 As Integer)
+   End Sub
+
+End Class
+</Code>
+
+            Await TestName(code, "p2")
+        End Function
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestName_ByRefModifier() As Task
+            Dim code =
+<Code>
+Public Class C1
+
+   Public Sub S3(ByRef $$p3 As Integer)
+   End Sub
+
+End Class
+</Code>
+
+            Await TestName(code, "p3")
+        End Function
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestName_OptionalByValModifiers() As Task
+            Dim code =
+<Code>
+Public Class C1
+
+   Public Sub S4(Optional ByVal $$p4 As Integer = 0)
+   End Sub
+
+End Class
+</Code>
+
+            Await TestName(code, "p4")
+        End Function
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestName_ByValParamArrayModifiers() As Task
+            Dim code =
+<Code>
+Public Class C1
+
+   Public Sub S5(ByVal ParamArray $$p5() As Integer)
+   End Sub
+
+End Class
+</Code>
+
+            Await TestName(code, "p5")
+        End Function
+
+        <ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
+        Public Async Function TestName_TypeCharacter() As Task
+            Dim code =
+<Code>
+Public Class C1
+
+   Public Sub S6($$p6%)
+   End Sub
+
+End Class
+</Code>
+
+            Await TestName(code, "p6")
+        End Function
+
+#End Region
+
+        Protected Overrides ReadOnly Property LanguageName As String = LanguageNames.VisualBasic
+        Protected Overrides ReadOnly Property TargetExternalCodeElements As Boolean = True
+
+    End Class
+End Namespace
\ No newline at end of file

src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj

@@ -285,6 +285,8 @@
     <Compile Include="CodeModel\CSharp\CodeVariableTests.vb" />
     <Compile Include="CodeModel\CSharp\EventCollectorTests.vb" />
     <Compile Include="CodeModel\CSharp\ExternalCodeClassTests.vb" />
+    <Compile Include="CodeModel\CSharp\ExternalCodeFunctionTests.vb" />
+    <Compile Include="CodeModel\CSharp\ExternalCodeParameterTests.vb" />
     <Compile Include="CodeModel\CSharp\FileCodeModelTests.vb" />
     <Compile Include="CodeModel\CSharp\RootCodeModelTests.vb" />
     <Compile Include="CodeModel\CSharp\SyntaxNodeKeyTests.vb" />
@@ -319,6 +321,8 @@
     <Compile Include="CodeModel\VisualBasic\CodeVariableTests.vb" />
     <Compile Include="CodeModel\VisualBasic\EventCollectorTests.vb" />
     <Compile Include="CodeModel\VisualBasic\ExternalCodeClassTests.vb" />
+    <Compile Include="CodeModel\VisualBasic\ExternalCodeFunctionTests.vb" />
+    <Compile Include="CodeModel\VisualBasic\ExternalCodeParameterTests.vb" />
     <Compile Include="CodeModel\VisualBasic\FileCodeModelTests.vb" />
     <Compile Include="CodeModel\VisualBasic\ImplementsStatementTests.vb" />
     <Compile Include="CodeModel\VisualBasic\InheritsStatementTests.vb" />

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

@@ -56,14 +56,16 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.CodeModel
         Private Shared ReadOnly s_externalNameFormat As SymbolDisplayFormat =
             New SymbolDisplayFormat(
                 genericsOptions:=SymbolDisplayGenericsOptions.IncludeTypeParameters,
-                miscellaneousOptions:=SymbolDisplayMiscellaneousOptions.ExpandNullable)
+                miscellaneousOptions:=SymbolDisplayMiscellaneousOptions.ExpandNullable,
+                parameterOptions:=SymbolDisplayParameterOptions.IncludeName)
 
         Private Shared ReadOnly s_externalfullNameFormat As SymbolDisplayFormat =
             New SymbolDisplayFormat(
                 typeQualificationStyle:=SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces,
                 genericsOptions:=SymbolDisplayGenericsOptions.IncludeTypeParameters,
                 memberOptions:=SymbolDisplayMemberOptions.IncludeContainingType,
-                miscellaneousOptions:=SymbolDisplayMiscellaneousOptions.ExpandNullable)
+                miscellaneousOptions:=SymbolDisplayMiscellaneousOptions.ExpandNullable,
+                parameterOptions:=SymbolDisplayParameterOptions.IncludeName)
 
         Private Shared ReadOnly s_setTypeFormat As SymbolDisplayFormat =
             New SymbolDisplayFormat(