firefly-compiler 0.4.19 → 0.4.21

package/output/js/ff/compiler/Resolver.mjs

@@ -156,7 +156,6 @@ return module2_
 export function Resolver_checkInstanceType(self_, type_) {
 {
 const _1 = type_;
-{
 if(_1.TConstructor) {
 const name_ = _1.name_;
 const typeArguments_ = _1.generics_;
@@ -168,7 +167,6 @@ ff_compiler_Resolver.Resolver_checkInstanceType(self_, _w1)
 }))
 return
 }
-}
 {
 
 return
@@ -183,18 +181,13 @@ ff_core_List.List_each(imports_, ((import_) => {
 const _1 = ff_core_List.List_find(modules_, ((_w1) => {
 return (ff_core_String.String_dropLast(_w1.file_, 3) === import_.file_)
 }));
-{
 if(_1.Some) {
 const module_ = _1.value_;
 resolver_ = ff_compiler_Resolver.Resolver_processDefinitions(resolver_, module_, ff_core_Option.Some(import_.alias_))
 return
 }
-}
-{
 if(_1.None) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(import_.at_, ("No such module: " + import_.file_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
 }
 }
 }));
@@ -206,28 +199,18 @@ function entry_(name_, unqualified_) {
 const full_ = ((((ff_compiler_Syntax.PackagePair_groupName(module_.packagePair_, ":") + "/") + ff_core_String.String_dropLast(module_.file_, 3)) + ".") + name_);
 {
 const _1 = importAlias_;
-{
 if(_1.None) {
 return [ff_core_Pair.Pair(name_, full_), ff_core_Pair.Pair(full_, full_)]
-return
-}
 }
-{
 if(_1.Some) {
 const alias_ = _1.value_;
-const _guard1 = unqualified_;
-if(_guard1) {
+if(unqualified_) {
 return [ff_core_Pair.Pair(((alias_ + ".") + name_), full_), ff_core_Pair.Pair(name_, full_), ff_core_Pair.Pair(full_, full_)]
-return
-}
 }
 }
-{
 if(_1.Some) {
 const alias_ = _1.value_;
 return [ff_core_Pair.Pair(((alias_ + ".") + name_), full_), ff_core_Pair.Pair(full_, full_)]
-return
-}
 }
 }
 }
@@ -310,14 +293,13 @@ const _1 = self_;
 {
 const _c = _1;
 return ff_compiler_Resolver.Resolver(ff_core_Map.Map_addAll(ff_core_Map.Map_addAll(ff_core_Map.Map_addAll(self_.variables_, lets_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), functions_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), traitMethods_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Map.Map_addAll(ff_core_Map.Map_addAll(ff_core_Map.Map_addAll(self_.variableLocations_, letLocations_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), functionLocations_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), traitMethodLocations_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Map.Map_addAll(self_.variants_, variants_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Map.Map_addAll(self_.types_, types_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Map.Map_addAll(self_.typeGenerics_, typeGenerics_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Map.Map_addAll(self_.typeLocations_, typeLocations_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Set.Set_addAll(self_.asyncTypes_, asyncTypes_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_List.List_toSet([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Map.Map_addAll(self_.traits_, traits_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Map.Map_addAll(self_.traitLocations_, traitLocations_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), self_.state_, _c.lspHook_)
-return
 }
 }
 }
 
 export function Resolver_resolveTypeDefinition(self_, definition_) {
 if(ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, definition_.at_)) {
-ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(definition_.name_, definition_.at_, definition_.at_), ff_core_Option.None()))
+ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(definition_.name_, definition_.at_, definition_.at_), ff_core_Option.None(), true))
 };
 const generics_ = ff_core_List.List_toMap(ff_core_List.List_map(definition_.generics_, ((g_) => {
 return ff_core_Pair.Pair(g_, g_)
@@ -359,7 +341,7 @@ return
 }
 })), ff_core_List.List_map(definition_.variants_, ((v_) => {
 if(ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, v_.at_)) {
-ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(v_.name_, v_.at_, v_.at_), ff_core_Option.None()))
+ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(v_.name_, v_.at_, v_.at_), ff_core_Option.None(), true))
 };
 {
 const _1 = v_;
@@ -392,7 +374,7 @@ return
 
 export function Resolver_resolveTraitDefinition(self_, definition_) {
 if((ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, definition_.at_) || ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, definition_.at_))) {
-ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(definition_.name_, definition_.at_, definition_.at_), ff_core_Option.None()))
+ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(definition_.name_, definition_.at_, definition_.at_), ff_core_Option.None(), true))
 };
 const generics_ = ff_core_List.List_toMap(ff_core_List.List_map(definition_.generics_, ((g_) => {
 return ff_core_Pair.Pair(g_, g_)
@@ -418,16 +400,12 @@ return (_w1.name_ === name_)
 const function1_ = ff_compiler_Syntax.DFunction(signature_.at_, signature_, ff_compiler_Syntax.FireflyTarget(lambda_));
 const function2_ = ff_compiler_Resolver.Resolver_resolveFunctionDefinition(self2_, function1_, true, false);
 return ff_core_Pair.Pair(name_, (((_1) => {
-{
 if(_1.FireflyTarget) {
 const lambda_ = _1.lambda_;
 return lambda_
-return
-}
 }
 {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(signature_.at_, "Internal error: Expected method default to be a lambda"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
 }
 }))(function2_.body_))
 return
@@ -443,7 +421,7 @@ const traitDefinedAt_ = ff_core_Option.Option_else(ff_core_Map.Map_get(self_.tra
 return definition_.at_
 }));
 if((ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, definition_.at_) || ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, traitDefinedAt_))) {
-ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(definition_.traitName_, definition_.at_, traitDefinedAt_), ff_core_Option.None()))
+ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(definition_.traitName_, definition_.at_, traitDefinedAt_), ff_core_Option.None(), true))
 };
 const generics_ = ff_core_List.List_toMap(ff_core_List.List_map(definition_.generics_, ((g_) => {
 return ff_core_Pair.Pair(g_, g_)
@@ -496,48 +474,33 @@ return
 
 export function Resolver_resolveLetDefinition(self_, definition_, topLevel_) {
 if((ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, definition_.at_) || ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, definition_.at_))) {
-ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(definition_.name_, definition_.at_, definition_.at_), ff_core_Option.None()))
+ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(definition_.name_, definition_.at_, definition_.at_), ff_core_Option.None(), topLevel_))
 };
 {
 const _1 = definition_;
 {
 const _c = _1;
 return ff_compiler_Syntax.DLet(_c.at_, _c.name_, ff_compiler_Resolver.Resolver_resolveType(self_, definition_.variableType_, topLevel_), ff_compiler_Resolver.Resolver_resolveTerm(self_, definition_.value_, true))
-return
 }
 }
 }
 
 export function Resolver_resolveTerm(self_, term_, topLevel_) {
-{
 const self_a = self_;
 const term_a = term_;
 const topLevel_a = topLevel_;
-{
 if(term_a.EString) {
 return term_
-return
 }
-}
-{
 if(term_a.EChar) {
 return term_
-return
 }
-}
-{
 if(term_a.EInt) {
 return term_
-return
-}
 }
-{
 if(term_a.EFloat) {
 return term_
-return
-}
 }
-{
 if(term_a.EVariable) {
 const e_ = term_a;
 if(ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
@@ -545,7 +508,7 @@ const at_ = ff_core_Option.Option_else(ff_core_Map.Map_get(self_.variableLocatio
 return e_.at_
 }));
 if((ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, e_.at_) || ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, at_))) {
-ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(e_.name_, e_.at_, at_), ff_core_Option.None()))
+ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(e_.name_, e_.at_, at_), ff_core_Option.None(), true))
 }
 };
 return ff_core_Option.Option_else(ff_core_Option.Option_map(ff_core_Map.Map_get(self_.variables_, e_.name_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ((_w1) => {
@@ -554,7 +517,6 @@ const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.EVariable(_c.at_, _w1)
-return
 }
 }
 })), (() => {
@@ -562,8 +524,6 @@ return term_
 }))
 return
 }
