Skip to content

Remove !! from YogaNodeJNIBase (#56841) #56841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cortinico wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −16
Open

Remove !! from YogaNodeJNIBase (#56841) #56841

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,8 @@ public abstract class YogaNodeJNIBase : YogaNode, Cloneable {
throw IllegalStateException("Child already has a parent, it must be removed first.")
}

if (children == null) {
children = ArrayList(4)
}
children!!.add(i, child)
val list = children ?: ArrayList<YogaNodeJNIBase>(4).also { children = it }
list.add(i, child)
child.owner = this
YogaNative.jni_YGNodeInsertChildJNI(nativePointer, child.nativePointer, i)
}
Expand All @@ -89,18 +87,17 @@ public abstract class YogaNodeJNIBase : YogaNode, Cloneable {
if (newChild !is YogaNodeJNIBase) {
return
}
children!!.removeAt(position)
children!!.add(position, newChild)
val list = checkNotNull(children) { "YogaNode does not have children" }
list.removeAt(position)
list.add(position, newChild)
newChild.owner = this
YogaNative.jni_YGNodeSwapChildJNI(nativePointer, newChild.nativePointer, position)
}

override fun cloneWithChildren(): YogaNodeJNIBase {
try {
val clonedYogaNode = super.clone() as YogaNodeJNIBase
if (clonedYogaNode.children != null) {
clonedYogaNode.children = ArrayList(clonedYogaNode.children!!)
}
clonedYogaNode.children?.let { clonedYogaNode.children = ArrayList(it) }
val clonedNativePointer = YogaNative.jni_YGNodeCloneJNI(nativePointer)
clonedYogaNode.owner = null
clonedYogaNode.nativePointer = clonedNativePointer
Expand Down Expand Up @@ -540,11 +537,8 @@ public abstract class YogaNodeJNIBase : YogaNode, Cloneable {
// methods are final by default, which enforces this constraint.
@DoNotStrip
public fun measure(width: Float, widthMode: Int, height: Float, heightMode: Int): Long {
if (!isMeasureDefined) {
throw RuntimeException("Measure function isn't defined!")
}

return measureFunction!!.measure(
val mf = checkNotNull(measureFunction) { "Measure function isn't defined!" }
return mf.measure(
this,
width,
YogaMeasureMode.fromInt(widthMode),
Expand All @@ -560,8 +554,10 @@ public abstract class YogaNodeJNIBase : YogaNode, Cloneable {

// Same JNI jmethodid caching concern as measure() — must not be overridden.
@DoNotStrip
public fun baseline(width: Float, height: Float): Float =
baselineFunction!!.baseline(this, width, height)
public fun baseline(width: Float, height: Float): Float {
val bf = checkNotNull(baselineFunction) { "Baseline function isn't defined!" }
return bf.baseline(this, width, height)
}

override val isMeasureDefined: Boolean
get() = measureFunction != null
Expand Down
Loading