From 5963a66f9a47a038de27b3e7a717336ceaf88c0c Mon Sep 17 00:00:00 2001 From: VSadov Date: Wed, 20 Jul 2016 14:59:59 -0700 Subject: [PATCH] CR feedback on vb tuples binding --- .../CSharp/Portable/BoundTree/BoundNodes.xml | 2 +- .../Portable/Binding/Binder_Expressions.vb | 16 +- .../Portable/Binding/Binder_Symbols.vb | 4 +- .../Compilation/VisualBasicCompilation.vb | 52 ++++++- .../LocalRewriter_ObjectCreation.vb | 2 +- .../LocalRewriter_TupleLiteralExpression.vb | 12 +- .../SymbolDisplayVisitor.Types.vb | 10 +- .../Portable/Symbols/FieldSymbol.vb | 4 +- .../Portable/Symbols/NamedTypeSymbol.vb | 4 +- .../Portable/Symbols/PropertySymbol.vb | 1 - .../Symbols/Tuples/TupleErrorFieldSymbol.vb | 26 ++-- .../Symbols/Tuples/TupleEventSymbol.vb | 26 ++-- .../Symbols/Tuples/TupleFieldSymbol.vb | 36 ++--- .../Symbols/Tuples/TupleMethodSymbol.vb | 41 +++-- .../Symbols/Tuples/TupleParameterSymbol.vb | 8 +- .../Symbols/Tuples/TuplePropertySymbol.vb | 22 +-- .../Symbols/Tuples/TupleTypeSymbol.vb | 141 +++++++++--------- .../Symbols/Wrapped/WrappedEventSymbol.vb | 32 ++-- .../Symbols/Wrapped/WrappedFieldSymbol.vb | 36 ++--- .../Symbols/Wrapped/WrappedMethodSymbol.vb | 62 ++++---- .../Symbols/Wrapped/WrappedNamedTypeSymbol.vb | 52 +++---- .../Symbols/Wrapped/WrappedParameterSymbol.vb | 44 +++--- .../Symbols/Wrapped/WrappedPropertySymbol.vb | 36 ++--- .../Wrapped/WrappedTypeParameterSymbol.vb | 22 +-- .../Test/Emit/CodeGen/CodeGenTuples.vb | 43 +++--- .../Parser/ParseLanguageVersionTests.vb | 6 +- .../Test/Syntax/Scanner/ScannerTests.vb | 8 +- 27 files changed, 392 insertions(+), 356 deletions(-) diff --git a/src/Compilers/CSharp/Portable/BoundTree/BoundNodes.xml b/src/Compilers/CSharp/Portable/BoundTree/BoundNodes.xml index 8fd1e5d00c2..4c8f90ed049 100644 --- a/src/Compilers/CSharp/Portable/BoundTree/BoundNodes.xml +++ b/src/Compilers/CSharp/Portable/BoundTree/BoundNodes.xml @@ -1159,7 +1159,7 @@ diff --git a/src/Compilers/VisualBasic/Portable/Binding/Binder_Expressions.vb b/src/Compilers/VisualBasic/Portable/Binding/Binder_Expressions.vb index c8f28bf0aab..a660521ea52 100644 --- a/src/Compilers/VisualBasic/Portable/Binding/Binder_Expressions.vb +++ b/src/Compilers/VisualBasic/Portable/Binding/Binder_Expressions.vb @@ -327,7 +327,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic Dim elementNames As ArrayBuilder(Of String) = Nothing Dim countOfExplicitNames = 0 - ' prepare And check element names And types + ' prepare and check element names and types For i As Integer = 0 To numElements - 1 Dim argumentSyntax As SimpleArgumentSyntax = arguments(i) Dim name As String = Nothing @@ -382,14 +382,14 @@ Namespace Microsoft.CodeAnalysis.VisualBasic End Function ''' - ''' Returns the type to be used as a field type generates errors in case the type is not - ''' supported for tuple type fields. + ''' Returns the type to be used as a field type. + ''' Generates errors in case the type is not supported for tuple type fields. ''' - Private Function GetTupleFieldType(expression As BoundExpression, errorSyntax As VisualBasicSyntaxNode, diagnostics As DiagnosticBag, ByRef hasError As Boolean) As TypeSymbol + Private Shared Function GetTupleFieldType(expression As BoundExpression, errorSyntax As VisualBasicSyntaxNode, diagnostics As DiagnosticBag, ByRef hasError As Boolean) As TypeSymbol Dim expressionType As TypeSymbol = expression.Type If Not expression.HasErrors Then - If expression.Type IsNot Nothing Then + If expressionType IsNot Nothing Then If expressionType.SpecialType = SpecialType.System_Void Then expressionType = ErrorTypeSymbol.UnknownResultType hasError = True @@ -408,7 +408,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic Private Shared Sub CollectTupleFieldMemberNames(name As String, position As Integer, tupleSize As Integer, ByRef elementNames As ArrayBuilder(Of String)) ' add the name to the list - ' names would typically all be there Or none at all + ' names would typically all be there or none at all ' but in case we need to handle this in error cases If elementNames IsNot Nothing Then elementNames.Add(If(name, TupleTypeSymbol.TupleMemberName(position))) @@ -423,13 +423,13 @@ Namespace Microsoft.CodeAnalysis.VisualBasic End If End Sub - Private Shared Function CheckTupleMemberName(name As String, position As Integer, syntax As VisualBasicSyntaxNode, diagnostics As DiagnosticBag, uniqueFieldNames As PooledHashSet(Of String)) As Boolean + Private Shared Function CheckTupleMemberName(name As String, index As Integer, syntax As VisualBasicSyntaxNode, diagnostics As DiagnosticBag, uniqueFieldNames As PooledHashSet(Of String)) As Boolean Dim reserved As Integer = TupleTypeSymbol.IsElementNameReserved(name) If reserved = 0 Then Binder.ReportDiagnostic(diagnostics, syntax, ERRID.ERR_TupleReservedMemberNameAnyPosition, name) Return False - ElseIf reserved > 0 AndAlso reserved <> position + 1 Then + ElseIf reserved > 0 AndAlso reserved <> index + 1 Then Binder.ReportDiagnostic(diagnostics, syntax, ERRID.ERR_TupleReservedMemberName, name, reserved) Return False diff --git a/src/Compilers/VisualBasic/Portable/Binding/Binder_Symbols.vb b/src/Compilers/VisualBasic/Portable/Binding/Binder_Symbols.vb index dae5590997f..aad6ab5997a 100644 --- a/src/Compilers/VisualBasic/Portable/Binding/Binder_Symbols.vb +++ b/src/Compilers/VisualBasic/Portable/Binding/Binder_Symbols.vb @@ -732,8 +732,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic Dim locationsArray As ImmutableArray(Of Location) = locations.ToImmutableAndFree() If typesArray.Length < 2 Then - 'PROTOTYPE: tuples error ID - Dim diaginfo = diagnostics.Add(ERRID.ERR_TupleTooFewElements, syntax.GetLocation) + elementNames?.Free() + diagnostics.Add(ERRID.ERR_TupleTooFewElements, syntax.GetLocation) Return ErrorTypeSymbol.UnknownResultType End If diff --git a/src/Compilers/VisualBasic/Portable/Compilation/VisualBasicCompilation.vb b/src/Compilers/VisualBasic/Portable/Compilation/VisualBasicCompilation.vb index 2f32bbcdd2e..22b70ee8822 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/VisualBasicCompilation.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/VisualBasicCompilation.vb @@ -2594,12 +2594,60 @@ Namespace Microsoft.CodeAnalysis.VisualBasic End Function Protected Overrides Function CommonCreateTupleTypeSymbol(elementTypes As ImmutableArray(Of ITypeSymbol), elementNames As ImmutableArray(Of String)) As INamedTypeSymbol - Dim vbElementTypes = elementTypes.SelectAsArray(Function(t) t.EnsureVbSymbolOrNothing(Of TypeSymbol)(NameOf(elementTypes))) + If elementTypes.IsDefault Then + Throw New ArgumentNullException(NameOf(elementTypes)) + End If + + If elementTypes.Length <= 1 Then + Throw New ArgumentException(CodeAnalysisResources.TuplesNeedAtLeastTwoElements, NameOf(elementNames)) + End If + + CheckTupleElementNames(elementTypes.Length, elementNames) + + Dim typesBuilder = ArrayBuilder(Of TypeSymbol).GetInstance(elementTypes.Length) + For i As Integer = 0 To elementTypes.Length - 1 + If elementTypes(i) Is Nothing Then + Throw New ArgumentNullException($"{NameOf(elementTypes)}[{i}]") + End If - Return TupleTypeSymbol.Create(locationOpt:=Nothing, elementTypes:=vbElementTypes, elementLocations:=Nothing, elementNames:=elementNames, compilation:=Me) + typesBuilder.Add(elementTypes(i).EnsureVbSymbolOrNothing(Of TypeSymbol)($"{NameOf(elementTypes)}[{i}]")) + Next + + 'no location for the type declaration + Return TupleTypeSymbol.Create(locationOpt:=Nothing, elementTypes:=typesBuilder.ToImmutableAndFree(), elementLocations:=Nothing, elementNames:=elementNames, compilation:=Me) End Function + ''' + ''' Check that if any names are provided, their number matches the expected cardinality and they are not null. + ''' + Private Shared Sub CheckTupleElementNames(cardinality As Integer, elementNames As ImmutableArray(Of String)) + If Not elementNames.IsDefault Then + If elementNames.Length <> cardinality Then + Throw New ArgumentException(CodeAnalysisResources.TupleNamesAllOrNone, NameOf(elementNames)) + End If + + For i As Integer = 0 To elementNames.Length - 1 + If elementNames(i) Is Nothing Then + Throw New ArgumentNullException($"{NameOf(elementNames)}[{i}]") + End If + Next + End If + End Sub + Protected Overrides Function CommonCreateTupleTypeSymbol(underlyingType As INamedTypeSymbol, elementNames As ImmutableArray(Of String)) As INamedTypeSymbol + If underlyingType Is Nothing Then + Throw New ArgumentNullException(NameOf(underlyingType)) + End If + + Dim csharpUnderlyingTuple = underlyingType.EnsureVbSymbolOrNothing(Of NamedTypeSymbol)(NameOf(underlyingType)) + + Dim cardinality As Integer + If Not csharpUnderlyingTuple.IsTupleCompatible(cardinality) Then + Throw New ArgumentException(CodeAnalysisResources.TupleUnderlyingTypeMustBeTupleCompatible, NameOf(underlyingType)) + End If + + CheckTupleElementNames(cardinality, elementNames) + Return TupleTypeSymbol.Create( locationOpt:=Nothing, tupleCompatibleType:=underlyingType.EnsureVbSymbolOrNothing(Of NamedTypeSymbol)(NameOf(underlyingType)), diff --git a/src/Compilers/VisualBasic/Portable/Lowering/LocalRewriter/LocalRewriter_ObjectCreation.vb b/src/Compilers/VisualBasic/Portable/Lowering/LocalRewriter/LocalRewriter_ObjectCreation.vb index 4e82f0ad9d3..e95a1b85f0c 100644 --- a/src/Compilers/VisualBasic/Portable/Lowering/LocalRewriter/LocalRewriter_ObjectCreation.vb +++ b/src/Compilers/VisualBasic/Portable/Lowering/LocalRewriter/LocalRewriter_ObjectCreation.vb @@ -41,7 +41,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic _diagnostics.Add(result, useSiteDiagnostics) result = New BoundDirectCast(node.Syntax, result, conv, node.Type, Nothing) Else - Debug.Assert(node.Type = result.Type) + Debug.Assert(node.Type.IsSameTypeIgnoringCustomModifiers(result.Type)) End If End If diff --git a/src/Compilers/VisualBasic/Portable/Lowering/LocalRewriter/LocalRewriter_TupleLiteralExpression.vb b/src/Compilers/VisualBasic/Portable/Lowering/LocalRewriter/LocalRewriter_TupleLiteralExpression.vb index 5afe14c54e7..992df39555d 100644 --- a/src/Compilers/VisualBasic/Portable/Lowering/LocalRewriter/LocalRewriter_TupleLiteralExpression.vb +++ b/src/Compilers/VisualBasic/Portable/Lowering/LocalRewriter/LocalRewriter_TupleLiteralExpression.vb @@ -84,12 +84,12 @@ Namespace Microsoft.CodeAnalysis.VisualBasic End If - 'currentCreation = currentCreation.Update( - ' currentCreation.ConstructorOpt, - ' methodGroupOpt:=Nothing, - ' arguments:=currentCreation.Arguments, - ' initializerOpt:=currentCreation.InitializerOpt, - ' type:=type) + currentCreation = currentCreation.Update( + currentCreation.ConstructorOpt, + methodGroupOpt:=Nothing, + arguments:=currentCreation.Arguments, + initializerOpt:=currentCreation.InitializerOpt, + type:=type) Return currentCreation Finally diff --git a/src/Compilers/VisualBasic/Portable/SymbolDisplay/SymbolDisplayVisitor.Types.vb b/src/Compilers/VisualBasic/Portable/SymbolDisplay/SymbolDisplayVisitor.Types.vb index 9b8e625d28c..d48adaba0a1 100644 --- a/src/Compilers/VisualBasic/Portable/SymbolDisplay/SymbolDisplayVisitor.Types.vb +++ b/src/Compilers/VisualBasic/Portable/SymbolDisplay/SymbolDisplayVisitor.Types.vb @@ -304,7 +304,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic ''' ''' ''' - Private Function CanUseTupleTypeName(tupleSymbol As INamedTypeSymbol) As Boolean + Private Shared Function CanUseTupleTypeName(tupleSymbol As INamedTypeSymbol) As Boolean Dim currentUnderlying As INamedTypeSymbol = tupleSymbol.TupleUnderlyingType While currentUnderlying.Arity = TupleTypeSymbol.RestPosition @@ -344,15 +344,12 @@ Namespace Microsoft.CodeAnalysis.VisualBasic AddPunctuation(SyntaxKind.OpenParenToken) - Dim first As Boolean = True For i As Integer = 0 To elementTypes.Length - 1 - If Not first Then + If i <> 0 Then AddPunctuation(SyntaxKind.CommaToken) AddSpace() End If - first = False - If hasNames Then builder.Add(CreatePart(SymbolDisplayPartKind.FieldName, symbol, elementNames(i), noEscaping:=False)) AddSpace() @@ -361,7 +358,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic End If elementTypes(i).Accept(Me.NotFirstVisitor) - Next AddPunctuation(SyntaxKind.CloseParenToken) @@ -391,7 +387,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic If isFirstSymbolVisited AndAlso format.KindOptions.IncludesOption(SymbolDisplayKindOptions.IncludeTypeKeyword) Then If symbol.IsAnonymousType Then ' NOTE: Not actually a keyword, but it's not worth introducing a new kind just for this. - builder.Add(New SymbolDisplayPart(SymbolDisplayPartKind.Keyword, Nothing, "AnonymousType")) + builder.Add(New SymbolDisplayPart(SymbolDisplayPartKind.AnonymousTypeIndicator, Nothing, "AnonymousType")) AddSpace() ElseIf symbol.IsTupleType Then builder.Add(New SymbolDisplayPart(SymbolDisplayPartKind.AnonymousTypeIndicator, Nothing, "Tuple")) diff --git a/src/Compilers/VisualBasic/Portable/Symbols/FieldSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/FieldSymbol.vb index ab72f4e4c92..f9b3f81b0cb 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/FieldSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/FieldSymbol.vb @@ -337,8 +337,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols ''' ''' If this is a field of a tuple type, return corresponding underlying field from the - ''' tuple underlying type. Otherwise, null. In case of a malformed underlying type - ''' the corresponding underlying field might be missing, return null in this case too. + ''' tuple underlying type. Otherwise, Nothing. In case of a malformed underlying type + ''' the corresponding underlying field might be missing, return Nothing in this case too. ''' Public Overridable ReadOnly Property TupleUnderlyingField() As FieldSymbol Get diff --git a/src/Compilers/VisualBasic/Portable/Symbols/NamedTypeSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/NamedTypeSymbol.vb index e6211c84d61..52be79c02b7 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/NamedTypeSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/NamedTypeSymbol.vb @@ -1207,13 +1207,13 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols End Get End Property - Public ReadOnly Property INamedTypeSymbol_TupleElementNames As ImmutableArray(Of String) Implements INamedTypeSymbol.TupleElementNames + Private ReadOnly Property INamedTypeSymbol_TupleElementNames As ImmutableArray(Of String) Implements INamedTypeSymbol.TupleElementNames Get Return TupleElementNames End Get End Property - Public ReadOnly Property INamedTypeSymbol_TupleUnderlyingType As INamedTypeSymbol Implements INamedTypeSymbol.TupleUnderlyingType + Private ReadOnly Property INamedTypeSymbol_TupleUnderlyingType As INamedTypeSymbol Implements INamedTypeSymbol.TupleUnderlyingType Get Return TupleUnderlyingType End Get diff --git a/src/Compilers/VisualBasic/Portable/Symbols/PropertySymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/PropertySymbol.vb index e3134190421..a67d510ad5e 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/PropertySymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/PropertySymbol.vb @@ -417,7 +417,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols End Get End Property - ''' ''' If this is a property of a tuple type, return corresponding underlying property from the ''' tuple underlying type. Otherwise, Nothing. diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleErrorFieldSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleErrorFieldSymbol.vb index d10618e79e2..a310f7cedb7 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleErrorFieldSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleErrorFieldSymbol.vb @@ -11,7 +11,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols ''' that doesn't have a corresponding backing field within the tuple underlying type. ''' Created in response to an error condition. ''' - Friend Class TupleErrorFieldSymbol + Friend NotInheritable Class TupleErrorFieldSymbol Inherits SynthesizedFieldSymbol ''' @@ -19,13 +19,13 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols ''' id is an index of the element (zero-based). ''' Otherwise, (-1 - [index in members array]); ''' - Private _tupleFieldId As Integer + Private ReadOnly _tupleFieldId As Integer - Private _locations As ImmutableArray(Of Location) + Private ReadOnly _locations As ImmutableArray(Of Location) - Private _useSiteDiagnosticInfo As DiagnosticInfo + Private ReadOnly _useSiteDiagnosticInfo As DiagnosticInfo - Public Overrides ReadOnly Property IsTupleField() As Boolean + Public Overrides ReadOnly Property IsTupleField As Boolean Get Return True End Get @@ -36,31 +36,31 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols ''' id is an index of the element (zero-based). ''' Otherwise, (-1 - [index in members array]); ''' - Public ReadOnly Property TupleFieldId() As Integer + Public ReadOnly Property TupleFieldId As Integer Get Return Me._tupleFieldId End Get End Property - Public Overrides ReadOnly Property TupleUnderlyingField() As FieldSymbol + Public Overrides ReadOnly Property TupleUnderlyingField As FieldSymbol Get Return Nothing End Get End Property - Public Overrides ReadOnly Property Locations() As ImmutableArray(Of Location) + Public Overrides ReadOnly Property Locations As ImmutableArray(Of Location) Get Return Me._locations End Get End Property - Public Overrides ReadOnly Property DeclaringSyntaxReferences() As ImmutableArray(Of SyntaxReference) + Public Overrides ReadOnly Property DeclaringSyntaxReferences As ImmutableArray(Of SyntaxReference) Get Return Symbol.GetDeclaringSyntaxReferenceHelper(Of VisualBasicSyntaxNode)(Me._locations) End Get End Property - Public Overrides ReadOnly Property IsImplicitlyDeclared() As Boolean + Public Overrides ReadOnly Property IsImplicitlyDeclared As Boolean Get Return False End Get @@ -69,7 +69,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols Public Sub New(container As NamedTypeSymbol, name As String, tupleFieldId As Integer, location As Location, type As TypeSymbol, useSiteDiagnosticInfo As DiagnosticInfo) MyBase.New(container, container, type, name) Debug.Assert(name <> Nothing) - Me._locations = (If((location Is Nothing), ImmutableArray(Of Location).Empty, ImmutableArray.Create(Of Location)(location))) + Me._locations = If((location Is Nothing), ImmutableArray(Of Location).Empty, ImmutableArray.Create(Of Location)(location)) Me._useSiteDiagnosticInfo = useSiteDiagnosticInfo Me._tupleFieldId = tupleFieldId End Sub @@ -93,8 +93,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols End Function Public Overloads Function Equals(other As TupleErrorFieldSymbol) As Boolean - Dim flag As Boolean = other Is Me - Return flag OrElse (other IsNot Nothing AndAlso Me._tupleFieldId = other._tupleFieldId AndAlso Me.ContainingType Is other.ContainingType) + Return other Is Me OrElse + (other IsNot Nothing AndAlso Me._tupleFieldId = other._tupleFieldId AndAlso Me.ContainingType = other.ContainingType) End Function End Class End Namespace diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleEventSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleEventSymbol.vb index 7c2edf22f4c..e08a24370f3 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleEventSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleEventSymbol.vb @@ -10,48 +10,48 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols ''' Represents an event of a tuple type (such as (int, byte).SomeEvent) ''' that is backed by an event within the tuple underlying type. ''' - Friend Class TupleEventSymbol + Friend NotInheritable Class TupleEventSymbol Inherits WrappedEventSymbol - Private _containingType As TupleTypeSymbol + Private ReadOnly _containingType As TupleTypeSymbol - Public Overrides ReadOnly Property IsTupleEvent() As Boolean + Public Overrides ReadOnly Property IsTupleEvent As Boolean Get Return True End Get End Property - Public Overrides ReadOnly Property TupleUnderlyingEvent() As EventSymbol + Public Overrides ReadOnly Property TupleUnderlyingEvent As EventSymbol Get Return Me._underlyingEvent End Get End Property - Public Overrides ReadOnly Property ContainingSymbol() As Symbol + Public Overrides ReadOnly Property ContainingSymbol As Symbol Get Return Me._containingType End Get End Property - Public Overrides ReadOnly Property Type() As TypeSymbol + Public Overrides ReadOnly Property Type As TypeSymbol Get Return Me._underlyingEvent.Type End Get End Property - Public Overrides ReadOnly Property AddMethod() As MethodSymbol + Public Overrides ReadOnly Property AddMethod As MethodSymbol Get Return Me._containingType.GetTupleMemberSymbolForUnderlyingMember(Of MethodSymbol)(Me._underlyingEvent.AddMethod) End Get End Property - Public Overrides ReadOnly Property RemoveMethod() As MethodSymbol + Public Overrides ReadOnly Property RemoveMethod As MethodSymbol Get Return Me._containingType.GetTupleMemberSymbolForUnderlyingMember(Of MethodSymbol)(Me._underlyingEvent.RemoveMethod) End Get End Property - Friend Overrides ReadOnly Property AssociatedField() As FieldSymbol + Friend Overrides ReadOnly Property AssociatedField As FieldSymbol Get Return Me._containingType.GetTupleMemberSymbolForUnderlyingMember(Of FieldSymbol)(Me._underlyingEvent.AssociatedField) End Get @@ -63,13 +63,13 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols End Get End Property - Friend Overrides ReadOnly Property IsExplicitInterfaceImplementation() As Boolean + Friend Overrides ReadOnly Property IsExplicitInterfaceImplementation As Boolean Get Return Me._underlyingEvent.IsExplicitInterfaceImplementation End Get End Property - Public Overrides ReadOnly Property ExplicitInterfaceImplementations() As ImmutableArray(Of EventSymbol) + Public Overrides ReadOnly Property ExplicitInterfaceImplementations As ImmutableArray(Of EventSymbol) Get Return Me._underlyingEvent.ExplicitInterfaceImplementations End Get @@ -95,8 +95,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols End Function Public Overloads Function Equals(other As TupleEventSymbol) As Boolean - Dim flag As Boolean = other Is Me - Return flag OrElse (other IsNot Nothing AndAlso Me._containingType Is other._containingType AndAlso Me._underlyingEvent Is other._underlyingEvent) + Return other Is Me OrElse + (other IsNot Nothing AndAlso Me._containingType = other._containingType AndAlso Me._underlyingEvent = other._underlyingEvent) End Function Public Overrides Function GetAttributes() As ImmutableArray(Of VisualBasicAttributeData) diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleFieldSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleFieldSymbol.vb index 82d1fe05f1e..1d7c2279e0e 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleFieldSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleFieldSymbol.vb @@ -17,37 +17,37 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols Private _tupleFieldId As Integer - Public Overrides ReadOnly Property IsTupleField() As Boolean + Public Overrides ReadOnly Property IsTupleField As Boolean Get Return True End Get End Property - Public Overrides ReadOnly Property TupleUnderlyingField() As FieldSymbol + Public Overrides ReadOnly Property TupleUnderlyingField As FieldSymbol Get Return Me._underlyingField End Get End Property - Public ReadOnly Property TupleFieldId() As Integer + Public ReadOnly Property TupleFieldId As Integer Get Return Me._tupleFieldId End Get End Property - Public Overrides ReadOnly Property AssociatedSymbol() As Symbol + Public Overrides ReadOnly Property AssociatedSymbol As Symbol Get Return Me._containingTuple.GetTupleMemberSymbolForUnderlyingMember(Of Symbol)(Me._underlyingField.AssociatedSymbol) End Get End Property - Public Overrides ReadOnly Property ContainingSymbol() As Symbol + Public Overrides ReadOnly Property ContainingSymbol As Symbol Get Return Me._containingTuple End Get End Property - Public Overrides ReadOnly Property CustomModifiers() As ImmutableArray(Of CustomModifier) + Public Overrides ReadOnly Property CustomModifiers As ImmutableArray(Of CustomModifier) Get Return Me._underlyingField.CustomModifiers End Get @@ -84,8 +84,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols End Function Public Overloads Function Equals(other As TupleFieldSymbol) As Boolean - Dim flag As Boolean = other Is Me - Return flag OrElse (other IsNot Nothing AndAlso Me._tupleFieldId = other._tupleFieldId AndAlso Me._containingTuple Is other._containingTuple) + Return other Is Me OrElse + (other IsNot Nothing AndAlso Me._tupleFieldId = other._tupleFieldId AndAlso Me._containingTuple = other._containingTuple) End Function End Class @@ -98,25 +98,25 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols Private _locations As ImmutableArray(Of Location) - Public Overrides ReadOnly Property Locations() As ImmutableArray(Of Location) + Public Overrides ReadOnly Property Locations As ImmutableArray(Of Location) Get Return Me._locations End Get End Property - Public Overrides ReadOnly Property DeclaringSyntaxReferences() As ImmutableArray(Of SyntaxReference) + Public Overrides ReadOnly Property DeclaringSyntaxReferences As ImmutableArray(Of SyntaxReference) Get Return Symbol.GetDeclaringSyntaxReferenceHelper(Of VisualBasicSyntaxNode)(Me._locations) End Get End Property - Public Overrides ReadOnly Property IsImplicitlyDeclared() As Boolean + Public Overrides ReadOnly Property IsImplicitlyDeclared As Boolean Get Return False End Get End Property - Friend Overrides ReadOnly Property TypeLayoutOffset() As Integer? + Friend Overrides ReadOnly Property TypeLayoutOffset As Integer? Get Dim flag As Boolean = Me._underlyingField.ContainingType IsNot Me._containingTuple.TupleUnderlyingType Dim result As Integer? @@ -129,7 +129,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols End Get End Property - Public Overrides ReadOnly Property AssociatedSymbol() As Symbol + Public Overrides ReadOnly Property AssociatedSymbol As Symbol Get Dim flag As Boolean = Me._underlyingField.ContainingType IsNot Me._containingTuple.TupleUnderlyingType Dim result As Symbol @@ -144,7 +144,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols Public Sub New(container As TupleTypeSymbol, underlyingField As FieldSymbol, tupleFieldId As Integer, location As Location) MyBase.New(container, underlyingField, tupleFieldId) - Me._locations = (If((location Is Nothing), ImmutableArray(Of Location).Empty, ImmutableArray.Create(Of Location)(location))) + Me._locations = If((location Is Nothing), ImmutableArray(Of Location).Empty, ImmutableArray.Create(Of Location)(location)) End Sub End Class @@ -152,24 +152,24 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols ''' Represents an element field of a tuple type (such as (int a, byte b).a, or (int a, byte b).b) ''' that is backed by a real field with a different name within the tuple underlying type. ''' - Friend Class TupleRenamedElementFieldSymbol + Friend NotInheritable Class TupleRenamedElementFieldSymbol Inherits TupleElementFieldSymbol Private _name As String - Public Overrides ReadOnly Property Name() As String + Public Overrides ReadOnly Property Name As String Get Return Me._name End Get End Property - Friend Overrides ReadOnly Property TypeLayoutOffset() As Integer? + Friend Overrides ReadOnly Property TypeLayoutOffset As Integer? Get Return Nothing End Get End Property - Public Overrides ReadOnly Property AssociatedSymbol() As Symbol + Public Overrides ReadOnly Property AssociatedSymbol As Symbol Get Return Nothing End Get diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleMethodSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleMethodSymbol.vb index 1801b61d396..9387bf63ffe 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleMethodSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleMethodSymbol.vb @@ -10,88 +10,87 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols ''' Represents a method of a tuple type (such as (int, byte).ToString()) ''' that is backed by a method within the tuple underlying type. ''' - Friend Class TupleMethodSymbol + Friend NotInheritable Class TupleMethodSymbol Inherits WrappedMethodSymbol - Private _containingType As TupleTypeSymbol + Private ReadOnly _containingType As TupleTypeSymbol - Private _underlyingMethod As MethodSymbol + Private ReadOnly _underlyingMethod As MethodSymbol - Private _typeParameters As ImmutableArray(Of TypeParameterSymbol) + Private ReadOnly _typeParameters As ImmutableArray(Of TypeParameterSymbol) - Private _lazyParameters As ImmutableArray(Of ParameterSymbol) + Private ReadOnly _lazyParameters As ImmutableArray(Of ParameterSymbol) - Public Overrides ReadOnly Property IsTupleMethod() As Boolean + Public Overrides ReadOnly Property IsTupleMethod As Boolean Get Return True End Get End Property - Public Overrides ReadOnly Property TupleUnderlyingMethod() As MethodSymbol + Public Overrides ReadOnly Property TupleUnderlyingMethod As MethodSymbol Get Return Me._underlyingMethod.ConstructedFrom End Get End Property - Public Overrides ReadOnly Property UnderlyingMethod() As MethodSymbol + Public Overrides ReadOnly Property UnderlyingMethod As MethodSymbol Get Return Me._underlyingMethod End Get End Property - Public Overrides ReadOnly Property AssociatedSymbol() As Symbol + Public Overrides ReadOnly Property AssociatedSymbol As Symbol Get Return Me._containingType.GetTupleMemberSymbolForUnderlyingMember(Of Symbol)(Me._underlyingMethod.ConstructedFrom.AssociatedSymbol) End Get End Property - Public Overrides ReadOnly Property ContainingSymbol() As Symbol + Public Overrides ReadOnly Property ContainingSymbol As Symbol Get Return Me._containingType End Get End Property - Public Overrides ReadOnly Property ExplicitInterfaceImplementations() As ImmutableArray(Of MethodSymbol) + Public Overrides ReadOnly Property ExplicitInterfaceImplementations As ImmutableArray(Of MethodSymbol) Get Return Me._underlyingMethod.ConstructedFrom.ExplicitInterfaceImplementations End Get End Property - Public Overrides ReadOnly Property Parameters() As ImmutableArray(Of ParameterSymbol) + Public Overrides ReadOnly Property Parameters As ImmutableArray(Of ParameterSymbol) Get - Dim isDefault As Boolean = Me._lazyParameters.IsDefault - If isDefault Then + If Me._lazyParameters.IsDefault Then InterlockedOperations.Initialize(Of ParameterSymbol)(Me._lazyParameters, Me.CreateParameters()) End If Return Me._lazyParameters End Get End Property - Public Overrides ReadOnly Property IsSub() As Boolean + Public Overrides ReadOnly Property IsSub As Boolean Get Return Me._underlyingMethod.IsSub End Get End Property - Public Overrides ReadOnly Property ReturnType() As TypeSymbol + Public Overrides ReadOnly Property ReturnType As TypeSymbol Get Return Me._underlyingMethod.ReturnType End Get End Property - Public Overrides ReadOnly Property ReturnTypeCustomModifiers() As ImmutableArray(Of CustomModifier) + Public Overrides ReadOnly Property ReturnTypeCustomModifiers As ImmutableArray(Of CustomModifier) Get Return Me._underlyingMethod.ReturnTypeCustomModifiers End Get End Property - Public Overrides ReadOnly Property TypeArguments() As ImmutableArray(Of TypeSymbol) + Public Overrides ReadOnly Property TypeArguments As ImmutableArray(Of TypeSymbol) Get Return StaticCast(Of TypeSymbol).From(Me._typeParameters) End Get End Property - Public Overrides ReadOnly Property TypeParameters() As ImmutableArray(Of TypeParameterSymbol) + Public Overrides ReadOnly Property TypeParameters As ImmutableArray(Of TypeParameterSymbol) Get Return Me._typeParameters End Get @@ -137,8 +136,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols End Function Public Overloads Function Equals(other As TupleMethodSymbol) As Boolean - Dim flag As Boolean = other Is Me - Return flag OrElse (other IsNot Nothing AndAlso Me._containingType Is other._containingType AndAlso Me._underlyingMethod.ConstructedFrom Is other._underlyingMethod.ConstructedFrom) + Return other Is Me OrElse + (other IsNot Nothing AndAlso Me._containingType = other._containingType AndAlso Me._underlyingMethod.ConstructedFrom = other._underlyingMethod.ConstructedFrom) End Function End Class End Namespace diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleParameterSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleParameterSymbol.vb index fc23ff0d2ba..738880e4d79 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleParameterSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleParameterSymbol.vb @@ -8,12 +8,12 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols ''' ''' Represents a parameter of a method or a property of a tuple type ''' - Friend Class TupleParameterSymbol + Friend NotInheritable Class TupleParameterSymbol Inherits WrappedParameterSymbol Private _container As Symbol - Public Overrides ReadOnly Property ContainingSymbol() As Symbol + Public Overrides ReadOnly Property ContainingSymbol As Symbol Get Return Me._container End Get @@ -35,8 +35,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols End Function Public Overloads Function Equals(other As TupleParameterSymbol) As Boolean - Dim flag As Boolean = other Is Me - Return flag OrElse (other IsNot Nothing AndAlso Me._container Is other._container AndAlso Me._underlyingParameter Is other._underlyingParameter) + Return other Is Me OrElse + (other IsNot Nothing AndAlso Me._container = other._container AndAlso Me._underlyingParameter = other._underlyingParameter) End Function End Class End Namespace diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TuplePropertySymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TuplePropertySymbol.vb index 3509f78ed64..feaff927d7e 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TuplePropertySymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TuplePropertySymbol.vb @@ -17,31 +17,31 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols Private _lazyParameters As ImmutableArray(Of ParameterSymbol) - Public Overrides ReadOnly Property IsTupleProperty() As Boolean + Public Overrides ReadOnly Property IsTupleProperty As Boolean Get Return True End Get End Property - Public Overrides ReadOnly Property TupleUnderlyingProperty() As PropertySymbol + Public Overrides ReadOnly Property TupleUnderlyingProperty As PropertySymbol Get Return Me._underlyingProperty End Get End Property - Public Overrides ReadOnly Property Type() As TypeSymbol + Public Overrides ReadOnly Property Type As TypeSymbol Get Return Me._underlyingProperty.Type End Get End Property - Public Overrides ReadOnly Property TypeCustomModifiers() As ImmutableArray(Of CustomModifier) + Public Overrides ReadOnly Property TypeCustomModifiers As ImmutableArray(Of CustomModifier) Get Return Me._underlyingProperty.TypeCustomModifiers End Get End Property - Public Overrides ReadOnly Property Parameters() As ImmutableArray(Of ParameterSymbol) + Public Overrides ReadOnly Property Parameters As ImmutableArray(Of ParameterSymbol) Get Dim isDefault As Boolean = Me._lazyParameters.IsDefault If isDefault Then @@ -51,13 +51,13 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols End Get End Property - Public Overrides ReadOnly Property GetMethod() As MethodSymbol + Public Overrides ReadOnly Property GetMethod As MethodSymbol Get Return Me._containingType.GetTupleMemberSymbolForUnderlyingMember(Of MethodSymbol)(Me._underlyingProperty.GetMethod) End Get End Property - Public Overrides ReadOnly Property SetMethod() As MethodSymbol + Public Overrides ReadOnly Property SetMethod As MethodSymbol Get Return Me._containingType.GetTupleMemberSymbolForUnderlyingMember(Of MethodSymbol)(Me._underlyingProperty.SetMethod) End Get @@ -69,13 +69,13 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols End Get End Property - Public Overrides ReadOnly Property ExplicitInterfaceImplementations() As ImmutableArray(Of PropertySymbol) + Public Overrides ReadOnly Property ExplicitInterfaceImplementations As ImmutableArray(Of PropertySymbol) Get Return Me._underlyingProperty.ExplicitInterfaceImplementations End Get End Property - Public Overrides ReadOnly Property ContainingSymbol() As Symbol + Public Overrides ReadOnly Property ContainingSymbol As Symbol Get Return Me._containingType End Get @@ -117,8 +117,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols End Function Public Overloads Function Equals(other As TuplePropertySymbol) As Boolean - Dim flag As Boolean = other Is Me - Return flag OrElse (other IsNot Nothing AndAlso Me._containingType Is other._containingType AndAlso Me._underlyingProperty Is other._underlyingProperty) + Return other Is Me OrElse + (other IsNot Nothing AndAlso Me._containingType = other._containingType AndAlso Me._underlyingProperty = other._underlyingProperty) End Function Public Overrides Function GetAttributes() As ImmutableArray(Of VisualBasicAttributeData) diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleTypeSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleTypeSymbol.vb index 179417b2d65..4ed721af786 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleTypeSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Tuples/TupleTypeSymbol.vb @@ -8,16 +8,16 @@ Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.RuntimeMembers Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols - Friend Class TupleTypeSymbol + Friend NotInheritable Class TupleTypeSymbol Inherits WrappedNamedTypeSymbol - Private _locations As ImmutableArray(Of Location) + Private ReadOnly _locations As ImmutableArray(Of Location) - Private _elementLocations As ImmutableArray(Of Location) + Private ReadOnly _elementLocations As ImmutableArray(Of Location) - Private _elementNames As ImmutableArray(Of String) + Private ReadOnly _elementNames As ImmutableArray(Of String) - Private _elementTypes As ImmutableArray(Of TypeSymbol) + Private ReadOnly _elementTypes As ImmutableArray(Of TypeSymbol) Private _lazyMembers As ImmutableArray(Of Symbol) @@ -29,11 +29,11 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols Friend Const TupleTypeName As String = "ValueTuple" - Private Shared tupleTypes As WellKnownType() = New WellKnownType() {WellKnownType.System_ValueTuple_T1, WellKnownType.System_ValueTuple_T2, WellKnownType.System_ValueTuple_T3, WellKnownType.System_ValueTuple_T4, WellKnownType.System_ValueTuple_T5, WellKnownType.System_ValueTuple_T6, WellKnownType.System_ValueTuple_T7, WellKnownType.System_ValueTuple_TRest} + Private Shared ReadOnly tupleTypes As WellKnownType() = New WellKnownType() {WellKnownType.System_ValueTuple_T1, WellKnownType.System_ValueTuple_T2, WellKnownType.System_ValueTuple_T3, WellKnownType.System_ValueTuple_T4, WellKnownType.System_ValueTuple_T5, WellKnownType.System_ValueTuple_T6, WellKnownType.System_ValueTuple_T7, WellKnownType.System_ValueTuple_TRest} - Private Shared tupleCtors As WellKnownMember() = New WellKnownMember() {WellKnownMember.System_ValueTuple_T1__ctor, WellKnownMember.System_ValueTuple_T2__ctor, WellKnownMember.System_ValueTuple_T3__ctor, WellKnownMember.System_ValueTuple_T4__ctor, WellKnownMember.System_ValueTuple_T5__ctor, WellKnownMember.System_ValueTuple_T6__ctor, WellKnownMember.System_ValueTuple_T7__ctor, WellKnownMember.System_ValueTuple_TRest__ctor} + Private Shared ReadOnly tupleCtors As WellKnownMember() = New WellKnownMember() {WellKnownMember.System_ValueTuple_T1__ctor, WellKnownMember.System_ValueTuple_T2__ctor, WellKnownMember.System_ValueTuple_T3__ctor, WellKnownMember.System_ValueTuple_T4__ctor, WellKnownMember.System_ValueTuple_T5__ctor, WellKnownMember.System_ValueTuple_T6__ctor, WellKnownMember.System_ValueTuple_T7__ctor, WellKnownMember.System_ValueTuple_TRest__ctor} - Private Shared tupleMembers As WellKnownMember()() = New WellKnownMember()() { + Private Shared ReadOnly tupleMembers As WellKnownMember()() = New WellKnownMember()() { New WellKnownMember() {WellKnownMember.System_ValueTuple_T1__Item1}, New WellKnownMember() {WellKnownMember.System_ValueTuple_T2__Item1, WellKnownMember.System_ValueTuple_T2__Item2}, New WellKnownMember() {WellKnownMember.System_ValueTuple_T3__Item1, WellKnownMember.System_ValueTuple_T3__Item2, WellKnownMember.System_ValueTuple_T3__Item3}, @@ -43,49 +43,49 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols New WellKnownMember() {WellKnownMember.System_ValueTuple_T7__Item1, WellKnownMember.System_ValueTuple_T7__Item2, WellKnownMember.System_ValueTuple_T7__Item3, WellKnownMember.System_ValueTuple_T7__Item4, WellKnownMember.System_ValueTuple_T7__Item5, WellKnownMember.System_ValueTuple_T7__Item6, WellKnownMember.System_ValueTuple_T7__Item7}, New WellKnownMember() {WellKnownMember.System_ValueTuple_TRest__Item1, WellKnownMember.System_ValueTuple_TRest__Item2, WellKnownMember.System_ValueTuple_TRest__Item3, WellKnownMember.System_ValueTuple_TRest__Item4, WellKnownMember.System_ValueTuple_TRest__Item5, WellKnownMember.System_ValueTuple_TRest__Item6, WellKnownMember.System_ValueTuple_TRest__Item7, WellKnownMember.System_ValueTuple_TRest__Rest}} - Public Overrides ReadOnly Property IsTupleType() As Boolean + Public Overrides ReadOnly Property IsTupleType As Boolean Get Return True End Get End Property - Public Overrides ReadOnly Property TupleUnderlyingType() As NamedTypeSymbol + Public Overrides ReadOnly Property TupleUnderlyingType As NamedTypeSymbol Get Return Me._underlyingType End Get End Property - Public Overrides ReadOnly Property TupleElementTypes() As ImmutableArray(Of TypeSymbol) + Public Overrides ReadOnly Property TupleElementTypes As ImmutableArray(Of TypeSymbol) Get Return Me._elementTypes End Get End Property - Public Overrides ReadOnly Property TupleElementNames() As ImmutableArray(Of String) + Public Overrides ReadOnly Property TupleElementNames As ImmutableArray(Of String) Get Return Me._elementNames End Get End Property - Public Overrides ReadOnly Property IsReferenceType() As Boolean + Public Overrides ReadOnly Property IsReferenceType As Boolean Get Return Not Me._underlyingType.IsErrorType() AndAlso Me._underlyingType.IsReferenceType End Get End Property - Public Overrides ReadOnly Property IsValueType() As Boolean + Public Overrides ReadOnly Property IsValueType As Boolean Get Return Me._underlyingType.IsValueType End Get End Property - Public Overrides ReadOnly Property IsImplicitlyDeclared() As Boolean + Public Overrides ReadOnly Property IsImplicitlyDeclared As Boolean Get Return False End Get End Property - Public ReadOnly Property TupleElementFields() As ImmutableArray(Of FieldSymbol) + Public ReadOnly Property TupleElementFields As ImmutableArray(Of FieldSymbol) Get Dim isDefault As Boolean = Me._lazyFields.IsDefault If isDefault Then @@ -95,7 +95,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols End Get End Property - Friend ReadOnly Property UnderlyingDefinitionToMemberMap() As SmallDictionary(Of Symbol, Symbol) + Friend ReadOnly Property UnderlyingDefinitionToMemberMap As SmallDictionary(Of Symbol, Symbol) Get If Me._lazyUnderlyingDefinitionToMemberMap Is Nothing Then Me._lazyUnderlyingDefinitionToMemberMap = Me.ComputeDefinitionToMemberMap() @@ -104,43 +104,43 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols End Get End Property - Public Overrides ReadOnly Property EnumUnderlyingType() As NamedTypeSymbol + Public Overrides ReadOnly Property EnumUnderlyingType As NamedTypeSymbol Get Return Me._underlyingType.EnumUnderlyingType End Get End Property - Public Overrides ReadOnly Property Kind() As SymbolKind + Public Overrides ReadOnly Property Kind As SymbolKind Get Return SymbolKind.NamedType End Get End Property - Public Overrides ReadOnly Property TypeKind() As TypeKind + Public Overrides ReadOnly Property TypeKind As TypeKind Get - Return If((Me._underlyingType.TypeKind = TypeKind.[Class]), TypeKind.[Class], TypeKind.Struct) + Return If(Me._underlyingType.TypeKind = TypeKind.Class, TypeKind.Class, TypeKind.Struct) End Get End Property - Public Overrides ReadOnly Property ContainingSymbol() As Symbol + Public Overrides ReadOnly Property ContainingSymbol As Symbol Get Return Me._underlyingType.ContainingSymbol End Get End Property - Public Overrides ReadOnly Property Locations() As ImmutableArray(Of Location) + Public Overrides ReadOnly Property Locations As ImmutableArray(Of Location) Get Return Me._locations End Get End Property - Public Overrides ReadOnly Property DeclaringSyntaxReferences() As ImmutableArray(Of SyntaxReference) + Public Overrides ReadOnly Property DeclaringSyntaxReferences As ImmutableArray(Of SyntaxReference) Get Return Symbol.GetDeclaringSyntaxReferenceHelper(Of VisualBasicSyntaxNode)(Me._locations) End Get End Property - Public Overrides ReadOnly Property DeclaredAccessibility() As Accessibility + Public Overrides ReadOnly Property DeclaredAccessibility As Accessibility Get Dim result As Accessibility If Me._underlyingType.IsErrorType() Then @@ -152,73 +152,73 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols End Get End Property - Public Overrides ReadOnly Property IsMustInherit() As Boolean + Public Overrides ReadOnly Property IsMustInherit As Boolean Get Return False End Get End Property - Public Overrides ReadOnly Property IsNotInheritable() As Boolean + Public Overrides ReadOnly Property IsNotInheritable As Boolean Get Return True End Get End Property - Public Overrides ReadOnly Property Arity() As Integer + Public Overrides ReadOnly Property Arity As Integer Get Return 0 End Get End Property - Public Overrides ReadOnly Property TypeParameters() As ImmutableArray(Of TypeParameterSymbol) + Public Overrides ReadOnly Property TypeParameters As ImmutableArray(Of TypeParameterSymbol) Get Return ImmutableArray(Of TypeParameterSymbol).Empty End Get End Property - Friend Overrides ReadOnly Property TypeArgumentsCustomModifiers() As ImmutableArray(Of ImmutableArray(Of CustomModifier)) + Friend Overrides ReadOnly Property TypeArgumentsCustomModifiers As ImmutableArray(Of ImmutableArray(Of CustomModifier)) Get Return ImmutableArray(Of ImmutableArray(Of CustomModifier)).Empty End Get End Property - Friend Overrides ReadOnly Property HasTypeArgumentsCustomModifiers() As Boolean + Friend Overrides ReadOnly Property HasTypeArgumentsCustomModifiers As Boolean Get Return False End Get End Property - Friend Overrides ReadOnly Property TypeArgumentsNoUseSiteDiagnostics() As ImmutableArray(Of TypeSymbol) + Friend Overrides ReadOnly Property TypeArgumentsNoUseSiteDiagnostics As ImmutableArray(Of TypeSymbol) Get Return ImmutableArray(Of TypeSymbol).Empty End Get End Property - Public Overrides ReadOnly Property ConstructedFrom() As NamedTypeSymbol + Public Overrides ReadOnly Property ConstructedFrom As NamedTypeSymbol Get Return Me End Get End Property - Public Overrides ReadOnly Property MightContainExtensionMethods() As Boolean + Public Overrides ReadOnly Property MightContainExtensionMethods As Boolean Get Return False End Get End Property - Public Overrides ReadOnly Property Name() As String + Public Overrides ReadOnly Property Name As String Get Return String.Empty End Get End Property - Friend Overrides ReadOnly Property MangleName() As Boolean + Friend Overrides ReadOnly Property MangleName As Boolean Get Return False End Get End Property - Public Overrides ReadOnly Iterator Property MemberNames() As IEnumerable(Of String) + Public Overrides ReadOnly Iterator Property MemberNames As IEnumerable(Of String) Get Dim [set] = PooledHashSet(Of String).GetInstance() For Each member In GetMembers() @@ -232,55 +232,55 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols End Get End Property - Friend Overrides ReadOnly Property HasSpecialName() As Boolean + Friend Overrides ReadOnly Property HasSpecialName As Boolean Get Return False End Get End Property - Friend Overrides ReadOnly Property IsComImport() As Boolean + Friend Overrides ReadOnly Property IsComImport As Boolean Get Return False End Get End Property - Friend Overrides ReadOnly Property IsWindowsRuntimeImport() As Boolean + Friend Overrides ReadOnly Property IsWindowsRuntimeImport As Boolean Get Return False End Get End Property - Friend Overrides ReadOnly Property ShouldAddWinRTMembers() As Boolean + Friend Overrides ReadOnly Property ShouldAddWinRTMembers As Boolean Get Return False End Get End Property - Friend Overrides ReadOnly Property IsSerializable() As Boolean + Friend Overrides ReadOnly Property IsSerializable As Boolean Get Return Me._underlyingType.IsSerializable End Get End Property - Friend Overrides ReadOnly Property Layout() As TypeLayout + Friend Overrides ReadOnly Property Layout As TypeLayout Get Return Me._underlyingType.Layout End Get End Property - Friend Overrides ReadOnly Property MarshallingCharSet() As CharSet + Friend Overrides ReadOnly Property MarshallingCharSet As CharSet Get Return Me._underlyingType.MarshallingCharSet End Get End Property - Friend Overrides ReadOnly Property HasDeclarativeSecurity() As Boolean + Friend Overrides ReadOnly Property HasDeclarativeSecurity As Boolean Get Return Me._underlyingType.HasDeclarativeSecurity End Get End Property - Friend Overrides ReadOnly Property IsInterface() As Boolean + Friend Overrides ReadOnly Property IsInterface As Boolean Get Return False End Get @@ -310,7 +310,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols Private Sub New(locations As ImmutableArray(Of Location), underlyingType As NamedTypeSymbol, elementLocations As ImmutableArray(Of Location), elementNames As ImmutableArray(Of String), elementTypes As ImmutableArray(Of TypeSymbol)) MyBase.New(underlyingType) - Debug.Assert(elementLocations.IsDefault OrElse elementNames.IsDefault OrElse elementLocations.Length = elementNames.Length) Debug.Assert(elementLocations.IsDefault OrElse elementLocations.Length = elementTypes.Length) Debug.Assert(elementNames.IsDefault OrElse elementNames.Length = elementTypes.Length) Debug.Assert(Not underlyingType.IsTupleType) @@ -400,24 +399,20 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols typeArgumentsBuilder.Clear() For i As Integer = 0 To TupleTypeSymbol.RestPosition - 1 - 1 - If Not modifiers.IsDefault AndAlso Not modifiers(i).IsDefaultOrEmpty Then - typeArgumentsBuilder.Add(New TypeWithModifiers(typeArgumentsNoUseSiteDiagnostics(i), modifiers(i))) - Else - typeArgumentsBuilder.Add(New TypeWithModifiers(typeArgumentsNoUseSiteDiagnostics(i))) - End If + typeArgumentsBuilder.Add(New TypeWithModifiers(typeArgumentsNoUseSiteDiagnostics(i), GetModifiers(modifiers, i))) Next - If Not modifiers.IsDefault AndAlso Not modifiers(TupleTypeSymbol.RestPosition - 1).IsDefaultOrEmpty Then - typeArgumentsBuilder.Add(New TypeWithModifiers(extensionTuple, modifiers(TupleTypeSymbol.RestPosition - 1))) - Else - typeArgumentsBuilder.Add(New TypeWithModifiers(extensionTuple)) - End If + typeArgumentsBuilder.Add(New TypeWithModifiers(extensionTuple, GetModifiers(modifiers, TupleTypeSymbol.RestPosition - 1))) Dim definition = tupleCompatibleType.ConstructedFrom Dim subst = TypeSubstitution.Create(definition, definition.TypeParameters, typeArgumentsBuilder.ToImmutable(), False) Return definition.Construct(subst) End Function + Private Shared Function GetModifiers(modifiers As ImmutableArray(Of ImmutableArray(Of CustomModifier)), i As Integer) As ImmutableArray(Of CustomModifier) + Return If(modifiers.IsDefaultOrEmpty, Nothing, modifiers(i)) + End Function + Friend Function WithUnderlyingType(newUnderlyingType As NamedTypeSymbol) As TupleTypeSymbol Debug.Assert(Not newUnderlyingType.IsTupleType AndAlso newUnderlyingType.IsTupleOrCompatibleWithTupleOfCardinality(Me._elementTypes.Length)) Return TupleTypeSymbol.Create(Me._locations, newUnderlyingType, Me._elementLocations, Me._elementNames) @@ -574,8 +569,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols Return result End Function - Friend Shared Function GetWellKnownMemberInType(type As NamedTypeSymbol, relativeMember As WellKnownMember) As Symbol - Debug.Assert(relativeMember >= WellKnownMember.System_Math__RoundDouble AndAlso relativeMember < WellKnownMember.Count) + Private Shared Function GetWellKnownMemberInType(type As NamedTypeSymbol, relativeMember As WellKnownMember) As Symbol + Debug.Assert(relativeMember >= WellKnownMember.System_ValueTuple_T1__Item1 AndAlso relativeMember <= WellKnownMember.System_ValueTuple_TRest__ctor) Debug.Assert(type.IsDefinition) Dim descriptor As MemberDescriptor = WellKnownMembers.GetDescriptor(relativeMember) Return VisualBasicCompilation.GetRuntimeMember(type, descriptor, VisualBasicCompilation.SpecialMembersSignatureComparer.Instance, Nothing) @@ -678,12 +673,12 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols End If ' Add a field with the given name - Dim Location = If(_elementLocations.IsDefault, Nothing, _elementLocations(tupleFieldIndex)) + Dim location = If(_elementLocations.IsDefault, Nothing, _elementLocations(tupleFieldIndex)) If field.Name = namesOfVirtualFields(tupleFieldIndex) Then - members.Add(New TupleElementFieldSymbol(Me, FieldSymbol, tupleFieldIndex, Location)) + members.Add(New TupleElementFieldSymbol(Me, FieldSymbol, tupleFieldIndex, location)) Else - members.Add(New TupleRenamedElementFieldSymbol(Me, FieldSymbol, namesOfVirtualFields(tupleFieldIndex), tupleFieldIndex, Location)) + members.Add(New TupleRenamedElementFieldSymbol(Me, FieldSymbol, namesOfVirtualFields(tupleFieldIndex), tupleFieldIndex, location)) End If ElseIf field.Name = namesOfVirtualFields(tupleFieldIndex) Then members.Add(New TupleElementFieldSymbol(Me, FieldSymbol, tupleFieldIndex, @@ -753,7 +748,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols Dim fieldChainLength = NumberOfValueTuples(i + 1, fieldRemainder) Dim container As NamedTypeSymbol = GetNestedTupleUnderlyingType(_underlyingType, fieldChainLength - 1).OriginalDefinition - Dim DiagnosticInfo = If(container.IsErrorType(), + Dim diagnosticInfo = If(container.IsErrorType(), Nothing, ErrorFactory.ErrorInfo(ERRID.ERR_MissingRuntimeHelper, container.Name & "." & TupleMemberName(fieldRemainder))) @@ -761,13 +756,13 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols Dim defaultName As String = TupleMemberName(i + 1) ' Add a field with default name if the given name Is different If Name <> defaultName Then - members.Add(New TupleErrorFieldSymbol(Me, defaultName, -members.Count - 1, Nothing, _elementTypes(i), DiagnosticInfo)) + members.Add(New TupleErrorFieldSymbol(Me, defaultName, -members.Count - 1, Nothing, _elementTypes(i), diagnosticInfo)) End If members.Add(New TupleErrorFieldSymbol(Me, Name, i, If(_elementLocations.IsDefault, Nothing, _elementLocations(i)), _elementTypes(i), - DiagnosticInfo)) + diagnosticInfo)) End If Next @@ -793,7 +788,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols Dim kind As SymbolKind = symbol.Kind Select Case kind Case SymbolKind.[Event] - Dim tupleUnderlyingEvent As EventSymbol = (DirectCast(symbol, EventSymbol)).TupleUnderlyingEvent + Dim tupleUnderlyingEvent As EventSymbol = DirectCast(symbol, EventSymbol).TupleUnderlyingEvent Dim associatedField As FieldSymbol = tupleUnderlyingEvent.AssociatedField If associatedField IsNot Nothing Then @@ -805,16 +800,16 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols smallDictionary.Add(tupleUnderlyingEvent.OriginalDefinition, symbol) Case SymbolKind.Field - Dim tupleUnderlyingField As FieldSymbol = (DirectCast(symbol, FieldSymbol)).TupleUnderlyingField + Dim tupleUnderlyingField As FieldSymbol = DirectCast(symbol, FieldSymbol).TupleUnderlyingField If tupleUnderlyingField IsNot Nothing Then smallDictionary(tupleUnderlyingField.OriginalDefinition) = symbol End If Case SymbolKind.Method - smallDictionary.Add((DirectCast(symbol, MethodSymbol)).TupleUnderlyingMethod.OriginalDefinition, symbol) + smallDictionary.Add(DirectCast(symbol, MethodSymbol).TupleUnderlyingMethod.OriginalDefinition, symbol) Case SymbolKind.Property - smallDictionary.Add((DirectCast(symbol, PropertySymbol)).TupleUnderlyingProperty.OriginalDefinition, symbol) + smallDictionary.Add(DirectCast(symbol, PropertySymbol).TupleUnderlyingProperty.OriginalDefinition, symbol) Case Else Throw ExceptionUtilities.UnexpectedValue(symbol.Kind) @@ -836,7 +831,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols Dim symbol As Symbol = Nothing If Me.UnderlyingDefinitionToMemberMap.TryGetValue(originalDefinition, symbol) Then - result = CType((CObj(symbol)), TMember) + result = CType(symbol, TMember) Return result End If End If @@ -850,19 +845,19 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols End Function Public Overrides Function GetTypeMembers() As ImmutableArray(Of NamedTypeSymbol) - ' do Not support nested types at the moment + ' do not support nested types at the moment Debug.Assert(Not GetMembers().Any(Function(m) m.Kind = SymbolKind.NamedType)) Return ImmutableArray(Of NamedTypeSymbol).Empty End Function Public Overrides Function GetTypeMembers(name As String) As ImmutableArray(Of NamedTypeSymbol) - ' do Not support nested types at the moment + ' do not support nested types at the moment Debug.Assert(Not GetMembers().Any(Function(m) m.Kind = SymbolKind.NamedType)) Return ImmutableArray(Of NamedTypeSymbol).Empty End Function Public Overrides Function GetTypeMembers(name As String, arity As Integer) As ImmutableArray(Of NamedTypeSymbol) - ' do Not support nested types at the moment + ' do not support nested types at the moment Debug.Assert(Not GetMembers().Any(Function(m) m.Kind = SymbolKind.NamedType)) Return ImmutableArray(Of NamedTypeSymbol).Empty End Function diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedEventSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedEventSymbol.vb index 735d8b773dd..24a72c4864c 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedEventSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedEventSymbol.vb @@ -15,93 +15,93 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols Friend MustInherit Class WrappedEventSymbol Inherits EventSymbol - Protected _underlyingEvent As EventSymbol + Protected ReadOnly _underlyingEvent As EventSymbol - Public ReadOnly Property UnderlyingEvent() As EventSymbol + Public ReadOnly Property UnderlyingEvent As EventSymbol Get Return Me._underlyingEvent End Get End Property - Public Overrides ReadOnly Property IsImplicitlyDeclared() As Boolean + Public Overrides ReadOnly Property IsImplicitlyDeclared As Boolean Get Return Me._underlyingEvent.IsImplicitlyDeclared End Get End Property - Friend Overrides ReadOnly Property HasSpecialName() As Boolean + Friend Overrides ReadOnly Property HasSpecialName As Boolean Get Return Me._underlyingEvent.HasSpecialName End Get End Property - Public Overrides ReadOnly Property Name() As String + Public Overrides ReadOnly Property Name As String Get Return Me._underlyingEvent.Name End Get End Property - Public Overrides ReadOnly Property Locations() As ImmutableArray(Of Location) + Public Overrides ReadOnly Property Locations As ImmutableArray(Of Location) Get Return Me._underlyingEvent.Locations End Get End Property - Public Overrides ReadOnly Property DeclaringSyntaxReferences() As ImmutableArray(Of SyntaxReference) + Public Overrides ReadOnly Property DeclaringSyntaxReferences As ImmutableArray(Of SyntaxReference) Get Return Me._underlyingEvent.DeclaringSyntaxReferences End Get End Property - Public Overrides ReadOnly Property DeclaredAccessibility() As Accessibility + Public Overrides ReadOnly Property DeclaredAccessibility As Accessibility Get Return Me._underlyingEvent.DeclaredAccessibility End Get End Property - Public Overrides ReadOnly Property IsShared() As Boolean + Public Overrides ReadOnly Property IsShared As Boolean Get Return Me._underlyingEvent.IsShared End Get End Property - Public Overrides ReadOnly Property IsOverridable() As Boolean + Public Overrides ReadOnly Property IsOverridable As Boolean Get Return Me._underlyingEvent.IsOverridable End Get End Property - Public Overrides ReadOnly Property IsOverrides() As Boolean + Public Overrides ReadOnly Property IsOverrides As Boolean Get Return Me._underlyingEvent.IsOverrides End Get End Property - Public Overrides ReadOnly Property IsMustOverride() As Boolean + Public Overrides ReadOnly Property IsMustOverride As Boolean Get Return Me._underlyingEvent.IsMustOverride End Get End Property - Public Overrides ReadOnly Property IsNotOverridable() As Boolean + Public Overrides ReadOnly Property IsNotOverridable As Boolean Get Return Me._underlyingEvent.IsNotOverridable End Get End Property - Friend Overrides ReadOnly Property ObsoleteAttributeData() As ObsoleteAttributeData + Friend Overrides ReadOnly Property ObsoleteAttributeData As ObsoleteAttributeData Get Return Me._underlyingEvent.ObsoleteAttributeData End Get End Property - Public Overrides ReadOnly Property IsWindowsRuntimeEvent() As Boolean + Public Overrides ReadOnly Property IsWindowsRuntimeEvent As Boolean Get Return Me._underlyingEvent.IsWindowsRuntimeEvent End Get End Property - Friend Overrides ReadOnly Property HasRuntimeSpecialName() As Boolean + Friend Overrides ReadOnly Property HasRuntimeSpecialName As Boolean Get Return Me._underlyingEvent.HasRuntimeSpecialName End Get diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedFieldSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedFieldSymbol.vb index 1e0304a39cb..83fb1b43021 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedFieldSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedFieldSymbol.vb @@ -17,109 +17,109 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols Protected _underlyingField As FieldSymbol - Public ReadOnly Property UnderlyingField() As FieldSymbol + Public ReadOnly Property UnderlyingField As FieldSymbol Get Return Me._underlyingField End Get End Property - Public Overrides ReadOnly Property IsImplicitlyDeclared() As Boolean + Public Overrides ReadOnly Property IsImplicitlyDeclared As Boolean Get Return Me._underlyingField.IsImplicitlyDeclared End Get End Property - Public Overrides ReadOnly Property DeclaredAccessibility() As Accessibility + Public Overrides ReadOnly Property DeclaredAccessibility As Accessibility Get Return Me._underlyingField.DeclaredAccessibility End Get End Property - Public Overrides ReadOnly Property Name() As String + Public Overrides ReadOnly Property Name As String Get Return Me._underlyingField.Name End Get End Property - Friend Overrides ReadOnly Property HasSpecialName() As Boolean + Friend Overrides ReadOnly Property HasSpecialName As Boolean Get Return Me._underlyingField.HasSpecialName End Get End Property - Friend Overrides ReadOnly Property HasRuntimeSpecialName() As Boolean + Friend Overrides ReadOnly Property HasRuntimeSpecialName As Boolean Get Return Me._underlyingField.HasRuntimeSpecialName End Get End Property - Friend Overrides ReadOnly Property IsNotSerialized() As Boolean + Friend Overrides ReadOnly Property IsNotSerialized As Boolean Get Return Me._underlyingField.IsNotSerialized End Get End Property - Friend Overrides ReadOnly Property IsMarshalledExplicitly() As Boolean + Friend Overrides ReadOnly Property IsMarshalledExplicitly As Boolean Get Return Me._underlyingField.IsMarshalledExplicitly End Get End Property - Friend Overrides ReadOnly Property MarshallingInformation() As MarshalPseudoCustomAttributeData + Friend Overrides ReadOnly Property MarshallingInformation As MarshalPseudoCustomAttributeData Get Return Me._underlyingField.MarshallingInformation End Get End Property - Friend Overrides ReadOnly Property MarshallingDescriptor() As ImmutableArray(Of Byte) + Friend Overrides ReadOnly Property MarshallingDescriptor As ImmutableArray(Of Byte) Get Return Me._underlyingField.MarshallingDescriptor End Get End Property - Friend Overrides ReadOnly Property TypeLayoutOffset() As Integer? + Friend Overrides ReadOnly Property TypeLayoutOffset As Integer? Get Return Me._underlyingField.TypeLayoutOffset End Get End Property - Public Overrides ReadOnly Property IsReadOnly() As Boolean + Public Overrides ReadOnly Property IsReadOnly As Boolean Get Return Me._underlyingField.IsReadOnly End Get End Property - Public Overrides ReadOnly Property IsConst() As Boolean + Public Overrides ReadOnly Property IsConst As Boolean Get Return Me._underlyingField.IsConst End Get End Property - Friend Overrides ReadOnly Property ObsoleteAttributeData() As ObsoleteAttributeData + Friend Overrides ReadOnly Property ObsoleteAttributeData As ObsoleteAttributeData Get Return Me._underlyingField.ObsoleteAttributeData End Get End Property - Public Overrides ReadOnly Property ConstantValue() As Object + Public Overrides ReadOnly Property ConstantValue As Object Get Return Me._underlyingField.ConstantValue End Get End Property - Public Overrides ReadOnly Property Locations() As ImmutableArray(Of Location) + Public Overrides ReadOnly Property Locations As ImmutableArray(Of Location) Get Return Me._underlyingField.Locations End Get End Property - Public Overrides ReadOnly Property DeclaringSyntaxReferences() As ImmutableArray(Of SyntaxReference) + Public Overrides ReadOnly Property DeclaringSyntaxReferences As ImmutableArray(Of SyntaxReference) Get Return Me._underlyingField.DeclaringSyntaxReferences End Get End Property - Public Overrides ReadOnly Property IsShared() As Boolean + Public Overrides ReadOnly Property IsShared As Boolean Get Return Me._underlyingField.IsShared End Get diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedMethodSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedMethodSymbol.vb index 742423d7bcc..bfb62b06c17 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedMethodSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedMethodSymbol.vb @@ -17,69 +17,69 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols Friend MustInherit Class WrappedMethodSymbol Inherits MethodSymbol - Public MustOverride ReadOnly Property UnderlyingMethod() As MethodSymbol + Public MustOverride ReadOnly Property UnderlyingMethod As MethodSymbol - Public Overrides ReadOnly Property IsVararg() As Boolean + Public Overrides ReadOnly Property IsVararg As Boolean Get Return Me.UnderlyingMethod.IsVararg End Get End Property - Public Overrides ReadOnly Property IsGenericMethod() As Boolean + Public Overrides ReadOnly Property IsGenericMethod As Boolean Get Return Me.UnderlyingMethod.IsGenericMethod End Get End Property - Public Overrides ReadOnly Property Arity() As Integer + Public Overrides ReadOnly Property Arity As Integer Get Return Me.UnderlyingMethod.Arity End Get End Property - Public Overrides ReadOnly Property ReturnsByRef() As Boolean + Public Overrides ReadOnly Property ReturnsByRef As Boolean Get Return Me.UnderlyingMethod.ReturnsByRef End Get End Property - Friend Overrides ReadOnly Property ParameterCount() As Integer + Friend Overrides ReadOnly Property ParameterCount As Integer Get Return Me.UnderlyingMethod.ParameterCount End Get End Property - Public Overrides ReadOnly Property IsExtensionMethod() As Boolean + Public Overrides ReadOnly Property IsExtensionMethod As Boolean Get Return Me.UnderlyingMethod.IsExtensionMethod End Get End Property - Friend Overrides ReadOnly Property IsHiddenBySignature() As Boolean + Friend Overrides ReadOnly Property IsHiddenBySignature As Boolean Get Return Me.UnderlyingMethod.IsHiddenBySignature End Get End Property - Public Overrides ReadOnly Property Locations() As ImmutableArray(Of Location) + Public Overrides ReadOnly Property Locations As ImmutableArray(Of Location) Get Return Me.UnderlyingMethod.Locations End Get End Property - Public Overrides ReadOnly Property DeclaringSyntaxReferences() As ImmutableArray(Of SyntaxReference) + Public Overrides ReadOnly Property DeclaringSyntaxReferences As ImmutableArray(Of SyntaxReference) Get Return Me.UnderlyingMethod.DeclaringSyntaxReferences End Get End Property - Public Overrides ReadOnly Property DeclaredAccessibility() As Accessibility + Public Overrides ReadOnly Property DeclaredAccessibility As Accessibility Get Return Me.UnderlyingMethod.DeclaredAccessibility End Get End Property - Public Overrides ReadOnly Property IsShared() As Boolean + Public Overrides ReadOnly Property IsShared As Boolean Get Return Me.UnderlyingMethod.IsShared End Get @@ -91,115 +91,115 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols End Get End Property - Public Overrides ReadOnly Property IsAsync() As Boolean + Public Overrides ReadOnly Property IsAsync As Boolean Get Return Me.UnderlyingMethod.IsAsync End Get End Property - Public Overrides ReadOnly Property IsOverrides() As Boolean + Public Overrides ReadOnly Property IsOverrides As Boolean Get Return Me.UnderlyingMethod.IsOverrides End Get End Property - Public Overrides ReadOnly Property IsMustOverride() As Boolean + Public Overrides ReadOnly Property IsMustOverride As Boolean Get Return Me.UnderlyingMethod.IsMustOverride End Get End Property - Public Overrides ReadOnly Property IsNotOverridable() As Boolean + Public Overrides ReadOnly Property IsNotOverridable As Boolean Get Return Me.UnderlyingMethod.IsNotOverridable End Get End Property - Public Overrides ReadOnly Property IsImplicitlyDeclared() As Boolean + Public Overrides ReadOnly Property IsImplicitlyDeclared As Boolean Get Return Me.UnderlyingMethod.IsImplicitlyDeclared End Get End Property - Friend Overrides ReadOnly Property IsMetadataFinal() As Boolean + Friend Overrides ReadOnly Property IsMetadataFinal As Boolean Get Return Me.UnderlyingMethod.IsMetadataFinal End Get End Property - Friend Overrides ReadOnly Property ReturnTypeMarshallingInformation() As MarshalPseudoCustomAttributeData + Friend Overrides ReadOnly Property ReturnTypeMarshallingInformation As MarshalPseudoCustomAttributeData Get Return Me.UnderlyingMethod.ReturnTypeMarshallingInformation End Get End Property - Friend Overrides ReadOnly Property HasDeclarativeSecurity() As Boolean + Friend Overrides ReadOnly Property HasDeclarativeSecurity As Boolean Get Return Me.UnderlyingMethod.HasDeclarativeSecurity End Get End Property - Friend Overrides ReadOnly Property ObsoleteAttributeData() As ObsoleteAttributeData + Friend Overrides ReadOnly Property ObsoleteAttributeData As ObsoleteAttributeData Get Return Me.UnderlyingMethod.ObsoleteAttributeData End Get End Property - Public Overrides ReadOnly Property Name() As String + Public Overrides ReadOnly Property Name As String Get Return Me.UnderlyingMethod.Name End Get End Property - Friend Overrides ReadOnly Property HasSpecialName() As Boolean + Friend Overrides ReadOnly Property HasSpecialName As Boolean Get Return Me.UnderlyingMethod.HasSpecialName End Get End Property - Friend Overrides ReadOnly Property ImplementationAttributes() As MethodImplAttributes + Friend Overrides ReadOnly Property ImplementationAttributes As MethodImplAttributes Get Return Me.UnderlyingMethod.ImplementationAttributes End Get End Property - Public Overrides ReadOnly Property MethodKind() As MethodKind + Public Overrides ReadOnly Property MethodKind As MethodKind Get Return Me.UnderlyingMethod.MethodKind End Get End Property - Friend Overrides ReadOnly Property CallingConvention() As Cci.CallingConvention + Friend Overrides ReadOnly Property CallingConvention As Cci.CallingConvention Get Return Me.UnderlyingMethod.CallingConvention End Get End Property - Friend Overrides ReadOnly Property IsAccessCheckedOnOverride() As Boolean + Friend Overrides ReadOnly Property IsAccessCheckedOnOverride As Boolean Get Return Me.UnderlyingMethod.IsAccessCheckedOnOverride End Get End Property - Friend Overrides ReadOnly Property IsExternal() As Boolean + Friend Overrides ReadOnly Property IsExternal As Boolean Get Return Me.UnderlyingMethod.IsExternal End Get End Property - Friend Overrides ReadOnly Property HasRuntimeSpecialName() As Boolean + Friend Overrides ReadOnly Property HasRuntimeSpecialName As Boolean Get Return Me.UnderlyingMethod.HasRuntimeSpecialName End Get End Property - Friend Overrides ReadOnly Property ReturnValueIsMarshalledExplicitly() As Boolean + Friend Overrides ReadOnly Property ReturnValueIsMarshalledExplicitly As Boolean Get Return Me.UnderlyingMethod.ReturnValueIsMarshalledExplicitly End Get End Property - Friend Overrides ReadOnly Property ReturnValueMarshallingDescriptor() As ImmutableArray(Of Byte) + Friend Overrides ReadOnly Property ReturnValueMarshallingDescriptor As ImmutableArray(Of Byte) Get Return Me.UnderlyingMethod.ReturnValueMarshallingDescriptor End Get diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedNamedTypeSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedNamedTypeSymbol.vb index 65835354fd6..4f1bfb66d53 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedNamedTypeSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedNamedTypeSymbol.vb @@ -19,115 +19,115 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols Protected _underlyingType As NamedTypeSymbol - Public ReadOnly Property UnderlyingNamedType() As NamedTypeSymbol + Public ReadOnly Property UnderlyingNamedType As NamedTypeSymbol Get Return Me._underlyingType End Get End Property - Public Overrides ReadOnly Property IsImplicitlyDeclared() As Boolean + Public Overrides ReadOnly Property IsImplicitlyDeclared As Boolean Get Return Me._underlyingType.IsImplicitlyDeclared End Get End Property - Public Overrides ReadOnly Property Arity() As Integer + Public Overrides ReadOnly Property Arity As Integer Get Return Me._underlyingType.Arity End Get End Property - Public Overrides ReadOnly Property MightContainExtensionMethods() As Boolean + Public Overrides ReadOnly Property MightContainExtensionMethods As Boolean Get Return Me._underlyingType.MightContainExtensionMethods End Get End Property - Public Overrides ReadOnly Property Name() As String + Public Overrides ReadOnly Property Name As String Get Return Me._underlyingType.Name End Get End Property - Public Overrides ReadOnly Property MetadataName() As String + Public Overrides ReadOnly Property MetadataName As String Get Return Me._underlyingType.MetadataName End Get End Property - Friend Overrides ReadOnly Property HasSpecialName() As Boolean + Friend Overrides ReadOnly Property HasSpecialName As Boolean Get Return Me._underlyingType.HasSpecialName End Get End Property - Friend Overrides ReadOnly Property MangleName() As Boolean + Friend Overrides ReadOnly Property MangleName As Boolean Get Return Me._underlyingType.MangleName End Get End Property - Public Overrides ReadOnly Property DeclaredAccessibility() As Accessibility + Public Overrides ReadOnly Property DeclaredAccessibility As Accessibility Get Return Me._underlyingType.DeclaredAccessibility End Get End Property - Public Overrides ReadOnly Property TypeKind() As TypeKind + Public Overrides ReadOnly Property TypeKind As TypeKind Get Return Me._underlyingType.TypeKind End Get End Property - Friend Overrides ReadOnly Property IsInterface() As Boolean + Friend Overrides ReadOnly Property IsInterface As Boolean Get Return Me._underlyingType.IsInterface End Get End Property - Public Overrides ReadOnly Property Locations() As ImmutableArray(Of Location) + Public Overrides ReadOnly Property Locations As ImmutableArray(Of Location) Get Return Me._underlyingType.Locations End Get End Property - Public Overrides ReadOnly Property DeclaringSyntaxReferences() As ImmutableArray(Of SyntaxReference) + Public Overrides ReadOnly Property DeclaringSyntaxReferences As ImmutableArray(Of SyntaxReference) Get Return Me._underlyingType.DeclaringSyntaxReferences End Get End Property - Public Overrides ReadOnly Property IsMustInherit() As Boolean + Public Overrides ReadOnly Property IsMustInherit As Boolean Get Return Me._underlyingType.IsMustInherit End Get End Property - Public Overrides ReadOnly Property IsNotInheritable() As Boolean + Public Overrides ReadOnly Property IsNotInheritable As Boolean Get Return Me._underlyingType.IsNotInheritable End Get End Property - Friend Overrides ReadOnly Property IsMetadataAbstract() As Boolean + Friend Overrides ReadOnly Property IsMetadataAbstract As Boolean Get Return Me._underlyingType.IsMetadataAbstract End Get End Property - Friend Overrides ReadOnly Property IsMetadataSealed() As Boolean + Friend Overrides ReadOnly Property IsMetadataSealed As Boolean Get Return Me._underlyingType.IsMetadataSealed End Get End Property - Friend Overrides ReadOnly Property DefaultPropertyName() As String + Friend Overrides ReadOnly Property DefaultPropertyName As String Get Return Me._underlyingType.DefaultPropertyName End Get End Property - Friend Overrides ReadOnly Property CoClassType() As TypeSymbol + Friend Overrides ReadOnly Property CoClassType As TypeSymbol Get Return Me._underlyingType.CoClassType End Get @@ -139,43 +139,43 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols End Get End Property - Friend Overrides ReadOnly Property ObsoleteAttributeData() As ObsoleteAttributeData + Friend Overrides ReadOnly Property ObsoleteAttributeData As ObsoleteAttributeData Get Return Me._underlyingType.ObsoleteAttributeData End Get End Property - Friend Overrides ReadOnly Property ShouldAddWinRTMembers() As Boolean + Friend Overrides ReadOnly Property ShouldAddWinRTMembers As Boolean Get Return Me._underlyingType.ShouldAddWinRTMembers End Get End Property - Friend Overrides ReadOnly Property IsWindowsRuntimeImport() As Boolean + Friend Overrides ReadOnly Property IsWindowsRuntimeImport As Boolean Get Return Me._underlyingType.IsWindowsRuntimeImport End Get End Property - Friend Overrides ReadOnly Property Layout() As TypeLayout + Friend Overrides ReadOnly Property Layout As TypeLayout Get Return Me._underlyingType.Layout End Get End Property - Friend Overrides ReadOnly Property MarshallingCharSet() As CharSet + Friend Overrides ReadOnly Property MarshallingCharSet As CharSet Get Return Me._underlyingType.MarshallingCharSet End Get End Property - Friend Overrides ReadOnly Property IsSerializable() As Boolean + Friend Overrides ReadOnly Property IsSerializable As Boolean Get Return Me._underlyingType.IsSerializable End Get End Property - Friend Overrides ReadOnly Property HasDeclarativeSecurity() As Boolean + Friend Overrides ReadOnly Property HasDeclarativeSecurity As Boolean Get Return Me._underlyingType.HasDeclarativeSecurity End Get diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedParameterSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedParameterSymbol.vb index 3bb9178af3e..bdfda1b7c2f 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedParameterSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedParameterSymbol.vb @@ -18,133 +18,133 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols Protected _underlyingParameter As ParameterSymbol - Public ReadOnly Property UnderlyingParameter() As ParameterSymbol + Public ReadOnly Property UnderlyingParameter As ParameterSymbol Get Return Me._underlyingParameter End Get End Property - Public Overrides ReadOnly Property Type() As TypeSymbol + Public Overrides ReadOnly Property Type As TypeSymbol Get Return Me._underlyingParameter.Type End Get End Property - Public Overrides ReadOnly Property IsByRef() As Boolean + Public Overrides ReadOnly Property IsByRef As Boolean Get Return Me._underlyingParameter.IsByRef End Get End Property - Friend Overrides ReadOnly Property IsMetadataIn() As Boolean + Friend Overrides ReadOnly Property IsMetadataIn As Boolean Get Return Me._underlyingParameter.IsMetadataIn End Get End Property - Friend Overrides ReadOnly Property IsMetadataOut() As Boolean + Friend Overrides ReadOnly Property IsMetadataOut As Boolean Get Return Me._underlyingParameter.IsMetadataOut End Get End Property - Public Overrides ReadOnly Property Locations() As ImmutableArray(Of Location) + Public Overrides ReadOnly Property Locations As ImmutableArray(Of Location) Get Return Me._underlyingParameter.Locations End Get End Property - Public Overrides ReadOnly Property DeclaringSyntaxReferences() As ImmutableArray(Of SyntaxReference) + Public Overrides ReadOnly Property DeclaringSyntaxReferences As ImmutableArray(Of SyntaxReference) Get Return Me._underlyingParameter.DeclaringSyntaxReferences End Get End Property - Public Overrides ReadOnly Property Ordinal() As Integer + Public Overrides ReadOnly Property Ordinal As Integer Get Return Me._underlyingParameter.Ordinal End Get End Property - Public Overrides ReadOnly Property IsParamArray() As Boolean + Public Overrides ReadOnly Property IsParamArray As Boolean Get Return Me._underlyingParameter.IsParamArray End Get End Property - Friend Overrides ReadOnly Property IsMetadataOptional() As Boolean + Friend Overrides ReadOnly Property IsMetadataOptional As Boolean Get Return Me._underlyingParameter.IsMetadataOptional End Get End Property - Public Overrides ReadOnly Property IsImplicitlyDeclared() As Boolean + Public Overrides ReadOnly Property IsImplicitlyDeclared As Boolean Get Return Me._underlyingParameter.IsImplicitlyDeclared End Get End Property - Public Overrides ReadOnly Property Name() As String + Public Overrides ReadOnly Property Name As String Get Return Me._underlyingParameter.Name End Get End Property - Public Overrides ReadOnly Property MetadataName() As String + Public Overrides ReadOnly Property MetadataName As String Get Return Me._underlyingParameter.MetadataName End Get End Property - Public Overrides ReadOnly Property CustomModifiers() As ImmutableArray(Of CustomModifier) + Public Overrides ReadOnly Property CustomModifiers As ImmutableArray(Of CustomModifier) Get Return Me._underlyingParameter.CustomModifiers End Get End Property - Friend Overrides ReadOnly Property MarshallingInformation() As MarshalPseudoCustomAttributeData + Friend Overrides ReadOnly Property MarshallingInformation As MarshalPseudoCustomAttributeData Get Return Me._underlyingParameter.MarshallingInformation End Get End Property - Friend Overrides ReadOnly Property MarshallingType() As UnmanagedType + Friend Overrides ReadOnly Property MarshallingType As UnmanagedType Get Return Me._underlyingParameter.MarshallingType End Get End Property - Friend Overrides ReadOnly Property IsIDispatchConstant() As Boolean + Friend Overrides ReadOnly Property IsIDispatchConstant As Boolean Get Return Me._underlyingParameter.IsIDispatchConstant End Get End Property - Friend Overrides ReadOnly Property IsIUnknownConstant() As Boolean + Friend Overrides ReadOnly Property IsIUnknownConstant As Boolean Get Return Me._underlyingParameter.IsIUnknownConstant End Get End Property - Friend Overrides ReadOnly Property IsCallerLineNumber() As Boolean + Friend Overrides ReadOnly Property IsCallerLineNumber As Boolean Get Return Me._underlyingParameter.IsCallerLineNumber End Get End Property - Friend Overrides ReadOnly Property IsCallerFilePath() As Boolean + Friend Overrides ReadOnly Property IsCallerFilePath As Boolean Get Return Me._underlyingParameter.IsCallerFilePath End Get End Property - Friend Overrides ReadOnly Property IsCallerMemberName() As Boolean + Friend Overrides ReadOnly Property IsCallerMemberName As Boolean Get Return Me._underlyingParameter.IsCallerMemberName End Get End Property - Friend Overrides ReadOnly Property CountOfCustomModifiersPrecedingByRef() As UShort + Friend Overrides ReadOnly Property CountOfCustomModifiersPrecedingByRef As UShort Get Return Me._underlyingParameter.CountOfCustomModifiersPrecedingByRef End Get diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedPropertySymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedPropertySymbol.vb index ee1d33d87af..1bd640f51aa 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedPropertySymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedPropertySymbol.vb @@ -18,109 +18,109 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols Protected _underlyingProperty As PropertySymbol - Public ReadOnly Property UnderlyingProperty() As PropertySymbol + Public ReadOnly Property UnderlyingProperty As PropertySymbol Get Return Me._underlyingProperty End Get End Property - Public Overrides ReadOnly Property IsImplicitlyDeclared() As Boolean + Public Overrides ReadOnly Property IsImplicitlyDeclared As Boolean Get Return Me._underlyingProperty.IsImplicitlyDeclared End Get End Property - Public Overrides ReadOnly Property ReturnsByRef() As Boolean + Public Overrides ReadOnly Property ReturnsByRef As Boolean Get Return Me._underlyingProperty.ReturnsByRef End Get End Property - Public Overrides ReadOnly Property IsDefault() As Boolean + Public Overrides ReadOnly Property IsDefault As Boolean Get Return Me._underlyingProperty.IsDefault End Get End Property - Friend Overrides ReadOnly Property CallingConvention() As CallingConvention + Friend Overrides ReadOnly Property CallingConvention As CallingConvention Get Return Me._underlyingProperty.CallingConvention End Get End Property - Public Overrides ReadOnly Property Name() As String + Public Overrides ReadOnly Property Name As String Get Return Me._underlyingProperty.Name End Get End Property - Friend Overrides ReadOnly Property HasSpecialName() As Boolean + Friend Overrides ReadOnly Property HasSpecialName As Boolean Get Return Me._underlyingProperty.HasSpecialName End Get End Property - Public Overrides ReadOnly Property Locations() As ImmutableArray(Of Location) + Public Overrides ReadOnly Property Locations As ImmutableArray(Of Location) Get Return Me._underlyingProperty.Locations End Get End Property - Public Overrides ReadOnly Property DeclaringSyntaxReferences() As ImmutableArray(Of SyntaxReference) + Public Overrides ReadOnly Property DeclaringSyntaxReferences As ImmutableArray(Of SyntaxReference) Get Return Me._underlyingProperty.DeclaringSyntaxReferences End Get End Property - Public Overrides ReadOnly Property DeclaredAccessibility() As Accessibility + Public Overrides ReadOnly Property DeclaredAccessibility As Accessibility Get Return Me._underlyingProperty.DeclaredAccessibility End Get End Property - Public Overrides ReadOnly Property IsShared() As Boolean + Public Overrides ReadOnly Property IsShared As Boolean Get Return Me._underlyingProperty.IsShared End Get End Property - Public Overrides ReadOnly Property IsOverridable() As Boolean + Public Overrides ReadOnly Property IsOverridable As Boolean Get Return Me._underlyingProperty.IsOverridable End Get End Property - Public Overrides ReadOnly Property IsOverrides() As Boolean + Public Overrides ReadOnly Property IsOverrides As Boolean Get Return Me._underlyingProperty.IsOverrides End Get End Property - Public Overrides ReadOnly Property IsMustOverride() As Boolean + Public Overrides ReadOnly Property IsMustOverride As Boolean Get Return Me._underlyingProperty.IsMustOverride End Get End Property - Public Overrides ReadOnly Property IsNotOverridable() As Boolean + Public Overrides ReadOnly Property IsNotOverridable As Boolean Get Return Me._underlyingProperty.IsNotOverridable End Get End Property - Friend Overrides ReadOnly Property ObsoleteAttributeData() As ObsoleteAttributeData + Friend Overrides ReadOnly Property ObsoleteAttributeData As ObsoleteAttributeData Get Return Me._underlyingProperty.ObsoleteAttributeData End Get End Property - Public Overrides ReadOnly Property MetadataName() As String + Public Overrides ReadOnly Property MetadataName As String Get Return Me._underlyingProperty.MetadataName End Get End Property - Friend Overrides ReadOnly Property HasRuntimeSpecialName() As Boolean + Friend Overrides ReadOnly Property HasRuntimeSpecialName As Boolean Get Return Me._underlyingProperty.HasRuntimeSpecialName End Get diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedTypeParameterSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedTypeParameterSymbol.vb index 38f5ab133de..275baef19dd 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedTypeParameterSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedTypeParameterSymbol.vb @@ -17,67 +17,67 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols Protected _underlyingTypeParameter As TypeParameterSymbol - Public ReadOnly Property UnderlyingTypeParameter() As TypeParameterSymbol + Public ReadOnly Property UnderlyingTypeParameter As TypeParameterSymbol Get Return Me._underlyingTypeParameter End Get End Property - Public Overrides ReadOnly Property IsImplicitlyDeclared() As Boolean + Public Overrides ReadOnly Property IsImplicitlyDeclared As Boolean Get Return Me._underlyingTypeParameter.IsImplicitlyDeclared End Get End Property - Public Overrides ReadOnly Property TypeParameterKind() As TypeParameterKind + Public Overrides ReadOnly Property TypeParameterKind As TypeParameterKind Get Return Me._underlyingTypeParameter.TypeParameterKind End Get End Property - Public Overrides ReadOnly Property Ordinal() As Integer + Public Overrides ReadOnly Property Ordinal As Integer Get Return Me._underlyingTypeParameter.Ordinal End Get End Property - Public Overrides ReadOnly Property HasConstructorConstraint() As Boolean + Public Overrides ReadOnly Property HasConstructorConstraint As Boolean Get Return Me._underlyingTypeParameter.HasConstructorConstraint End Get End Property - Public Overrides ReadOnly Property HasReferenceTypeConstraint() As Boolean + Public Overrides ReadOnly Property HasReferenceTypeConstraint As Boolean Get Return Me._underlyingTypeParameter.HasReferenceTypeConstraint End Get End Property - Public Overrides ReadOnly Property HasValueTypeConstraint() As Boolean + Public Overrides ReadOnly Property HasValueTypeConstraint As Boolean Get Return Me._underlyingTypeParameter.HasValueTypeConstraint End Get End Property - Public Overrides ReadOnly Property Variance() As VarianceKind + Public Overrides ReadOnly Property Variance As VarianceKind Get Return Me._underlyingTypeParameter.Variance End Get End Property - Public Overrides ReadOnly Property Locations() As ImmutableArray(Of Location) + Public Overrides ReadOnly Property Locations As ImmutableArray(Of Location) Get Return Me._underlyingTypeParameter.Locations End Get End Property - Public Overrides ReadOnly Property DeclaringSyntaxReferences() As ImmutableArray(Of SyntaxReference) + Public Overrides ReadOnly Property DeclaringSyntaxReferences As ImmutableArray(Of SyntaxReference) Get Return Me._underlyingTypeParameter.DeclaringSyntaxReferences End Get End Property - Public Overrides ReadOnly Property Name() As String + Public Overrides ReadOnly Property Name As String Get Return Me._underlyingTypeParameter.Name End Get diff --git a/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenTuples.vb b/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenTuples.vb index 1bc1bb75136..d53ee0e43b2 100644 --- a/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenTuples.vb +++ b/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenTuples.vb @@ -114,9 +114,9 @@ Imports System Module C Sub Main() - Dim t as (Integer, Integer, Integer, integer, integer, integer, integer, integer, integer, Integer, Integer, Integer, integer, integer, integer, integer, integer, integer) + Dim t as (Integer, Integer, Integer, integer, integer, integer, integer, integer, integer, Integer, Integer, String, integer, integer, integer, integer, String, integer) - t.Item17 = 42 + t.Item17 = "hello" t.Item12 = t.Item17 console.writeline(t.Item12) End Sub @@ -124,36 +124,35 @@ End Module , expectedOutput:=, additionalRefs:={ValueTupleRef, SystemRuntimeFacadeRef}) verifier.VerifyIL("C.Main", ) End Sub - Public Sub TupleNamedFieldBinding() diff --git a/src/Compilers/VisualBasic/Test/Syntax/Parser/ParseLanguageVersionTests.vb b/src/Compilers/VisualBasic/Test/Syntax/Parser/ParseLanguageVersionTests.vb index e0c54a75c49..bc6fe9e278c 100644 --- a/src/Compilers/VisualBasic/Test/Syntax/Parser/ParseLanguageVersionTests.vb +++ b/src/Compilers/VisualBasic/Test/Syntax/Parser/ParseLanguageVersionTests.vb @@ -350,8 +350,8 @@ Module Module1 End Function End Module ]]>.Value, - LanguageVersion.VisualBasic12, - Diagnostic(ERRID.ERR_LanguageVersion, "(Integer, Integer)").WithArguments("12.0", "tuples").WithLocation(4, 19), - Diagnostic(ERRID.ERR_LanguageVersion, "(A As Integer, B As Integer)").WithArguments("12.0", "tuples").WithLocation(5, 19)) + LanguageVersion.VisualBasic14, + Diagnostic(ERRID.ERR_LanguageVersion, "(Integer, Integer)").WithArguments("14.0", "tuples").WithLocation(4, 19), + Diagnostic(ERRID.ERR_LanguageVersion, "(A As Integer, B As Integer)").WithArguments("14.0", "tuples").WithLocation(5, 19)) End Sub End Class \ No newline at end of file diff --git a/src/Compilers/VisualBasic/Test/Syntax/Scanner/ScannerTests.vb b/src/Compilers/VisualBasic/Test/Syntax/Scanner/ScannerTests.vb index af977df0225..a2d12c7e897 100644 --- a/src/Compilers/VisualBasic/Test/Syntax/Scanner/ScannerTests.vb +++ b/src/Compilers/VisualBasic/Test/Syntax/Scanner/ScannerTests.vb @@ -700,7 +700,7 @@ End If]]>.Value, Assert.Equal(LiteralBase.Decimal, tk.GetBase()) Assert.Equal(42, tk.Value) Assert.Equal(" 4_2 ", tk.ToFullString()) - Assert.Equal("error BC36716: Visual Basic 14.0 does not support digit separators.", tk.Errors().Single().ToString()) + Assert.Equal("error BC36716: Visual Basic 15.0 does not support digit separators.", tk.Errors().Single().ToString()) Str = " &H42L " tk = ScanOnce(Str) @@ -729,7 +729,7 @@ End If]]>.Value, Assert.Equal(LiteralBase.Binary, tk.GetBase()) Assert.Equal(&HAL, tk.Value) Assert.Equal(" &B1010L ", tk.ToFullString()) - Assert.Equal("error BC36716: Visual Basic 14.0 does not support binary literals.", tk.Errors().Single().ToString()) + Assert.Equal("error BC36716: Visual Basic 15.0 does not support binary literals.", tk.Errors().Single().ToString()) Str = " &B1_0_1_0L " tk = ScanOnce(Str) @@ -738,8 +738,8 @@ End If]]>.Value, Assert.Equal(&HAL, tk.Value) Assert.Equal(" &B1_0_1_0L ", tk.ToFullString()) Assert.Equal(2, tk.Errors().Count) - Assert.Equal("error BC36716: Visual Basic 14.0 does not support digit separators.", tk.Errors()(0).ToString()) - Assert.Equal("error BC36716: Visual Basic 14.0 does not support binary literals.", tk.Errors()(1).ToString()) + Assert.Equal("error BC36716: Visual Basic 15.0 does not support digit separators.", tk.Errors()(0).ToString()) + Assert.Equal("error BC36716: Visual Basic 15.0 does not support binary literals.", tk.Errors()(1).ToString()) End Sub -- GitLab