-}
-{
 if(term_a.EList) {
 const at_ = term_a.at_;
 const t_ = term_a.elementType_;
@@ -573,13 +533,10 @@ return ff_compiler_Syntax.EList(at_, ff_compiler_Resolver.Resolver_resolveType(s
 const item_ = _1.first_;
 const spread_ = _1.second_;
 return ff_core_Pair.Pair(ff_compiler_Resolver.Resolver_resolveTerm(self_, item_, topLevel_), spread_)
-return
 }
 })))
 return
 }
-}
-{
 if(term_a.EVariant) {
 const at_ = term_a.at_;
 const name_ = term_a.name_;
@@ -596,15 +553,12 @@ const _1 = a_;
 {
 const _c = _1;
 return ff_compiler_Syntax.Argument(_c.at_, _c.name_, ff_compiler_Resolver.Resolver_resolveTerm(self_, a_.value_, topLevel_))
-return
 }
 }
 }))
 })))
 return
 }
-}
-{
 if(term_a.EVariantIs) {
 const at_ = term_a.at_;
 const name_ = term_a.name_;
@@ -616,8 +570,6 @@ return ff_compiler_Resolver.Resolver_resolveType(self_, _w1, topLevel_)
 })))
 return
 }
-}
-{
 if(term_a.ECopy) {
 const at_ = term_a.at_;
 const name_ = term_a.name_;
@@ -631,14 +583,11 @@ const _1 = f_;
 {
 const _c = _1;
 return ff_compiler_Syntax.Field(_c.at_, _c.name_, ff_compiler_Resolver.Resolver_resolveTerm(self_, f_.value_, topLevel_))
-return
 }
 }
 })))
 return
 }
-}
-{
 if(term_a.EField) {
 const e_ = term_a;
 {
@@ -646,13 +595,10 @@ const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.EField(_c.at_, _c.newtype_, ff_compiler_Resolver.Resolver_resolveTerm(self_, e_.record_, topLevel_), _c.field_)
-return
 }
 }
 return
 }
-}
-{
 if(term_a.ELambda) {
 const at_ = term_a.at_;
 const lambdaAt_ = term_a.lambda_.at_;
@@ -663,21 +609,15 @@ return ff_compiler_Resolver.Resolver_resolveCase(self_, _w1, topLevel_)
 }))))
 return
 }
-}
-{
 if(term_a.EPipe) {
 const at_ = term_a.at_;
 const value_ = term_a.value_;
 const effect_ = term_a.effect_;
 const function_ = term_a.function_;
 return ff_compiler_Syntax.EPipe(at_, ff_compiler_Resolver.Resolver_resolveTerm(self_, value_, topLevel_), ff_compiler_Resolver.Resolver_resolveType(self_, effect_, topLevel_), ff_compiler_Resolver.Resolver_resolveTerm(self_, function_, topLevel_))
-return
 }
-}
-{
-if(term_a.ECall) {
+if(term_a.ECall && term_a.target_.DynamicCall) {
 const at_ = term_a.at_;
-if(term_a.target_.DynamicCall) {
 const target_ = term_a.target_;
 const effect_ = term_a.effect_;
 const typeArguments_ = term_a.typeArguments_;
@@ -693,24 +633,14 @@ const _1 = a_;
 {
 const _c = _1;
 return ff_compiler_Syntax.Argument(_c.at_, _c.name_, ff_compiler_Resolver.Resolver_resolveTerm(self_, a_.value_, topLevel_))
-return
 }
 }
 })), dictionaries_)
 return
 }
