Fix multiplication of range and quantity (#489)

src/range.jl

@@ -2,6 +2,7 @@ const colon = Base.:(:)
 
 import Base: ArithmeticRounds
 import Base: OrderStyle, Ordered, ArithmeticStyle, ArithmeticWraps
+import Base.Broadcast: DefaultArrayStyle, broadcasted
 
 *(y::Units, r::AbstractRange) = *(r,y)
 *(r::AbstractRange, y::Units, z::Units...) = *(r, *(y,z...))
@@ -95,3 +96,15 @@ end
 function /(x::Base.TwicePrecision, v::Quantity)
     x / Base.TwicePrecision(oftype(ustrip(x.hi)/ustrip(v)*unit(v), v))
 end
+
+# These can be removed (I think) if `range_start_step_length()` returns a `StepRangeLen` for
+# non-floats, cf. https://github.com/JuliaLang/julia/issues/40672
+broadcasted(::DefaultArrayStyle{1}, ::typeof(*), r::AbstractRange, x::AbstractQuantity) =
+    broadcasted(DefaultArrayStyle{1}(), *, r, ustrip(x)) * unit(x)
+broadcasted(::DefaultArrayStyle{1}, ::typeof(*), x::AbstractQuantity, r::AbstractRange) =
+    broadcasted(DefaultArrayStyle{1}(), *, ustrip(x), r) * unit(x)
+# for ambiguity resolution
+broadcasted(::DefaultArrayStyle{1}, ::typeof(*), r::StepRangeLen{T}, x::AbstractQuantity) where T =
+    broadcasted(DefaultArrayStyle{1}(), *, r, ustrip(x)) * unit(x)
+broadcasted(::DefaultArrayStyle{1}, ::typeof(*), x::AbstractQuantity, r::StepRangeLen{T}) where T =
+    broadcasted(DefaultArrayStyle{1}(), *, ustrip(x), r) * unit(x)

test/runtests.jl

@@ -1157,6 +1157,8 @@ end
             @test *(1:5, mm, s^-1) === 1mm*s^-1:1mm*s^-1:5mm*s^-1
             @test *(1:5, mm, s^-1, mol^-1) === 1mm*s^-1*mol^-1:1mm*s^-1*mol^-1:5mm*s^-1*mol^-1
             @test @inferred((0:2) * 3f0m) === StepRangeLen{typeof(0f0m)}(0.0m, 3.0m, 3) # issue #477
+            @test @inferred(3f0m * (0:2)) === StepRangeLen{typeof(0f0m)}(0.0m, 3.0m, 3) # issue #477
+            @test @inferred(1.0s * range(0.1, step=0.1, length=3)) === @inferred(range(0.1, step=0.1, length=3) * 1.0s)
         end
     end
     @testset "> Arrays" begin