ari-party/rojo
1
0
Fork 0
forked from rojo-rbx/rojo
Code Pull Requests Activity

Stylua formatting (#785)

Browse Source 
Uses Stylua to format all existing Lua files, and adds a CI check in
`lint` to pin this improvement. Excludes formatting dependencies, of
course.
This commit is contained in:
boatbomber
2023-09-18 18:39:46 -04:00
committed by GitHub
parent 840e9bedb2
commit 0f8e1625d5
52 changed files with 595 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/src/Reconciler/applyPatch.spec.lua
View File

@@ -83,11 +83,11 @@ return function()
ClassName = "Model",
Name = "Child",
Parent = "ROOT",
Children = {"GRANDCHILD"},
Children = { "GRANDCHILD" },
Properties = {},
}
patch.added["GRANDCHILD"] = {
patch.added["GRANDCHILD"] = {
Id = "GRANDCHILD",
ClassName = "Part",
Name = "Grandchild",
@@ -193,4 +193,4 @@ return function()
assert(newChild ~= nil, "expected child to be present")
assert(newChild == child, "expected child to be preserved")
end)
end
end

9
plugin/src/Reconciler/decodeValue.lua
View File

@@ -30,10 +30,11 @@ local function decodeValue(encodedValue, instanceMap)
local ok, decodedValue = RbxDom.EncodedValue.decode(encodedValue)
if not ok then
return false, Error.new(Error.CannotDecodeValue, {
encodedValue = encodedValue,
innerError = decodedValue,
})
return false,
Error.new(Error.CannotDecodeValue, {
encodedValue = encodedValue,
innerError = decodedValue,
})
end
return true, decodedValue

19
plugin/src/Reconciler/diff.lua
View File

@@ -37,7 +37,9 @@ local function trueEquals(a, b): boolean
end
end
for key, value in pairs(b) do
if checkedKeys[key] then continue end
if checkedKeys[key] then
continue
end
if not trueEquals(value, a[key]) then
return false
end
@@ -62,7 +64,7 @@ local function trueEquals(a, b): boolean
-- For CFrames, compare to components with epsilon of 0.0001 to avoid floating point inequality
elseif typeA == "CFrame" and typeB == "CFrame" then
local aComponents, bComponents = {a:GetComponents()}, {b:GetComponents()}
local aComponents, bComponents = { a:GetComponents() }, { b:GetComponents() }
for i, aComponent in aComponents do
if not fuzzyEq(aComponent, bComponents[i], 0.0001) then
return false
@@ -72,7 +74,7 @@ local function trueEquals(a, b): boolean
-- For Vector3s, compare to components with epsilon of 0.0001 to avoid floating point inequality
elseif typeA == "Vector3" and typeB == "Vector3" then
local aComponents, bComponents = {a.X, a.Y, a.Z}, {b.X, b.Y, b.Z}
local aComponents, bComponents = { a.X, a.Y, a.Z }, { b.X, b.Y, b.Z }
for i, aComponent in aComponents do
if not fuzzyEq(aComponent, bComponents[i], 0.0001) then
return false
@@ -82,14 +84,13 @@ local function trueEquals(a, b): boolean
-- For Vector2s, compare to components with epsilon of 0.0001 to avoid floating point inequality
elseif typeA == "Vector2" and typeB == "Vector2" then
local aComponents, bComponents = {a.X, a.Y}, {b.X, b.Y}
local aComponents, bComponents = { a.X, a.Y }, { b.X, b.Y }
for i, aComponent in aComponents do
if not fuzzyEq(aComponent, bComponents[i], 0.0001) then
return false
end
end
return true
end
return false
@@ -154,7 +155,13 @@ local function diff(instanceMap, virtualInstances, rootId)
if ok then
if not trueEquals(existingValue, decodedValue) then
Log.debug("{}.{} changed from '{}' to '{}'", instance:GetFullName(), propertyName, existingValue, decodedValue)
Log.debug(
"{}.{} changed from '{}' to '{}'",
instance:GetFullName(),
propertyName,
existingValue,
decodedValue
)
changedProperties[propertyName] = virtualValue
end
else

2
plugin/src/Reconciler/diff.spec.lua
View File

@@ -264,7 +264,7 @@ return function()
ClassName = "Folder",
Name = "Folder",
Properties = {},
Children = {"CHILD"},
Children = { "CHILD" },
},
CHILD = {

43
plugin/src/Reconciler/getProperty.lua
View File

@@ -14,17 +14,19 @@ local function getProperty(instance, propertyName)
-- A good example of a property like this is `Model.ModelInPrimary`, which
-- is serialized but not reflected to Lua.
if descriptor == nil then
return false, Error.new(Error.UnknownProperty, {
className = instance.ClassName,
propertyName = propertyName,
})
return false,
Error.new(Error.UnknownProperty, {
className = instance.ClassName,
propertyName = propertyName,
})
end
if descriptor.scriptability == "None" or descriptor.scriptability == "Write" then
return false, Error.new(Error.UnreadableProperty, {
className = instance.ClassName,
propertyName = propertyName,
})
return false,
Error.new(Error.UnreadableProperty, {
className = instance.ClassName,
propertyName = propertyName,
})
end
local success, valueOrErr = descriptor:read(instance)
@@ -35,23 +37,26 @@ local function getProperty(instance, propertyName)
-- If we don't have permission to read a property, we can chalk that up
-- to our database being out of date and the engine being right.
if err.kind == RbxDom.Error.Kind.Roblox and err.extra:find("lacking permission") then
return false, Error.new(Error.LackingPropertyPermissions, {
className = instance.ClassName,
propertyName = propertyName,
})
return false,
Error.new(Error.LackingPropertyPermissions, {
className = instance.ClassName,
propertyName = propertyName,
})
end
if err.kind == RbxDom.Error.Kind.Roblox and err.extra:find("is not a valid member of") then
return false, Error.new(Error.UnknownProperty, {
return false,
Error.new(Error.UnknownProperty, {
className = instance.ClassName,
propertyName = propertyName,
})
end
return false,
Error.new(Error.OtherPropertyError, {
className = instance.ClassName,
propertyName = propertyName,
})
end
return false, Error.new(Error.OtherPropertyError, {
className = instance.ClassName,
propertyName = propertyName,
})
end
return true, valueOrErr

2
plugin/src/Reconciler/hydrate.lua
View File

@@ -47,4 +47,4 @@ local function hydrate(instanceMap, virtualInstances, rootId, rootInstance)
end
end
return hydrate
return hydrate

4
plugin/src/Reconciler/hydrate.spec.lua
View File

@@ -91,7 +91,7 @@ return function()
ClassName = "Folder",
Name = "Root",
Properties = {},
Children = {"CHILD1", "CHILD2"},
Children = { "CHILD1", "CHILD2" },
},
CHILD1 = {
@@ -126,4 +126,4 @@ return function()
expect(knownInstances.fromIds["CHILD1"]).to.equal(child1)
expect(knownInstances.fromIds["CHILD2"]).to.equal(child2)
end)
end
end

12
plugin/src/Reconciler/reify.spec.lua
View File

@@ -80,7 +80,7 @@ return function()
ClassName = "Folder",
Name = "Parent",
Properties = {},
Children = {"CHILD"},
Children = { "CHILD" },
},
CHILD = {
@@ -112,7 +112,7 @@ return function()
ClassName = "Folder",
Name = "Parent",
Properties = {},
Children = {"CHILD"},
Children = { "CHILD" },
},
CHILD = {
@@ -147,7 +147,7 @@ return function()
Properties = {
Value = {
Type = "Vector3",
Value = {1, 2, 3},
Value = { 1, 2, 3 },
},
},
Children = {},
@@ -182,7 +182,7 @@ return function()
ClassName = "Folder",
Name = "Root",
Properties = {},
Children = {"CHILD"},
Children = { "CHILD" },
},
CHILD = {
@@ -247,7 +247,7 @@ return function()
ClassName = "Folder",
Name = "Root",
Properties = {},
Children = {"CHILD_A", "CHILD_B"},
Children = { "CHILD_A", "CHILD_B" },
},
CHILD_A = {
@@ -297,7 +297,7 @@ return function()
Ref = "CHILD",
},
},
Children = {"CHILD"},
Children = { "CHILD" },
},
CHILD = {

25
plugin/src/Reconciler/setProperty.lua
View File

@@ -21,26 +21,29 @@ local function setProperty(instance, propertyName, value)
end
if descriptor.scriptability == "None" or descriptor.scriptability == "Read" then
return false, Error.new(Error.UnwritableProperty, {
className = instance.ClassName,
propertyName = propertyName,
})
return false,
Error.new(Error.UnwritableProperty, {
className = instance.ClassName,
propertyName = propertyName,
})
end
local ok, err = descriptor:write(instance, value)
if not ok then
if err.kind == RbxDom.Error.Kind.Roblox and err.extra:find("lacking permission") then
return false, Error.new(Error.LackingPropertyPermissions, {
return false,
Error.new(Error.LackingPropertyPermissions, {
className = instance.ClassName,
propertyName = propertyName,
})
end
return false,
Error.new(Error.OtherPropertyError, {
className = instance.ClassName,
propertyName = propertyName,
})
end
return false, Error.new(Error.OtherPropertyError, {
className = instance.ClassName,
propertyName = propertyName,
})
end
return true