-}
-}
-{
-if(term_a.ECall) {
-const at_ = term_a.at_;
-if(term_a.target_.StaticCall) {
+if(term_a.ECall && term_a.target_.StaticCall) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Internal error: Static calls not expected in the Resolver phase"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
-}
 }
-{
 if(term_a.ERecord) {
 const at_ = term_a.at_;
 const fields_ = term_a.fields_;
@@ -720,14 +650,11 @@ const _1 = f_;
 {
 const _c = _1;
 return ff_compiler_Syntax.Field(_c.at_, _c.name_, ff_compiler_Resolver.Resolver_resolveTerm(self_, f_.value_, topLevel_))
-return
 }
 }
 })))
 return
 }
-}
-{
 if(term_a.EWildcard) {
 const e_ = term_a;
 if((e_.index_ === 0)) {
@@ -738,13 +665,10 @@ const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.EWildcard(_c.at_, _c.index_)
-return
 }
 }
 return
 }
-}
-{
 if(term_a.EFunctions) {
 const at_ = term_a.at_;
 const functions_ = term_a.functions_;
@@ -767,8 +691,6 @@ return ff_compiler_Resolver.Resolver_resolveFunctionDefinition(self2_, _w1, topL
 })), ff_compiler_Resolver.Resolver_resolveTerm(self2_, body_, topLevel_))
 return
 }
-}
-{
 if(term_a.ELet) {
 const e_ = term_a;
 const self2_ = (((_c) => {
@@ -776,7 +698,7 @@ return ff_compiler_Resolver.Resolver(ff_core_Map.Map_add(self_.variables_, e_.na
 }))(self_);
 if(ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 if((ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, e_.at_) || ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, e_.at_))) {
-ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(e_.name_, e_.at_, e_.at_), ff_core_Option.None()))
+ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(e_.name_, e_.at_, e_.at_), ff_core_Option.None(), false))
 }
 };
 {
@@ -784,22 +706,16 @@ const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.ELet(_c.at_, _c.mutable_, _c.name_, ff_compiler_Resolver.Resolver_resolveType(self_, e_.valueType_, topLevel_), ff_compiler_Resolver.Resolver_resolveTerm(self_, e_.value_, topLevel_), ff_compiler_Resolver.Resolver_resolveTerm(self2_, e_.body_, topLevel_))
-return
 }
 }
 return
 }
-}
-{
 if(term_a.ESequential) {
 const at_ = term_a.at_;
 const before_ = term_a.before_;
 const after_ = term_a.after_;
 return ff_compiler_Syntax.ESequential(at_, ff_compiler_Resolver.Resolver_resolveTerm(self_, before_, topLevel_), ff_compiler_Resolver.Resolver_resolveTerm(self_, after_, topLevel_))
-return
-}
 }
-{
 if(term_a.EAssign) {
 const at_ = term_a.at_;
 const operator_ = term_a.operator_;
@@ -810,8 +726,6 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Sy
 })), ff_compiler_Resolver.Resolver_resolveTerm(self_, value_, topLevel_))
 return
 }
-}
-{
 if(term_a.EAssignField) {
 const at_ = term_a.at_;
 const operator_ = term_a.operator_;
@@ -819,24 +733,16 @@ const record_ = term_a.record_;
 const field_ = term_a.field_;
 const value_ = term_a.value_;
 return ff_compiler_Syntax.EAssignField(at_, operator_, ff_compiler_Resolver.Resolver_resolveTerm(self_, record_, topLevel_), field_, ff_compiler_Resolver.Resolver_resolveTerm(self_, value_, topLevel_))
-return
-}
-}
 }
 }
 
 export function Resolver_resolveType(self_, type_, topLevel_) {
-{
 const self_a = self_;
 const type_a = type_;
 const topLevel_a = topLevel_;
-{
 if(type_a.TVariable) {
 return type_
-return
-}
 }
-{
 if(type_a.TConstructor) {
 const constructor_ = type_a;
 if(ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
@@ -871,7 +777,6 @@ const _1 = constructor_;
 {
 const _c = _1;
 return ff_compiler_Syntax.TConstructor(_c.at_, name_, [...effect_, ...arguments_, returnType_])
-return
 }
 }
 } else {
@@ -880,15 +785,12 @@ const _1 = constructor_;
 {
 const _c = _1;
 return ff_compiler_Syntax.TConstructor(_c.at_, name_, [...effect_, ...generics_])
-return
 }
 }
 }
 return
 }
 }
