Merge "resolver: Expose the magical "result" return parameter and stop unknown inference on first match." into studio-1.3-devstudio-master-release

2 files changed, 2 insertions, 4 deletions

diff --git a/api/resolver/function.go b/api/resolver/function.go
index dfee00a41..da9994259 100644
--- a/api/resolver/function.go
+++ b/api/resolver/function.go
@@ -92,9 +92,7 @@ func functionBody(ctx *context, owner semantic.Type, out *semantic.Function) {
 		}
 		ctx.with(semantic.VoidType, func() {
 			for _, p := range out.FullParameters {
-				if p != out.Return {
-					ctx.add(p.Name, p)
-				}
+				ctx.add(p.Name, p)
 			}
 			if out.This != nil {
 				ctx.add(string(ast.KeywordThis), out.This)
diff --git a/api/resolver/inference.go b/api/resolver/inference.go
index 28b192420..286b72401 100644
--- a/api/resolver/inference.go
+++ b/api/resolver/inference.go
@@ -73,7 +73,7 @@ func inferNumber(ctx *context, in *ast.Number, infer semantic.Type) semantic.Exp
 
 func inferUnknown(ctx *context, lhs semantic.Node, rhs semantic.Node) {
 	u := findUnknown(ctx, rhs)
-	if u != nil {
+	if u != nil && u.Inferred == nil {
 		u.Inferred = lhsToObserved(ctx, lhs)
 	}
 }