Don't inline bitfields. (utopia-rise#820)

Otherwise, not visible to Java/Scala

Author: CedNaru

harness/tests/src/main/java/godot/tests/JavaTestClass.java

@@ -1,6 +1,7 @@
 package godot.tests;
 
 import godot.api.Button;
+import godot.api.Control;
 import godot.api.Node;
 import godot.api.RenderingServer;
 import godot.annotation.*;
@@ -87,6 +88,10 @@ public void _ready() {
  long constant = RenderingServer.NO_INDEX_ARRAY;
  Signal signal = RenderingServer.getFramePreDraw();
  RenderingServer.getDefaultClearColor();
+ // Check what Enum/Bitfields look like
+ Control control = new Control();
+ control.setHSizeFlags(Control.SizeFlags.FILL);
+ control.free();
  }
 
  @RegisterFunction

kt/api-generator/src/main/kotlin/godot/codegen/generation/rule/EnumRule.kt

@@ -65,8 +65,6 @@ class EnumRule : GodotApiRule<EnrichedEnumTask>() {
  fun TypeSpec.Builder.generateBitfield(enum: EnrichedEnum) {
  val className = enum.className
 
- addAnnotation(JvmInline::class)
- addModifiers(KModifier.VALUE)
  primaryConstructor(
  FunSpec.constructorBuilder()
  .addParameter(
@@ -118,6 +116,7 @@ class EnumRule : GodotApiRule<EnrichedEnumTask>() {
  bitfieldCompanion
  .addProperty(
  PropertySpec.builder(value.name, className)
+ .addAnnotation(JvmField::class)
  .initializer(CodeBlock.of("%T(%L)", className, value.value))
  .addKdoc(value)
  .build()

kt/godot-library/godot-api-library/src/main/kotlin/godot/api/Control.kt

@@ -48,7 +48,7 @@ import kotlin.NotImplementedError
 import kotlin.String
 import kotlin.Suppress
 import kotlin.Unit
-import kotlin.jvm.JvmInline
+import kotlin.jvm.JvmField
 import kotlin.jvm.JvmName
 import kotlin.jvm.JvmOverloads
 
@@ -3042,8 +3042,7 @@ public open class Control : CanvasItem() {
  }
  }
 
- @JvmInline
- public value class SizeFlags(
+ public class SizeFlags(
  public val flag: Long,
  ) {
  public infix fun or(other: SizeFlags): SizeFlags = SizeFlags(flag.or(other.flag))
@@ -3078,13 +3077,15 @@ public open class Control : CanvasItem() {
  *
  * **Note:** Setting this flag is equal to not having any size flags.
  */
+ @JvmField
  public val SHRINK_BEGIN: SizeFlags = SizeFlags(0)
 
  /**
  * Tells the parent [Container] to expand the bounds of this node to fill all the available
  * space without pushing any other node. It is mutually exclusive with shrink size flags. Use
  * with [sizeFlagsHorizontal] and [sizeFlagsVertical].
  */
+ @JvmField
  public val FILL: SizeFlags = SizeFlags(1)
 
  /**
@@ -3093,26 +3094,30 @@ public open class Control : CanvasItem() {
  * stretch ratio. See [sizeFlagsStretchRatio]. Use with [sizeFlagsHorizontal] and
  * [sizeFlagsVertical].
  */
+ @JvmField
  public val EXPAND: SizeFlags = SizeFlags(2)
 
  /**
  * Sets the node's size flags to both fill and expand. See [SIZE_FILL] and [SIZE_EXPAND] for
  * more information.
  */
+ @JvmField
  public val EXPAND_FILL: SizeFlags = SizeFlags(3)
 
  /**
  * Tells the parent [Container] to center the node in the available space. It is mutually
  * exclusive with [SIZE_FILL] and other shrink size flags, but can be used with [SIZE_EXPAND] in
  * some containers. Use with [sizeFlagsHorizontal] and [sizeFlagsVertical].
  */
+ @JvmField
  public val SHRINK_CENTER: SizeFlags = SizeFlags(4)
 
  /**
  * Tells the parent [Container] to align the node with its end, either the bottom or the right
  * edge. It is mutually exclusive with [SIZE_FILL] and other shrink size flags, but can be used
  * with [SIZE_EXPAND] in some containers. Use with [sizeFlagsHorizontal] and [sizeFlagsVertical].
  */
+ @JvmField
  public val SHRINK_END: SizeFlags = SizeFlags(8)
  }
  }

kt/godot-library/godot-api-library/src/main/kotlin/godot/api/FileAccess.kt

@@ -31,7 +31,7 @@ import kotlin.Long
 import kotlin.String
 import kotlin.Suppress
 import kotlin.Unit
-import kotlin.jvm.JvmInline
+import kotlin.jvm.JvmField
 import kotlin.jvm.JvmName
 import kotlin.jvm.JvmOverloads
 import kotlin.jvm.JvmStatic
@@ -769,8 +769,7 @@ public open class FileAccess internal constructor() : RefCounted() {
  }
  }
 
- @JvmInline
- public value class UnixPermissionFlags(
+ public class UnixPermissionFlags(
  public val flag: Long,
  ) {
  public infix fun or(other: UnixPermissionFlags): UnixPermissionFlags =
@@ -804,61 +803,73 @@ public open class FileAccess internal constructor() : RefCounted() {
  /**
  * Read for owner bit.
  */
+ @JvmField
  public val READ_OWNER: UnixPermissionFlags = UnixPermissionFlags(256)
 
  /**
  * Write for owner bit.
  */
+ @JvmField
  public val WRITE_OWNER: UnixPermissionFlags = UnixPermissionFlags(128)
 
  /**
  * Execute for owner bit.
  */
+ @JvmField
  public val EXECUTE_OWNER: UnixPermissionFlags = UnixPermissionFlags(64)
 
  /**
  * Read for group bit.
  */
+ @JvmField
  public val READ_GROUP: UnixPermissionFlags = UnixPermissionFlags(32)
 
  /**
  * Write for group bit.
  */
+ @JvmField
  public val WRITE_GROUP: UnixPermissionFlags = UnixPermissionFlags(16)
 
  /**
  * Execute for group bit.
  */
+ @JvmField
  public val EXECUTE_GROUP: UnixPermissionFlags = UnixPermissionFlags(8)
 
  /**
  * Read for other bit.
  */
+ @JvmField
  public val READ_OTHER: UnixPermissionFlags = UnixPermissionFlags(4)
 
  /**
  * Write for other bit.
  */
+ @JvmField
  public val WRITE_OTHER: UnixPermissionFlags = UnixPermissionFlags(2)
 
  /**
  * Execute for other bit.
  */
+ @JvmField
  public val EXECUTE_OTHER: UnixPermissionFlags = UnixPermissionFlags(1)
 
  /**
  * Set user id on execution bit.
  */
+ @JvmField
  public val SET_USER_ID: UnixPermissionFlags = UnixPermissionFlags(2048)
 
  /**
  * Set group id on execution bit.
  */
+ @JvmField
  public val SET_GROUP_ID: UnixPermissionFlags = UnixPermissionFlags(1024)
 
  /**
  * Restricted deletion (sticky) bit.
  */
+ @JvmField
  public val RESTRICTED_DELETE: UnixPermissionFlags = UnixPermissionFlags(512)
  }
  }

kt/godot-library/godot-api-library/src/main/kotlin/godot/api/ImageFormatLoader.kt

@@ -11,7 +11,7 @@ import kotlin.Int
 import kotlin.Long
 import kotlin.Suppress
 import kotlin.Unit
-import kotlin.jvm.JvmInline
+import kotlin.jvm.JvmField
 
 public infix fun Long.or(other: ImageFormatLoader.LoaderFlags): Long = this.or(other.flag)
 
@@ -30,8 +30,7 @@ public open class ImageFormatLoader internal constructor() : RefCounted() {
  createNativeObject(283, scriptIndex)
  }
 
- @JvmInline
- public value class LoaderFlags(
+ public class LoaderFlags(
  public val flag: Long,
  ) {
  public infix fun or(other: LoaderFlags): LoaderFlags = LoaderFlags(flag.or(other.flag))
@@ -59,10 +58,13 @@ public open class ImageFormatLoader internal constructor() : RefCounted() {
  public infix fun ushr(bits: Int): LoaderFlags = LoaderFlags(flag ushr bits)
 
  public companion object {
+ @JvmField
  public val FLAG_NONE: LoaderFlags = LoaderFlags(0)
 
+ @JvmField
  public val FLAG_FORCE_LINEAR: LoaderFlags = LoaderFlags(1)
 
+ @JvmField
  public val FLAG_CONVERT_COLORS: LoaderFlags = LoaderFlags(2)
  }
  }