-}
-}
 
 export function Resolver_makeEffectArgument(self_, at_, topLevel_) {
 if(topLevel_) {
@@ -944,7 +846,7 @@ return ff_compiler_Syntax.DFunction(definition_.at_, signature_, body_)
 
 export function Resolver_resolveSignature(self_, signature_, topLevel_, isInstanceMethod_) {
 if((ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, signature_.at_) || ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, signature_.at_))) {
-ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSignatureHook(signature_, isInstanceMethod_))
+ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSignatureHook(signature_, isInstanceMethod_, topLevel_))
 };
 const newSignature_ = (topLevel_
 ? (((_c) => {
@@ -999,52 +901,30 @@ const _1 = self_;
 {
 const _c = _1;
 return ff_compiler_Resolver.Resolver(ff_core_Map.Map_addAll(self_.variables_, variableMap_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Map.Map_addAll(self_.variableLocations_, variableLocationMap_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), _c.variants_, ff_core_Map.Map_addAll(self_.types_, typeMap_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), _c.typeGenerics_, _c.typeLocations_, ff_core_Set.Set_removeAll(self_.asyncTypes_, ff_core_List.List_toSet(signature_.generics_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Set.Set_addAll(self_.typeParameters_, ff_core_List.List_toSet(signature_.generics_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), _c.traits_, _c.traitLocations_, _c.state_, _c.lspHook_)
-return
 }
 }
 }
 
 export function Resolver_resolveCase(self_, case_, topLevel_) {
 function findVariables_(pattern_) {
-{
 const pattern_a = pattern_;
-{
 if(pattern_a.PString) {
 return ff_core_Map.empty_()
-return
-}
 }
-{
 if(pattern_a.PInt) {
 return ff_core_Map.empty_()
-return
 }
-}
-{
 if(pattern_a.PChar) {
 return ff_core_Map.empty_()
-return
 }
-}
-{
-if(pattern_a.PVariable) {
+if(pattern_a.PVariable && pattern_a.name_.Some) {
 const at_ = pattern_a.at_;
-if(pattern_a.name_.Some) {
 const name_ = pattern_a.name_.value_;
 return ff_core_List.List_toMap([ff_core_Pair.Pair(name_, ff_core_Pair.Pair(at_, name_))], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
-return
-}
 }
-}
-{
-if(pattern_a.PVariable) {
-if(pattern_a.name_.None) {
+if(pattern_a.PVariable && pattern_a.name_.None) {
 return ff_core_Map.empty_()
-return
-}
-}
 }
-{
 if(pattern_a.PVariant) {
 const patterns_ = pattern_a.patterns_;
 return ff_core_List.List_foldLeft(ff_core_List.List_map(patterns_, ((pattern_) => {
@@ -1054,8 +934,6 @@ return ff_core_Map.Map_addAll(_w1, _w2, ff_core_Ordering.ff_core_Ordering_Order$
 }))
 return
 }
-}
-{
 if(pattern_a.PVariantAs) {
 const at_ = pattern_a.at_;
 const variableAt_ = pattern_a.variableAt_;
@@ -1065,16 +943,11 @@ return ff_core_Pair.Pair(x_, ff_core_Pair.Pair(variableAt_, x_))
 })), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
 return
 }
-}
-{
 if(pattern_a.PAlias) {
 const at_ = pattern_a.at_;
 const pattern_ = pattern_a.pattern_;
 const variable_ = pattern_a.variable_;
 return ff_core_Map.Map_addAll(ff_core_List.List_toMap([ff_core_Pair.Pair(variable_, ff_core_Pair.Pair(at_, variable_))], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), findVariables_(pattern_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
-return
-}
-}
 }
 }
 const variableMap_ = ff_core_List.List_foldLeft(ff_core_List.List_map(case_.patterns_, ((pattern_) => {
@@ -1110,34 +983,20 @@ return ff_compiler_Resolver.Resolver_resolvePattern(self_, _w1)
 }
 
 export function Resolver_resolvePattern(self_, pattern_) {
-{
 const self_a = self_;
 const pattern_a = pattern_;
-{
 if(pattern_a.PString) {
 return pattern_
-return
-}
 }
-{
 if(pattern_a.PInt) {
 return pattern_
-return
-}
 }
-{
 if(pattern_a.PChar) {
 return pattern_
-return
 }
-}
-{
 if(pattern_a.PVariable) {
 return pattern_
-return
-}
 }
-{
 if(pattern_a.PVariant) {
 const at_ = pattern_a.at_;
 const name_ = pattern_a.name_;
@@ -1149,10 +1008,7 @@ const newPatterns_ = ff_core_List.List_map(patterns_, ((_w1) => {
 return ff_compiler_Resolver.Resolver_resolvePattern(self_, _w1)
 }));
 return ff_compiler_Syntax.PVariant(at_, newName_, newPatterns_)
-return
-}
 }
-{
 if(pattern_a.PVariantAs) {
 const at_ = pattern_a.at_;
 const name_ = pattern_a.name_;
@@ -1162,33 +1018,22 @@ const newName_ = ff_core_Option.Option_else(ff_core_Map.Map_get(self_.variants_,
 return name_
 }));
 return ff_compiler_Syntax.PVariantAs(at_, newName_, variableAt_, variable_)
-return
-}
 }
-{
 if(pattern_a.PAlias) {
 const at_ = pattern_a.at_;
 const pattern_ = pattern_a.pattern_;
 const variable_ = pattern_a.variable_;
 const newPattern_ = ff_compiler_Resolver.Resolver_resolvePattern(self_, pattern_);
 return ff_compiler_Syntax.PAlias(at_, newPattern_, variable_)
-return
-}
-}
 }
 }
 
 export function Resolver_containsAsyncType(self_, type_) {
-{
 const self_a = self_;
 const type_a = type_;
-{
 if(type_a.TVariable) {
 return false
-return
 }
-}
-{
 if(type_a.TConstructor) {
 const constructor_ = type_a;
 const name_ = (ff_core_String.String_contains(constructor_.name_, "$")
@@ -1207,8 +1052,6 @@ return ff_compiler_Resolver.Resolver_containsAsyncType(self_, _w1)
 return
 }
 }
-}
-}
 
 export async function Resolver_freshUnificationVariable$(self_, at_, $task) {
 const result_ = ff_compiler_Syntax.TVariable(at_, self_.state_.nextUnificationVariableIndex_);
@@ -1250,7 +1093,6 @@ return module2_
 export async function Resolver_checkInstanceType$(self_, type_, $task) {
 {
 const _1 = type_;
-{
 if(_1.TConstructor) {
 const name_ = _1.name_;
 const typeArguments_ = _1.generics_;
@@ -1262,7 +1104,6 @@ ff_compiler_Resolver.Resolver_checkInstanceType(self_, _w1)
 }))
 return
 }
-}
 {
 
 return
@@ -1277,18 +1118,13 @@ ff_core_List.List_each(imports_, ((import_) => {
 const _1 = ff_core_List.List_find(modules_, ((_w1) => {
 return (ff_core_String.String_dropLast(_w1.file_, 3) === import_.file_)
 }));
-{
 if(_1.Some) {
 const module_ = _1.value_;
 resolver_ = ff_compiler_Resolver.Resolver_processDefinitions(resolver_, module_, ff_core_Option.Some(import_.alias_))
 return
 }
-}
-{
 if(_1.None) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(import_.at_, ("No such module: " + import_.file_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
 }
 }
 }));
@@ -1300,28 +1136,18 @@ function entry_(name_, unqualified_) {
 const full_ = ((((ff_compiler_Syntax.PackagePair_groupName(module_.packagePair_, ":") + "/") + ff_core_String.String_dropLast(module_.file_, 3)) + ".") + name_);
 {
 const _1 = importAlias_;
-{
 if(_1.None) {
 return [ff_core_Pair.Pair(name_, full_), ff_core_Pair.Pair(full_, full_)]
-return
-}
 }
-{
 if(_1.Some) {
 const alias_ = _1.value_;
-const _guard1 = unqualified_;
-if(_guard1) {
+if(unqualified_) {
 return [ff_core_Pair.Pair(((alias_ + ".") + name_), full_), ff_core_Pair.Pair(name_, full_), ff_core_Pair.Pair(full_, full_)]
-return
-}
 }
 }
-{
 if(_1.Some) {
 const alias_ = _1.value_;
 return [ff_core_Pair.Pair(((alias_ + ".") + name_), full_), ff_core_Pair.Pair(full_, full_)]
-return
-}
 }
 }
 }
@@ -1404,14 +1230,13 @@ const _1 = self_;
 {
 const _c = _1;
 return ff_compiler_Resolver.Resolver(ff_core_Map.Map_addAll(ff_core_Map.Map_addAll(ff_core_Map.Map_addAll(self_.variables_, lets_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), functions_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), traitMethods_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Map.Map_addAll(ff_core_Map.Map_addAll(ff_core_Map.Map_addAll(self_.variableLocations_, letLocations_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), functionLocations_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), traitMethodLocations_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Map.Map_addAll(self_.variants_, variants_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Map.Map_addAll(self_.types_, types_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Map.Map_addAll(self_.typeGenerics_, typeGenerics_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Map.Map_addAll(self_.typeLocations_, typeLocations_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Set.Set_addAll(self_.asyncTypes_, asyncTypes_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_List.List_toSet([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Map.Map_addAll(self_.traits_, traits_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Map.Map_addAll(self_.traitLocations_, traitLocations_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), self_.state_, _c.lspHook_)
-return
 }
 }
 }
 
 export async function Resolver_resolveTypeDefinition$(self_, definition_, $task) {
 if(ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, definition_.at_)) {
-ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(definition_.name_, definition_.at_, definition_.at_), ff_core_Option.None()))
+ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(definition_.name_, definition_.at_, definition_.at_), ff_core_Option.None(), true))
 };
 const generics_ = ff_core_List.List_toMap(ff_core_List.List_map(definition_.generics_, ((g_) => {
 return ff_core_Pair.Pair(g_, g_)
@@ -1453,7 +1278,7 @@ return
 }
 })), ff_core_List.List_map(definition_.variants_, ((v_) => {
 if(ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, v_.at_)) {
-ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(v_.name_, v_.at_, v_.at_), ff_core_Option.None()))
+ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(v_.name_, v_.at_, v_.at_), ff_core_Option.None(), true))
 };
 {
 const _1 = v_;
@@ -1486,7 +1311,7 @@ return
 
 export async function Resolver_resolveTraitDefinition$(self_, definition_, $task) {
 if((ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, definition_.at_) || ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, definition_.at_))) {
-ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(definition_.name_, definition_.at_, definition_.at_), ff_core_Option.None()))
+ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(definition_.name_, definition_.at_, definition_.at_), ff_core_Option.None(), true))
 };
 const generics_ = ff_core_List.List_toMap(ff_core_List.List_map(definition_.generics_, ((g_) => {
 return ff_core_Pair.Pair(g_, g_)
@@ -1512,16 +1337,12 @@ return (_w1.name_ === name_)
 const function1_ = ff_compiler_Syntax.DFunction(signature_.at_, signature_, ff_compiler_Syntax.FireflyTarget(lambda_));
 const function2_ = ff_compiler_Resolver.Resolver_resolveFunctionDefinition(self2_, function1_, true, false);
 return ff_core_Pair.Pair(name_, (((_1) => {
-{
 if(_1.FireflyTarget) {
 const lambda_ = _1.lambda_;
 return lambda_
-return
-}
 }
 {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(signature_.at_, "Internal error: Expected method default to be a lambda"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
 }
 }))(function2_.body_))
 return
@@ -1537,7 +1358,7 @@ const traitDefinedAt_ = ff_core_Option.Option_else(ff_core_Map.Map_get(self_.tra
 return definition_.at_
 }));
 if((ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, definition_.at_) || ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, traitDefinedAt_))) {
-ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(definition_.traitName_, definition_.at_, traitDefinedAt_), ff_core_Option.None()))
+ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(definition_.traitName_, definition_.at_, traitDefinedAt_), ff_core_Option.None(), true))
 };
 const generics_ = ff_core_List.List_toMap(ff_core_List.List_map(definition_.generics_, ((g_) => {
 return ff_core_Pair.Pair(g_, g_)
@@ -1590,48 +1411,33 @@ return
 
 export async function Resolver_resolveLetDefinition$(self_, definition_, topLevel_, $task) {
 if((ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, definition_.at_) || ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, definition_.at_))) {
-ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(definition_.name_, definition_.at_, definition_.at_), ff_core_Option.None()))
+ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(definition_.name_, definition_.at_, definition_.at_), ff_core_Option.None(), topLevel_))
 };
 {
 const _1 = definition_;
 {
 const _c = _1;
 return ff_compiler_Syntax.DLet(_c.at_, _c.name_, ff_compiler_Resolver.Resolver_resolveType(self_, definition_.variableType_, topLevel_), ff_compiler_Resolver.Resolver_resolveTerm(self_, definition_.value_, true))
-return
 }
 }
 }
 
 export async function Resolver_resolveTerm$(self_, term_, topLevel_, $task) {
-{
 const self_a = self_;
 const term_a = term_;
 const topLevel_a = topLevel_;
-{
 if(term_a.EString) {
 return term_
-return
 }
-}
-{
 if(term_a.EChar) {
 return term_
-return
 }
-}
-{
 if(term_a.EInt) {
 return term_
-return
-}
 }
-{
 if(term_a.EFloat) {
 return term_
-return
-}
 }
-{
 if(term_a.EVariable) {
 const e_ = term_a;
 if(ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
@@ -1639,7 +1445,7 @@ const at_ = ff_core_Option.Option_else(ff_core_Map.Map_get(self_.variableLocatio
 return e_.at_
 }));
 if((ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, e_.at_) || ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, at_))) {
-ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(e_.name_, e_.at_, at_), ff_core_Option.None()))
+ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(e_.name_, e_.at_, at_), ff_core_Option.None(), true))
 }
 };
 return ff_core_Option.Option_else(ff_core_Option.Option_map(ff_core_Map.Map_get(self_.variables_, e_.name_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ((_w1) => {
@@ -1648,7 +1454,6 @@ const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.EVariable(_c.at_, _w1)
-return
 }
 }
 })), (() => {
@@ -1656,8 +1461,6 @@ return term_
 }))
 return
 }
-}
-{
 if(term_a.EList) {
 const at_ = term_a.at_;
 const t_ = term_a.elementType_;
@@ -1667,13 +1470,10 @@ return ff_compiler_Syntax.EList(at_, ff_compiler_Resolver.Resolver_resolveType(s
 const item_ = _1.first_;
 const spread_ = _1.second_;
 return ff_core_Pair.Pair(ff_compiler_Resolver.Resolver_resolveTerm(self_, item_, topLevel_), spread_)
-return
 }
 })))
 return
 }
-}
-{
 if(term_a.EVariant) {
 const at_ = term_a.at_;
 const name_ = term_a.name_;
@@ -1690,15 +1490,12 @@ const _1 = a_;
 {
 const _c = _1;
 return ff_compiler_Syntax.Argument(_c.at_, _c.name_, ff_compiler_Resolver.Resolver_resolveTerm(self_, a_.value_, topLevel_))
-return
 }
 }
 }))
 })))
 return
 }
