Skip to content

Commit

Permalink
Update nil Ref check and property decode warning to new Rojo protocol (
Browse files Browse the repository at this point in the history
…#466)

* Skip empty Refs in new Rojo protocol

* Update warning message for new Rojo protocol
  • Loading branch information
ayuka authored Aug 9, 2021
1 parent e1f9eae commit 6cc2e91
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion plugin/src/Reconciler/decodeValue.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ local function decodeValue(encodedValue, instanceMap)

-- Refs are represented as IDs in the same space that Rojo's protocol uses.
if ty == "Ref" then
if value == nil then
if value == "00000000000000000000000000000000" then
return true, nil
end

Expand Down
4 changes: 3 additions & 1 deletion plugin/src/Reconciler/diff.lua
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ local function diff(instanceMap, virtualInstances, rootId)
changedProperties[propertyName] = virtualValue
end
else
Log.warn("Failed to decode property of type {}", virtualValue.Type)
-- virtualValue can be empty in certain cases, and this may print out nil to the user.
local propertyType = next(virtualValue)
Log.warn("Failed to decode property of type {}", propertyType)
end
else
local err = existingValueOrErr
Expand Down

0 comments on commit 6cc2e91

Please sign in to comment.