Fix type-unaware target collection (#340)

* Disable type-unware target collection for complex expressions * Don't create type-aware targets for attributes without `AsExprType` enabled * Fix type-unaware target collection for attributes
hashicorp · Nov 3, 2023 · 2ce7ad1 · 2ce7ad1
1 parent fc59723
commit 2ce7ad1
Show file tree

Hide file tree

Showing 16 changed files with 140 additions and 838 deletions.
diff --git a/decoder/expr_any_ref_targets.go b/decoder/expr_any_ref_targets.go
@@ -22,7 +22,7 @@ func (a Any) ReferenceTargets(ctx context.Context, targetCtx *TargetContext) ref
 		}
 	}
 
-	if targetCtx == nil || len(targetCtx.ParentAddress) == 0 {
+	if targetCtx == nil || len(targetCtx.ParentAddress) == 0 || !targetCtx.AsExprType {
 		return reference.Targets{}
 	}
 
@@ -34,11 +34,6 @@ func (a Any) ReferenceTargets(ctx context.Context, targetCtx *TargetContext) ref
 			rangePtr = a.expr.Range().Ptr()
 		}
 
-		var refType cty.Type
-		if targetCtx.AsExprType {
-			refType = typ
-		}
-
 		return reference.Targets{
 			{
 				Addr:                   targetCtx.ParentAddress,
@@ -47,7 +42,7 @@ func (a Any) ReferenceTargets(ctx context.Context, targetCtx *TargetContext) ref
 				ScopeId:                targetCtx.ScopeId,
 				RangePtr:               rangePtr,
 				DefRangePtr:            targetCtx.ParentDefRangePtr,
-				Type:                   refType,
+				Type:                   typ,
 			},
 		}
 	}