-}
-{
 if(term_a.EVariantIs) {
 const at_ = term_a.at_;
 const name_ = term_a.name_;
@@ -1710,8 +1507,6 @@ return ff_compiler_Resolver.Resolver_resolveType(self_, _w1, topLevel_)
 })))
 return
 }
-}
-{
 if(term_a.ECopy) {
 const at_ = term_a.at_;
 const name_ = term_a.name_;
@@ -1725,14 +1520,11 @@ const _1 = f_;
 {
 const _c = _1;
 return ff_compiler_Syntax.Field(_c.at_, _c.name_, ff_compiler_Resolver.Resolver_resolveTerm(self_, f_.value_, topLevel_))
-return
 }
 }
 })))
 return
 }
-}
-{
 if(term_a.EField) {
 const e_ = term_a;
 {
@@ -1740,13 +1532,10 @@ const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.EField(_c.at_, _c.newtype_, ff_compiler_Resolver.Resolver_resolveTerm(self_, e_.record_, topLevel_), _c.field_)
-return
 }
 }
 return
 }
-}
-{
 if(term_a.ELambda) {
 const at_ = term_a.at_;
 const lambdaAt_ = term_a.lambda_.at_;
@@ -1757,21 +1546,15 @@ return ff_compiler_Resolver.Resolver_resolveCase(self_, _w1, topLevel_)
 }))))
 return
 }
