use type argument range in constructor when available

runtime/sema/check_invocation_expression.go

@@ -459,6 +459,11 @@ func (checker *Checker) checkInvocation(
 		}
 	}
 
+	invocationRange := ast.NewRangeFromPositioned(
+		checker.memoryGauge,
+		invocationExpression,
+	)
+
 	// The invokable type might have special checks for the arguments
 
 	if functionType.ArgumentExpressionsCheck != nil && argumentCount > 0 {
@@ -467,11 +472,6 @@ func (checker *Checker) checkInvocation(
 			argumentExpressions[i] = argument.Expression
 		}
 
-		invocationRange := ast.NewRangeFromPositioned(
-			checker.memoryGauge,
-			invocationExpression,
-		)
-
 		functionType.ArgumentExpressionsCheck(
 			checker,
 			argumentExpressions,
@@ -496,15 +496,12 @@ func (checker *Checker) checkInvocation(
 	// The invokable type might have special checks for the type parameters.
 
 	if functionType.TypePrametersCheck != nil {
-		invocationRange := ast.NewRangeFromPositioned(
-			checker.memoryGauge,
-			invocationExpression,
-		)
-
 		functionType.TypePrametersCheck(
+			checker.memoryGauge,
 			typeArguments,
-			checker.report,
+			invocationExpression.TypeArguments,
 			invocationRange,
+			checker.report,
 		)
 	}
 

runtime/sema/type.go

@@ -3379,9 +3379,11 @@ type ArgumentExpressionsCheck func(
 )
 
 type TypeParametersCheck func(
+	memoryGauge common.MemoryGauge,
 	typeArguments *TypeParameterTypeOrderedMap,
+	astTypeArguments []*ast.TypeAnnotation,
+	astInvocationRange ast.Range,
 	report func(err error),
-	invocationRange ast.Range,
 )
 
 // BaseTypeActivation is the base activation that contains

runtime/stdlib/range.go

@@ -22,6 +22,7 @@ import (
 	"fmt"
 
 	"github.com/onflow/cadence/runtime/ast"
+	"github.com/onflow/cadence/runtime/common"
 	"github.com/onflow/cadence/runtime/errors"
 	"github.com/onflow/cadence/runtime/interpreter"
 	"github.com/onflow/cadence/runtime/sema"
@@ -75,19 +76,31 @@ var inclusiveRangeConstructorFunctionType = func() *sema.FunctionType {
 		),
 		// `step` parameter is optional
 		Arity: &sema.Arity{Min: 2, Max: 3},
-		TypePrametersCheck: func(typeArguments *sema.TypeParameterTypeOrderedMap, report func(error), invocationRange ast.Range) {
+		TypePrametersCheck: func(
+			memoryGauge common.MemoryGauge,
+			typeArguments *sema.TypeParameterTypeOrderedMap,
+			astTypeArguments []*ast.TypeAnnotation,
+			astInvocationRange ast.Range,
+			report func(error),
+		) {
 			memberType, ok := typeArguments.Get(typeParameter)
 			if !ok || memberType == nil {
 				// checker should prevent this
 				panic(errors.NewUnreachableError())
 			}
 
+			paramAstRange := astInvocationRange
+			// If type argument was provided, use its range otherwise fallback to invocation range.
+			if len(astTypeArguments) > 0 {
+				paramAstRange = ast.NewRangeFromPositioned(memoryGauge, astTypeArguments[0])
+			}
+
 			// memberType must only be a leaf integer type.
 			for _, ty := range sema.AllNonLeafIntegerTypes {
 				if memberType == ty {
 					report(&sema.InvalidTypeArgumentError{
 						TypeArgumentName: typeParameter.Name,
-						Range:            invocationRange,
+						Range:            paramAstRange,
 						Details:          fmt.Sprintf("Creation of InclusiveRange<%s> is disallowed", memberType),
 					})
 				}