respond to review

onflow · Oct 19, 2023 · 197334d · 197334d
1 parent 8c53fae
commit 197334d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/runtime/ast/type.go b/runtime/ast/type.go
@@ -25,6 +25,7 @@ import (
 	"github.com/turbolent/prettier"
 
 	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/runtime/errors"
 )
 
 const typeSeparatorSpaceDoc = prettier.Text(": ")
@@ -597,6 +598,8 @@ func (t *ReferenceType) Doc() prettier.Doc {
 				referenceTypeMappingKeywordDoc,
 				authorization.EntitlementMap.Doc(),
 			)
+		default:
+			panic(errors.NewUnreachableError())
 		}
 		doc = append(doc, prettier.Text(")"))
 		doc = append(doc, prettier.Space)

diff --git a/runtime/sema/checker.go b/runtime/sema/checker.go
@@ -1261,21 +1261,19 @@ func (checker *Checker) functionType(
 	parameterList *ast.ParameterList,
 	returnTypeAnnotation *ast.TypeAnnotation,
 ) *FunctionType {
-
-	oldMappedAccess := checker.entitlementMappingInScope
-	if mapAccess, isMapAccess := access.(*EntitlementMapAccess); isMapAccess {
-		checker.entitlementMappingInScope = mapAccess.Type
-	} else {
-		checker.entitlementMappingInScope = nil
-	}
-	defer func() { checker.entitlementMappingInScope = oldMappedAccess }()
-
 	convertedParameters := checker.parameters(parameterList)
 
 	convertedReturnTypeAnnotation := VoidTypeAnnotation
 	if returnTypeAnnotation != nil {
+		// to allow entitlement mapping types to be used in the return annotation only of
+		// a mapped accessor function, we introduce a "variable" into the typing scope while
+		// checking the return
+		if mapAccess, isMapAccess := access.(*EntitlementMapAccess); isMapAccess {
+			checker.entitlementMappingInScope = mapAccess.Type
+		}
 		convertedReturnTypeAnnotation =
 			checker.ConvertTypeAnnotation(returnTypeAnnotation)
+		checker.entitlementMappingInScope = nil
 	}
 
 	return &FunctionType{