-}
-{
 if(term_a.EPipe) {
 const at_ = term_a.at_;
 const value_ = term_a.value_;
 const effect_ = term_a.effect_;
 const function_ = term_a.function_;
 return ff_compiler_Syntax.EPipe(at_, ff_compiler_Resolver.Resolver_resolveTerm(self_, value_, topLevel_), ff_compiler_Resolver.Resolver_resolveType(self_, effect_, topLevel_), ff_compiler_Resolver.Resolver_resolveTerm(self_, function_, topLevel_))
-return
 }
-}
-{
-if(term_a.ECall) {
+if(term_a.ECall && term_a.target_.DynamicCall) {
 const at_ = term_a.at_;
-if(term_a.target_.DynamicCall) {
 const target_ = term_a.target_;
 const effect_ = term_a.effect_;
 const typeArguments_ = term_a.typeArguments_;
@@ -1787,24 +1570,14 @@ const _1 = a_;
 {
 const _c = _1;
 return ff_compiler_Syntax.Argument(_c.at_, _c.name_, ff_compiler_Resolver.Resolver_resolveTerm(self_, a_.value_, topLevel_))
-return
 }
 }
 })), dictionaries_)
 return
 }
-}
-}
-{
-if(term_a.ECall) {
-const at_ = term_a.at_;
-if(term_a.target_.StaticCall) {
+if(term_a.ECall && term_a.target_.StaticCall) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Internal error: Static calls not expected in the Resolver phase"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
-}
 }
-{
 if(term_a.ERecord) {
 const at_ = term_a.at_;
 const fields_ = term_a.fields_;
@@ -1814,14 +1587,11 @@ const _1 = f_;
 {
 const _c = _1;
 return ff_compiler_Syntax.Field(_c.at_, _c.name_, ff_compiler_Resolver.Resolver_resolveTerm(self_, f_.value_, topLevel_))
-return
 }
 }
 })))
 return
 }
