提交 21e13af9 编写于 作者: J Jared Parsons

Revert "React to breaking changes in S.C.Immutable RC"

This reverts commit 90215346.
上级 0e6f957d
......@@ -359,7 +359,7 @@ ImmutableArray<IAssemblySymbol> IModuleSymbol.ReferencedAssemblySymbols
{
get
{
return ImmutableArray<IAssemblySymbol>.CastUp(ReferencedAssemblySymbols);
return ImmutableArray.Create<IAssemblySymbol, AssemblySymbol>(ReferencedAssemblySymbols);
}
}
......
......@@ -333,7 +333,7 @@ private int RunCore(TextWriter consoleOutput, CancellationToken cancellationToke
cancellationToken.ThrowIfCancellationRequested();
var analyzerOptions = new AnalyzerOptions(ImmutableArray<AdditionalText>.CastUp(additionalTextFiles));
var analyzerOptions = new AnalyzerOptions(ImmutableArray.Create<AdditionalText, AdditionalTextFile>(additionalTextFiles));
AnalyzerDriver analyzerDriver = null;
AnalyzerManager analyzerManager = null;
......
......@@ -266,7 +266,7 @@ public static ImmutableArray<T> WhereAsArray<T>(this ImmutableArray<T> array, Fu
public static ImmutableArray<TBase> Cast<TDerived, TBase>(this ImmutableArray<TDerived> items)
where TDerived : class, TBase
{
return ImmutableArray<TBase>.CastUp(items);
return ImmutableArray.Create<TBase, TDerived>(items);
}
/// <summary>
......
......@@ -8,7 +8,7 @@ internal static class StaticCast<T>
{
internal static ImmutableArray<T> From<TDerived>(ImmutableArray<TDerived> from) where TDerived : class, T
{
return ImmutableArray<T>.CastUp(from);
return ImmutableArray.Create<T, TDerived>(from);
}
}
}
......@@ -101,10 +101,7 @@ public void Insert(int index, T item)
public void EnsureCapacity(int capacity)
{
if (_builder.Capacity < capacity)
{
_builder.Capacity = capacity;
}
_builder.EnsureCapacity(capacity);
}
public void Clear()
......@@ -134,7 +131,7 @@ public void RemoveLast()
public void ReverseContents()
{
_builder.Reverse();
_builder.ReverseContents();
}
public void Sort()
......
......@@ -2020,7 +2020,7 @@ ExitForFor:
' Only named types have members that are types. Go through all the types in this type and
' validate them. If there's multiple, give an error.
If TypeOf container Is NamedTypeSymbol Then
members = ImmutableArray(Of Symbol).CastUp(container.GetTypeMembers(name))
members = ImmutableArray.Create(Of Symbol, NamedTypeSymbol)(container.GetTypeMembers(name))
End If
ElseIf (options And LookupOptions.LabelsOnly) = 0 Then
members = container.GetMembers(name)
......
......@@ -817,7 +817,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
Private ReadOnly Property IMethodSymbol_Parameters As ImmutableArray(Of IParameterSymbol) Implements IMethodSymbol.Parameters
Get
Return ImmutableArray(Of IParameterSymbol).CastUp(Me.Parameters)
Return ImmutableArray.Create(Of IParameterSymbol, ParameterSymbol)(Me.Parameters)
End Get
End Property
......
......@@ -290,7 +290,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
Private ReadOnly Property IModuleSymbol_ReferencedAssemblySymbols As ImmutableArray(Of IAssemblySymbol) Implements IModuleSymbol.ReferencedAssemblySymbols
Get
Return ImmutableArray(Of IAssemblySymbol).CastUp(ReferencedAssemblySymbols)
Return ImmutableArray.Create(Of IAssemblySymbol, AssemblySymbol)(ReferencedAssemblySymbols)
End Get
End Property
......
......@@ -332,7 +332,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
Public Overloads Overrides Function GetMembers(name As String) As ImmutableArray(Of Symbol)
Dim members As ImmutableArray(Of NamespaceOrTypeSymbol) = Nothing
If Me.GetNameToMembersMap().TryGetValue(name, members) Then
Return ImmutableArray(Of Symbol).CastUp(members)
Return ImmutableArray.Create(Of Symbol, NamespaceOrTypeSymbol)(members)
Else
Return ImmutableArray(Of Symbol).Empty
End If
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册