diff --git a/lang/render/render.go b/lang/render/render.go index 1ee8746d..4b99b6c2 100644 --- a/lang/render/render.go +++ b/lang/render/render.go @@ -262,7 +262,12 @@ func measureVarNameLength(tm *t.Map, lineTokens []t.Token, remaining []t.Token) line := lineTokens[0].Line length := len(tm.ByID(lineTokens[x].ID)) - for (len(remaining) > x) && ((x == 0) || (remaining[0].ID == t.IDVar)) && (remaining[0].Line == line+1) { + for (len(remaining) > x) && + ((x == 0) || (remaining[0].ID == t.IDVar)) && + (remaining[0].Line == line+1) && + (remaining[x].Line == line+1) && + (remaining[x].ID.IsIdent(tm)) { + line = remaining[0].Line length = max(length, len(tm.ByID(remaining[x].ID))) diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index a0539220..b9dc0475 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -116,8 +116,8 @@ pub struct decoder?( compressed_ri base.u64, compressed_wi base.u64, - swizzler base.pixel_swizzler, - util base.utility, + swizzler base.pixel_swizzler, + util base.utility, )( compressed array[4096] base.u8,