-}
-{
 if(term_a.EWildcard) {
 const e_ = term_a;
 if((e_.index_ === 0)) {
@@ -1832,13 +1602,10 @@ const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.EWildcard(_c.at_, _c.index_)
-return
 }
 }
 return
 }
-}
-{
 if(term_a.EFunctions) {
 const at_ = term_a.at_;
 const functions_ = term_a.functions_;
@@ -1861,8 +1628,6 @@ return ff_compiler_Resolver.Resolver_resolveFunctionDefinition(self2_, _w1, topL
 })), ff_compiler_Resolver.Resolver_resolveTerm(self2_, body_, topLevel_))
 return
 }
-}
-{
 if(term_a.ELet) {
 const e_ = term_a;
 const self2_ = (((_c) => {
@@ -1870,7 +1635,7 @@ return ff_compiler_Resolver.Resolver(ff_core_Map.Map_add(self_.variables_, e_.na
 }))(self_);
 if(ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 if((ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, e_.at_) || ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, e_.at_))) {
-ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(e_.name_, e_.at_, e_.at_), ff_core_Option.None()))
+ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSymbolHook(ff_compiler_LspHook.SymbolHook(e_.name_, e_.at_, e_.at_), ff_core_Option.None(), false))
 }
 };
 {
@@ -1878,22 +1643,16 @@ const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.ELet(_c.at_, _c.mutable_, _c.name_, ff_compiler_Resolver.Resolver_resolveType(self_, e_.valueType_, topLevel_), ff_compiler_Resolver.Resolver_resolveTerm(self_, e_.value_, topLevel_), ff_compiler_Resolver.Resolver_resolveTerm(self2_, e_.body_, topLevel_))
-return
 }
 }
 return
 }
-}
-{
 if(term_a.ESequential) {
 const at_ = term_a.at_;
 const before_ = term_a.before_;
 const after_ = term_a.after_;
 return ff_compiler_Syntax.ESequential(at_, ff_compiler_Resolver.Resolver_resolveTerm(self_, before_, topLevel_), ff_compiler_Resolver.Resolver_resolveTerm(self_, after_, topLevel_))
-return
-}
 }
-{
 if(term_a.EAssign) {
 const at_ = term_a.at_;
 const operator_ = term_a.operator_;
@@ -1904,8 +1663,6 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Sy
 })), ff_compiler_Resolver.Resolver_resolveTerm(self_, value_, topLevel_))
 return
 }
-}
-{
 if(term_a.EAssignField) {
 const at_ = term_a.at_;
 const operator_ = term_a.operator_;
@@ -1913,24 +1670,16 @@ const record_ = term_a.record_;
 const field_ = term_a.field_;
 const value_ = term_a.value_;
 return ff_compiler_Syntax.EAssignField(at_, operator_, ff_compiler_Resolver.Resolver_resolveTerm(self_, record_, topLevel_), field_, ff_compiler_Resolver.Resolver_resolveTerm(self_, value_, topLevel_))
-return
-}
-}
 }
 }
 
 export async function Resolver_resolveType$(self_, type_, topLevel_, $task) {
-{
 const self_a = self_;
 const type_a = type_;
 const topLevel_a = topLevel_;
-{
 if(type_a.TVariable) {
 return type_
-return
-}
 }
-{
 if(type_a.TConstructor) {
 const constructor_ = type_a;
 if(ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
@@ -1965,7 +1714,6 @@ const _1 = constructor_;
 {
 const _c = _1;
 return ff_compiler_Syntax.TConstructor(_c.at_, name_, [...effect_, ...arguments_, returnType_])
-return
 }
 }
 } else {
@@ -1974,15 +1722,12 @@ const _1 = constructor_;
 {
 const _c = _1;
 return ff_compiler_Syntax.TConstructor(_c.at_, name_, [...effect_, ...generics_])
-return
 }
 }
 }
 return
 }
 }
