Fix tests

Author: mtfishman

src/BlockArraysExtensions/BlockArraysExtensions.jl

@@ -88,6 +88,9 @@ function _blockslice(x, y::AbstractVector)
   return BlockIndices(x, y)
 end
 
+# TODO: Constrain the type of `BlockIndices` more, this seems
+# to assume that `S.blocks` is a list of blocks as opposed to
+# a flat list of block indices like the definition below.
 function Base.getindex(S::BlockIndices, i::BlockSlice{<:Block{1}})
   # TODO: Check that `i.indices` is consistent with `S.indices`.
   # It seems like this isn't handling the case where `i` is a
@@ -96,6 +99,13 @@ function Base.getindex(S::BlockIndices, i::BlockSlice{<:Block{1}})
   return _blockslice(S.blocks[Int(Block(i))], S.indices[Block(i)])
 end
 
+function Base.getindex(
+  S::BlockIndices{<:AbstractBlockVector{<:BlockIndex{1}}}, i::BlockSlice{<:Block{1}}
+)
+  @assert length(S.indices[Block(i)]) == length(i.indices)
+  return _blockslice(S.blocks[Block(i)], S.indices[Block(i)])
+end
+
 # This is used in slicing like:
 # a = BlockSparseArray{Float64}([2, 2, 2, 2], [2, 2, 2, 2])
 # I = BlockedVector([Block(4), Block(3), Block(2), Block(1)], [2, 2])

src/abstractblocksparsearray/views.jl

@@ -316,6 +316,15 @@ function Base.view(
 ) where {T,N}
   return viewblock(a, block...)
 end
+# Fix ambiguity error.
+function Base.view(
+  a::SubArray{
+    T,N,<:AbstractBlockSparseArray{T,N},<:Tuple{Vararg{SubBlockSliceCollection,N}}
+  },
+  block::Vararg{Block{1},N},
+) where {T,N}
+  return viewblock(a, block...)
+end
 function BlockArrays.viewblock(
   a::SubArray{
     T,N,<:AbstractBlockSparseArray{T,N},<:Tuple{Vararg{SubBlockSliceCollection,N}}

src/blocksparsearrayinterface/blocksparsearrayinterface.jl

@@ -222,19 +222,25 @@ end
 
 # a[mortar([Block(1)[1:2], Block(2)[1:3]]), mortar([Block(1)[1:2], Block(2)[1:3]])]
 # a[[Block(1)[1:2], Block(2)[1:3]], [Block(1)[1:2], Block(2)[1:3]]]
-@interface ::AbstractBlockSparseArrayInterface function Base.to_indices(
-  a, inds, I::Tuple{BlockVector{<:BlockIndex{1},<:Vector{<:BlockIndexRange{1}}},Vararg{Any}}
-)
-  I1 = BlockIndices(I[1], blockedunitrange_getindices(inds[1], I[1]))
-  return (I1, to_indices(a, Base.tail(inds), Base.tail(I))...)
-end
-
 @interface ::AbstractBlockSparseArrayInterface function Base.to_indices(
   a,
   inds,
-  I::Tuple{BlockVector{<:BlockIndex{1},<:Vector{<:BlockIndexVector{1}}},Vararg{Any}},
+  I::Tuple{
+    BlockVector{<:BlockIndex{1},<:Vector{<:Union{BlockIndexRange{1},BlockIndexVector{1}}}},
+    Vararg{Any},
+  },
 )
-  I1 = BlockIndices(I[1], blockedunitrange_getindices(inds[1], I[1]))
+  # Index the `inds` by the `BlockIndexRange`/`BlockIndexVector`s on each block
+  # in order to canonicalize the indices and preserve metadata,
+  # such as sector data for symmetric tensors.
+  bs = mortar(
+    map(blocks(I[1])) do bi
+      b = Block(bi)
+      binds = only(bi.indices)
+      return BlockIndexVector(b, Base.axes1(inds[1][b])[binds])
+    end,
+  )
+  I1 = BlockIndices(bs, blockedunitrange_getindices(inds[1], I[1]))
   return (I1, to_indices(a, Base.tail(inds), Base.tail(I))...)
 end
 @interface ::AbstractBlockSparseArrayInterface function Base.to_indices(