-}
-}
 
 export async function Resolver_makeEffectArgument$(self_, at_, topLevel_, $task) {
 if(topLevel_) {
@@ -2038,7 +1783,7 @@ return ff_compiler_Syntax.DFunction(definition_.at_, signature_, body_)
 
 export async function Resolver_resolveSignature$(self_, signature_, topLevel_, isInstanceMethod_, $task) {
 if((ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, signature_.at_) || ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, signature_.at_))) {
-ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSignatureHook(signature_, isInstanceMethod_))
+ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ResolveSignatureHook(signature_, isInstanceMethod_, topLevel_))
 };
 const newSignature_ = (topLevel_
 ? (((_c) => {
@@ -2093,52 +1838,30 @@ const _1 = self_;
 {
 const _c = _1;
 return ff_compiler_Resolver.Resolver(ff_core_Map.Map_addAll(self_.variables_, variableMap_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Map.Map_addAll(self_.variableLocations_, variableLocationMap_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), _c.variants_, ff_core_Map.Map_addAll(self_.types_, typeMap_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), _c.typeGenerics_, _c.typeLocations_, ff_core_Set.Set_removeAll(self_.asyncTypes_, ff_core_List.List_toSet(signature_.generics_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Set.Set_addAll(self_.typeParameters_, ff_core_List.List_toSet(signature_.generics_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), _c.traits_, _c.traitLocations_, _c.state_, _c.lspHook_)
-return
 }
 }
 }
 
 export async function Resolver_resolveCase$(self_, case_, topLevel_, $task) {
 function findVariables_(pattern_) {
-{
 const pattern_a = pattern_;
-{
 if(pattern_a.PString) {
 return ff_core_Map.empty_()
-return
-}
 }
-{
 if(pattern_a.PInt) {
 return ff_core_Map.empty_()
-return
 }
-}
-{
 if(pattern_a.PChar) {
 return ff_core_Map.empty_()
-return
 }
-}
-{
-if(pattern_a.PVariable) {
+if(pattern_a.PVariable && pattern_a.name_.Some) {
 const at_ = pattern_a.at_;
-if(pattern_a.name_.Some) {
 const name_ = pattern_a.name_.value_;
 return ff_core_List.List_toMap([ff_core_Pair.Pair(name_, ff_core_Pair.Pair(at_, name_))], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
-return
-}
 }
-}
-{
-if(pattern_a.PVariable) {
-if(pattern_a.name_.None) {
+if(pattern_a.PVariable && pattern_a.name_.None) {
 return ff_core_Map.empty_()
-return
-}
-}
 }
-{
 if(pattern_a.PVariant) {
 const patterns_ = pattern_a.patterns_;
 return ff_core_List.List_foldLeft(ff_core_List.List_map(patterns_, ((pattern_) => {
@@ -2148,8 +1871,6 @@ return ff_core_Map.Map_addAll(_w1, _w2, ff_core_Ordering.ff_core_Ordering_Order$
 }))
 return
 }
-}
-{
 if(pattern_a.PVariantAs) {
 const at_ = pattern_a.at_;
 const variableAt_ = pattern_a.variableAt_;
@@ -2159,16 +1880,11 @@ return ff_core_Pair.Pair(x_, ff_core_Pair.Pair(variableAt_, x_))
 })), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
 return
 }
-}
-{
 if(pattern_a.PAlias) {
 const at_ = pattern_a.at_;
 const pattern_ = pattern_a.pattern_;
 const variable_ = pattern_a.variable_;
 return ff_core_Map.Map_addAll(ff_core_List.List_toMap([ff_core_Pair.Pair(variable_, ff_core_Pair.Pair(at_, variable_))], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), findVariables_(pattern_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
-return
-}
-}
 }
 }
 const variableMap_ = ff_core_List.List_foldLeft(ff_core_List.List_map(case_.patterns_, ((pattern_) => {
@@ -2204,34 +1920,20 @@ return ff_compiler_Resolver.Resolver_resolvePattern(self_, _w1)
 }
 
 export async function Resolver_resolvePattern$(self_, pattern_, $task) {
-{
 const self_a = self_;
 const pattern_a = pattern_;
-{
 if(pattern_a.PString) {
 return pattern_
-return
-}
 }
-{
 if(pattern_a.PInt) {
 return pattern_
-return
-}
 }
-{
 if(pattern_a.PChar) {
 return pattern_
-return
 }
-}
-{
 if(pattern_a.PVariable) {
 return pattern_
-return
-}
 }
-{
 if(pattern_a.PVariant) {
 const at_ = pattern_a.at_;
 const name_ = pattern_a.name_;
@@ -2243,10 +1945,7 @@ const newPatterns_ = ff_core_List.List_map(patterns_, ((_w1) => {
 return ff_compiler_Resolver.Resolver_resolvePattern(self_, _w1)
 }));
 return ff_compiler_Syntax.PVariant(at_, newName_, newPatterns_)
-return
-}
 }
-{
 if(pattern_a.PVariantAs) {
 const at_ = pattern_a.at_;
 const name_ = pattern_a.name_;
@@ -2256,33 +1955,22 @@ const newName_ = ff_core_Option.Option_else(ff_core_Map.Map_get(self_.variants_,
 return name_
 }));
 return ff_compiler_Syntax.PVariantAs(at_, newName_, variableAt_, variable_)
-return
-}
 }
-{
 if(pattern_a.PAlias) {
 const at_ = pattern_a.at_;
 const pattern_ = pattern_a.pattern_;
 const variable_ = pattern_a.variable_;
 const newPattern_ = ff_compiler_Resolver.Resolver_resolvePattern(self_, pattern_);
 return ff_compiler_Syntax.PAlias(at_, newPattern_, variable_)
-return
-}
-}
 }
 }
 
 export async function Resolver_containsAsyncType$(self_, type_, $task) {
-{
 const self_a = self_;
 const type_a = type_;
-{
 if(type_a.TVariable) {
 return false
-return
 }
-}
-{
 if(type_a.TConstructor) {
 const constructor_ = type_a;
 const name_ = (ff_core_String.String_contains(constructor_.name_, "$")
@@ -2301,8 +1989,6 @@ return ff_compiler_Resolver.Resolver_containsAsyncType(self_, _w1)
 return
 }
 }
-}
-}