Use BitField hint for the TextServer enums. Add missing parts for BitField support to the GDextension API.

4 files changed, 83 insertions, 82 deletions

diff --git a/servers/text/text_server_extension.cpp b/servers/text/text_server_extension.cpp
index 68959819c9..47598abce7 100644
--- a/servers/text/text_server_extension.cpp
+++ b/servers/text/text_server_extension.cpp
@@ -438,12 +438,12 @@ int64_t TextServerExtension::font_get_face_count(const RID &p_font_rid) const {
 	return 0;
 }
 
-void TextServerExtension::font_set_style(const RID &p_font_rid, int64_t /*FontStyle*/ p_style) {
+void TextServerExtension::font_set_style(const RID &p_font_rid, BitField<TextServer::FontStyle> p_style) {
 	GDVIRTUAL_CALL(font_set_style, p_font_rid, p_style);
 }
 
-int64_t /*FontStyle*/ TextServerExtension::font_get_style(const RID &p_font_rid) const {
-	int64_t ret;
+BitField<TextServer::FontStyle> TextServerExtension::font_get_style(const RID &p_font_rid) const {
+	BitField<TextServer::FontStyle> ret = 0;
 	if (GDVIRTUAL_CALL(font_get_style, p_font_rid, ret)) {
 		return ret;
 	}
@@ -1192,7 +1192,7 @@ RID TextServerExtension::shaped_text_get_parent(const RID &p_shaped) const {
 	return RID();
 }
 
-double TextServerExtension::shaped_text_fit_to_width(const RID &p_shaped, double p_width, int64_t p_jst_flags) {
+double TextServerExtension::shaped_text_fit_to_width(const RID &p_shaped, double p_width, BitField<TextServer::JustificationFlag> p_jst_flags) {
 	double ret;
 	if (GDVIRTUAL_CALL(shaped_text_fit_to_width, p_shaped, p_width, p_jst_flags, ret)) {
 		return ret;
@@ -1272,7 +1272,7 @@ Vector2i TextServerExtension::shaped_text_get_range(const RID &p_shaped) const {
 	return Vector2i();
 }
 
-PackedInt32Array TextServerExtension::shaped_text_get_line_breaks_adv(const RID &p_shaped, const PackedFloat32Array &p_width, int64_t p_start, bool p_once, int64_t p_break_flags) const {
+PackedInt32Array TextServerExtension::shaped_text_get_line_breaks_adv(const RID &p_shaped, const PackedFloat32Array &p_width, int64_t p_start, bool p_once, BitField<TextServer::LineBreakFlag> p_break_flags) const {
 	PackedInt32Array ret;
 	if (GDVIRTUAL_CALL(shaped_text_get_line_breaks_adv, p_shaped, p_width, p_start, p_once, p_break_flags, ret)) {
 		return ret;
@@ -1280,7 +1280,7 @@ PackedInt32Array TextServerExtension::shaped_text_get_line_breaks_adv(const RID
 	return TextServer::shaped_text_get_line_breaks_adv(p_shaped, p_width, p_start, p_once, p_break_flags);
 }
 
-PackedInt32Array TextServerExtension::shaped_text_get_line_breaks(const RID &p_shaped, double p_width, int64_t p_start, int64_t p_break_flags) const {
+PackedInt32Array TextServerExtension::shaped_text_get_line_breaks(const RID &p_shaped, double p_width, int64_t p_start, BitField<TextServer::LineBreakFlag> p_break_flags) const {
 	PackedInt32Array ret;
 	if (GDVIRTUAL_CALL(shaped_text_get_line_breaks, p_shaped, p_width, p_start, p_break_flags, ret)) {
 		return ret;
@@ -1288,7 +1288,7 @@ PackedInt32Array TextServerExtension::shaped_text_get_line_breaks(const RID &p_s
 	return TextServer::shaped_text_get_line_breaks(p_shaped, p_width, p_start, p_break_flags);
 }
 
-PackedInt32Array TextServerExtension::shaped_text_get_word_breaks(const RID &p_shaped, int64_t p_grapheme_flags) const {
+PackedInt32Array TextServerExtension::shaped_text_get_word_breaks(const RID &p_shaped, BitField<TextServer::GraphemeFlag> p_grapheme_flags) const {
 	PackedInt32Array ret;
 	if (GDVIRTUAL_CALL(shaped_text_get_word_breaks, p_shaped, p_grapheme_flags, ret)) {
 		return ret;
@@ -1328,7 +1328,7 @@ int64_t TextServerExtension::shaped_text_get_ellipsis_glyph_count(const RID &p_s
 	return -1;
 }
 
-void TextServerExtension::shaped_text_overrun_trim_to_width(const RID &p_shaped_line, double p_width, int64_t p_trim_flags) {
+void TextServerExtension::shaped_text_overrun_trim_to_width(const RID &p_shaped_line, double p_width, BitField<TextServer::TextOverrunFlag> p_trim_flags) {
 	GDVIRTUAL_CALL(shaped_text_overrun_trim_to_width, p_shaped_line, p_width, p_trim_flags);
 }
 
diff --git a/servers/text/text_server_extension.h b/servers/text/text_server_extension.h
index d948a97c66..571753ea67 100644
--- a/servers/text/text_server_extension.h
+++ b/servers/text/text_server_extension.h
@@ -92,10 +92,10 @@ public:
 	virtual int64_t font_get_face_count(const RID &p_font_rid) const override;
 	GDVIRTUAL1RC(int64_t, font_get_face_count, RID);
 
-	virtual void font_set_style(const RID &p_font_rid, int64_t /*FontStyle*/ p_style) override;
-	virtual int64_t /*FontStyle*/ font_get_style(const RID &p_font_rid) const override;
-	GDVIRTUAL2(font_set_style, RID, int64_t);
-	GDVIRTUAL1RC(int64_t, font_get_style, RID);
+	virtual void font_set_style(const RID &p_font_rid, BitField<FontStyle> p_style) override;
+	virtual BitField<FontStyle> font_get_style(const RID &p_font_rid) const override;
+	GDVIRTUAL2(font_set_style, RID, BitField<FontStyle>);
+	GDVIRTUAL1RC(BitField<FontStyle>, font_get_style, RID);
 
 	virtual void font_set_name(const RID &p_font_rid, const String &p_name) override;
 	virtual String font_get_name(const RID &p_font_rid) const override;
@@ -396,9 +396,9 @@ public:
 	GDVIRTUAL3RC(RID, shaped_text_substr, RID, int64_t, int64_t);
 	GDVIRTUAL1RC(RID, shaped_text_get_parent, RID);
 
-	virtual double shaped_text_fit_to_width(const RID &p_shaped, double p_width, int64_t /*JustificationFlag*/ p_jst_flags = JUSTIFICATION_WORD_BOUND | JUSTIFICATION_KASHIDA) override;
+	virtual double shaped_text_fit_to_width(const RID &p_shaped, double p_width, BitField<TextServer::JustificationFlag> p_jst_flags = JUSTIFICATION_WORD_BOUND | JUSTIFICATION_KASHIDA) override;
 	virtual double shaped_text_tab_align(const RID &p_shaped, const PackedFloat32Array &p_tab_stops) override;
-	GDVIRTUAL3R(double, shaped_text_fit_to_width, RID, double, int64_t);
+	GDVIRTUAL3R(double, shaped_text_fit_to_width, RID, double, BitField<TextServer::JustificationFlag>);
 	GDVIRTUAL2R(double, shaped_text_tab_align, RID, const PackedFloat32Array &);
 
 	virtual bool shaped_text_shape(const RID &p_shaped) override;
@@ -421,12 +421,12 @@ public:
 	virtual Vector2i shaped_text_get_range(const RID &p_shaped) const override;
 	GDVIRTUAL1RC(Vector2i, shaped_text_get_range, RID);
 
-	virtual PackedInt32Array shaped_text_get_line_breaks_adv(const RID &p_shaped, const PackedFloat32Array &p_width, int64_t p_start = 0, bool p_once = true, int64_t /*TextBreakFlag*/ p_break_flags = BREAK_MANDATORY | BREAK_WORD_BOUND) const override;
-	virtual PackedInt32Array shaped_text_get_line_breaks(const RID &p_shaped, double p_width, int64_t p_start = 0, int64_t p_break_flags = BREAK_MANDATORY | BREAK_WORD_BOUND) const override;
-	virtual PackedInt32Array shaped_text_get_word_breaks(const RID &p_shaped, int64_t p_grapheme_flags = GRAPHEME_IS_SPACE | GRAPHEME_IS_PUNCTUATION) const override;
-	GDVIRTUAL5RC(PackedInt32Array, shaped_text_get_line_breaks_adv, RID, const PackedFloat32Array &, int64_t, bool, int64_t);
-	GDVIRTUAL4RC(PackedInt32Array, shaped_text_get_line_breaks, RID, double, int64_t, int64_t);
-	GDVIRTUAL2RC(PackedInt32Array, shaped_text_get_word_breaks, RID, int64_t);
+	virtual PackedInt32Array shaped_text_get_line_breaks_adv(const RID &p_shaped, const PackedFloat32Array &p_width, int64_t p_start = 0, bool p_once = true, BitField<TextServer::LineBreakFlag> p_break_flags = BREAK_MANDATORY | BREAK_WORD_BOUND) const override;
+	virtual PackedInt32Array shaped_text_get_line_breaks(const RID &p_shaped, double p_width, int64_t p_start = 0, BitField<TextServer::LineBreakFlag> p_break_flags = BREAK_MANDATORY | BREAK_WORD_BOUND) const override;
+	virtual PackedInt32Array shaped_text_get_word_breaks(const RID &p_shaped, BitField<TextServer::GraphemeFlag> p_grapheme_flags = GRAPHEME_IS_SPACE | GRAPHEME_IS_PUNCTUATION) const override;
+	GDVIRTUAL5RC(PackedInt32Array, shaped_text_get_line_breaks_adv, RID, const PackedFloat32Array &, int64_t, bool, BitField<TextServer::LineBreakFlag>);
+	GDVIRTUAL4RC(PackedInt32Array, shaped_text_get_line_breaks, RID, double, int64_t, BitField<TextServer::LineBreakFlag>);
+	GDVIRTUAL2RC(PackedInt32Array, shaped_text_get_word_breaks, RID, BitField<TextServer::GraphemeFlag>);
 
 	virtual int64_t shaped_text_get_trim_pos(const RID &p_shaped) const override;
 	virtual int64_t shaped_text_get_ellipsis_pos(const RID &p_shaped) const override;
@@ -437,8 +437,8 @@ public:
 	GDVIRTUAL1RC(GDNativeConstPtr<const Glyph>, shaped_text_get_ellipsis_glyphs, RID);
 	GDVIRTUAL1RC(int64_t, shaped_text_get_ellipsis_glyph_count, RID);
 
-	virtual void shaped_text_overrun_trim_to_width(const RID &p_shaped, double p_width, int64_t p_trim_flags) override;
-	GDVIRTUAL3(shaped_text_overrun_trim_to_width, RID, double, int64_t);
+	virtual void shaped_text_overrun_trim_to_width(const RID &p_shaped, double p_width, BitField<TextServer::TextOverrunFlag> p_trim_flags) override;
+	GDVIRTUAL3(shaped_text_overrun_trim_to_width, RID, double, BitField<TextServer::TextOverrunFlag>);
 
 	virtual Array shaped_text_get_objects(const RID &p_shaped) const override;
 	virtual Rect2 shaped_text_get_object_rect(const RID &p_shaped, const Variant &p_key) const override;
diff --git a/servers/text_server.cpp b/servers/text_server.cpp
index c1293230d8..4a6b03d943 100644
--- a/servers/text_server.cpp
+++ b/servers/text_server.cpp
@@ -463,12 +463,12 @@ void TextServer::_bind_methods() {
 	BIND_ENUM_CONSTANT(ORIENTATION_VERTICAL);
 
 	/* JustificationFlag */
-	BIND_ENUM_CONSTANT(JUSTIFICATION_NONE);
-	BIND_ENUM_CONSTANT(JUSTIFICATION_KASHIDA);
-	BIND_ENUM_CONSTANT(JUSTIFICATION_WORD_BOUND);
-	BIND_ENUM_CONSTANT(JUSTIFICATION_TRIM_EDGE_SPACES);
-	BIND_ENUM_CONSTANT(JUSTIFICATION_AFTER_LAST_TAB);
-	BIND_ENUM_CONSTANT(JUSTIFICATION_CONSTRAIN_ELLIPSIS);
+	BIND_BITFIELD_FLAG(JUSTIFICATION_NONE);
+	BIND_BITFIELD_FLAG(JUSTIFICATION_KASHIDA);
+	BIND_BITFIELD_FLAG(JUSTIFICATION_WORD_BOUND);
+	BIND_BITFIELD_FLAG(JUSTIFICATION_TRIM_EDGE_SPACES);
+	BIND_BITFIELD_FLAG(JUSTIFICATION_AFTER_LAST_TAB);
+	BIND_BITFIELD_FLAG(JUSTIFICATION_CONSTRAIN_ELLIPSIS);
 
 	/* AutowrapMode */
 	BIND_ENUM_CONSTANT(AUTOWRAP_OFF);
@@ -477,11 +477,11 @@ void TextServer::_bind_methods() {
 	BIND_ENUM_CONSTANT(AUTOWRAP_WORD_SMART);
 
 	/* LineBreakFlag */
-	BIND_ENUM_CONSTANT(BREAK_NONE);
-	BIND_ENUM_CONSTANT(BREAK_MANDATORY);
-	BIND_ENUM_CONSTANT(BREAK_WORD_BOUND);
-	BIND_ENUM_CONSTANT(BREAK_GRAPHEME_BOUND);
-	BIND_ENUM_CONSTANT(BREAK_WORD_BOUND_ADAPTIVE);
+	BIND_BITFIELD_FLAG(BREAK_NONE);
+	BIND_BITFIELD_FLAG(BREAK_MANDATORY);
+	BIND_BITFIELD_FLAG(BREAK_WORD_BOUND);
+	BIND_BITFIELD_FLAG(BREAK_GRAPHEME_BOUND);
+	BIND_BITFIELD_FLAG(BREAK_ADAPTIVE);
 
 	/* VisibleCharactersBehavior */
 	BIND_ENUM_CONSTANT(VC_CHARS_BEFORE_SHAPING);
@@ -498,25 +498,25 @@ void TextServer::_bind_methods() {
 	BIND_ENUM_CONSTANT(OVERRUN_TRIM_WORD_ELLIPSIS);
 
 	/* TextOverrunFlag */
-	BIND_ENUM_CONSTANT(OVERRUN_NO_TRIM);
-	BIND_ENUM_CONSTANT(OVERRUN_TRIM);
-	BIND_ENUM_CONSTANT(OVERRUN_TRIM_WORD_ONLY);
-	BIND_ENUM_CONSTANT(OVERRUN_ADD_ELLIPSIS);
-	BIND_ENUM_CONSTANT(OVERRUN_ENFORCE_ELLIPSIS);
-	BIND_ENUM_CONSTANT(OVERRUN_JUSTIFICATION_AWARE);
+	BIND_BITFIELD_FLAG(OVERRUN_NO_TRIM);
+	BIND_BITFIELD_FLAG(OVERRUN_TRIM);
+	BIND_BITFIELD_FLAG(OVERRUN_TRIM_WORD_ONLY);
+	BIND_BITFIELD_FLAG(OVERRUN_ADD_ELLIPSIS);
+	BIND_BITFIELD_FLAG(OVERRUN_ENFORCE_ELLIPSIS);
+	BIND_BITFIELD_FLAG(OVERRUN_JUSTIFICATION_AWARE);
 
 	/* GraphemeFlag */
-	BIND_ENUM_CONSTANT(GRAPHEME_IS_VALID);
-	BIND_ENUM_CONSTANT(GRAPHEME_IS_RTL);
-	BIND_ENUM_CONSTANT(GRAPHEME_IS_VIRTUAL);
-	BIND_ENUM_CONSTANT(GRAPHEME_IS_SPACE);
-	BIND_ENUM_CONSTANT(GRAPHEME_IS_BREAK_HARD);
-	BIND_ENUM_CONSTANT(GRAPHEME_IS_BREAK_SOFT);
-	BIND_ENUM_CONSTANT(GRAPHEME_IS_TAB);
-	BIND_ENUM_CONSTANT(GRAPHEME_IS_ELONGATION);
-	BIND_ENUM_CONSTANT(GRAPHEME_IS_PUNCTUATION);
-	BIND_ENUM_CONSTANT(GRAPHEME_IS_UNDERSCORE);
-	BIND_ENUM_CONSTANT(GRAPHEME_IS_CONNECTED);
+	BIND_BITFIELD_FLAG(GRAPHEME_IS_VALID);
+	BIND_BITFIELD_FLAG(GRAPHEME_IS_RTL);
+	BIND_BITFIELD_FLAG(GRAPHEME_IS_VIRTUAL);
+	BIND_BITFIELD_FLAG(GRAPHEME_IS_SPACE);
+	BIND_BITFIELD_FLAG(GRAPHEME_IS_BREAK_HARD);
+	BIND_BITFIELD_FLAG(GRAPHEME_IS_BREAK_SOFT);
+	BIND_BITFIELD_FLAG(GRAPHEME_IS_TAB);
+	BIND_BITFIELD_FLAG(GRAPHEME_IS_ELONGATION);
+	BIND_BITFIELD_FLAG(GRAPHEME_IS_PUNCTUATION);
+	BIND_BITFIELD_FLAG(GRAPHEME_IS_UNDERSCORE);
+	BIND_BITFIELD_FLAG(GRAPHEME_IS_CONNECTED);
 
 	/* Hinting */
 	BIND_ENUM_CONSTANT(HINTING_NONE);
@@ -556,11 +556,12 @@ void TextServer::_bind_methods() {
 	BIND_ENUM_CONSTANT(SPACING_SPACE);
 	BIND_ENUM_CONSTANT(SPACING_TOP);
 	BIND_ENUM_CONSTANT(SPACING_BOTTOM);
+	BIND_ENUM_CONSTANT(SPACING_MAX);
 
 	/* Font Style */
-	BIND_ENUM_CONSTANT(FONT_BOLD);
-	BIND_ENUM_CONSTANT(FONT_ITALIC);
-	BIND_ENUM_CONSTANT(FONT_FIXED_WIDTH);
+	BIND_BITFIELD_FLAG(FONT_BOLD);
+	BIND_BITFIELD_FLAG(FONT_ITALIC);
+	BIND_BITFIELD_FLAG(FONT_FIXED_WIDTH);
 
 	/* Structured text parser */
 	BIND_ENUM_CONSTANT(STRUCTURED_TEXT_DEFAULT);
@@ -650,7 +651,7 @@ void TextServer::draw_hex_code_box(const RID &p_canvas, int64_t p_size, const Ve
 	}
 }
 
-PackedInt32Array TextServer::shaped_text_get_line_breaks_adv(const RID &p_shaped, const PackedFloat32Array &p_width, int64_t p_start, bool p_once, int64_t /*TextBreakFlag*/ p_break_flags) const {
+PackedInt32Array TextServer::shaped_text_get_line_breaks_adv(const RID &p_shaped, const PackedFloat32Array &p_width, int64_t p_start, bool p_once, BitField<TextServer::LineBreakFlag> p_break_flags) const {
 	PackedInt32Array lines;
 
 	ERR_FAIL_COND_V(p_width.is_empty(), lines);
@@ -687,7 +688,7 @@ PackedInt32Array TextServer::shaped_text_get_line_breaks_adv(const RID &p_shaped
 				}
 				continue;
 			}
-			if ((p_break_flags & BREAK_MANDATORY) == BREAK_MANDATORY) {
+			if (p_break_flags.has_flag(BREAK_MANDATORY)) {
 				if ((l_gl[i].flags & GRAPHEME_IS_BREAK_HARD) == GRAPHEME_IS_BREAK_HARD) {
 					lines.push_back(line_start);
 					lines.push_back(l_gl[i].end);
@@ -701,12 +702,12 @@ PackedInt32Array TextServer::shaped_text_get_line_breaks_adv(const RID &p_shaped
 					continue;
 				}
 			}
-			if ((p_break_flags & BREAK_WORD_BOUND) == BREAK_WORD_BOUND) {
+			if (p_break_flags.has_flag(BREAK_WORD_BOUND)) {
 				if ((l_gl[i].flags & GRAPHEME_IS_BREAK_SOFT) == GRAPHEME_IS_BREAK_SOFT) {
 					last_safe_break = i;
 				}
 			}
-			if ((p_break_flags & BREAK_GRAPHEME_BOUND) == BREAK_GRAPHEME_BOUND) {
+			if (p_break_flags.has_flag(BREAK_GRAPHEME_BOUND)) {
 				last_safe_break = i;
 			}
 		}
@@ -726,7 +727,7 @@ PackedInt32Array TextServer::shaped_text_get_line_breaks_adv(const RID &p_shaped
 	return lines;
 }
 
-PackedInt32Array TextServer::shaped_text_get_line_breaks(const RID &p_shaped, double p_width, int64_t p_start, int64_t /*TextBreakFlag*/ p_break_flags) const {
+PackedInt32Array TextServer::shaped_text_get_line_breaks(const RID &p_shaped, double p_width, int64_t p_start, BitField<TextServer::LineBreakFlag> p_break_flags) const {
 	PackedInt32Array lines;
 
 	const_cast<TextServer *>(this)->shaped_text_update_breaks(p_shaped);
@@ -755,7 +756,7 @@ PackedInt32Array TextServer::shaped_text_get_line_breaks(const RID &p_shaped, do
 				word_count = 0;
 				continue;
 			}
-			if ((p_break_flags & BREAK_MANDATORY) == BREAK_MANDATORY) {
+			if (p_break_flags.has_flag(BREAK_MANDATORY)) {
 				if ((l_gl[i].flags & GRAPHEME_IS_BREAK_HARD) == GRAPHEME_IS_BREAK_HARD) {
 					lines.push_back(line_start);
 					lines.push_back(l_gl[i].end);
@@ -765,16 +766,16 @@ PackedInt32Array TextServer::shaped_text_get_line_breaks(const RID &p_shaped, do
 					continue;
 				}
 			}
-			if ((p_break_flags & BREAK_WORD_BOUND) == BREAK_WORD_BOUND) {
+			if (p_break_flags.has_flag(BREAK_WORD_BOUND)) {
 				if ((l_gl[i].flags & GRAPHEME_IS_BREAK_SOFT) == GRAPHEME_IS_BREAK_SOFT) {
 					last_safe_break = i;
 					word_count++;
 				}
+				if (p_break_flags.has_flag(BREAK_ADAPTIVE) && word_count == 0) {
+					last_safe_break = i;
+				}
 			}
-			if (((p_break_flags & BREAK_WORD_BOUND_ADAPTIVE) == BREAK_WORD_BOUND_ADAPTIVE) && word_count == 0) {
-				last_safe_break = i;
-			}
-			if ((p_break_flags & BREAK_GRAPHEME_BOUND) == BREAK_GRAPHEME_BOUND) {
+			if (p_break_flags.has_flag(BREAK_GRAPHEME_BOUND)) {
 				last_safe_break = i;
 			}
 		}
@@ -794,7 +795,7 @@ PackedInt32Array TextServer::shaped_text_get_line_breaks(const RID &p_shaped, do
 	return lines;
 }
 
-PackedInt32Array TextServer::shaped_text_get_word_breaks(const RID &p_shaped, int64_t p_grapheme_flags) const {
+PackedInt32Array TextServer::shaped_text_get_word_breaks(const RID &p_shaped, BitField<TextServer::GraphemeFlag> p_grapheme_flags) const {
 	PackedInt32Array words;
 
 	const_cast<TextServer *>(this)->shaped_text_update_justification_ops(p_shaped);
diff --git a/servers/text_server.h b/servers/text_server.h
index 0fd35f2ec0..f6ab165bfc 100644
--- a/servers/text_server.h
+++ b/servers/text_server.h
@@ -79,12 +79,12 @@ public:
 		AUTOWRAP_WORD_SMART
 	};
 
-	enum LineBreakFlag { // LineBreakFlag can be passed in the same value as the JustificationFlag, do not use the same values.
+	enum LineBreakFlag {
 		BREAK_NONE = 0,
-		BREAK_MANDATORY = 1 << 5,
-		BREAK_WORD_BOUND = 1 << 6,
-		BREAK_GRAPHEME_BOUND = 1 << 7,
-		BREAK_WORD_BOUND_ADAPTIVE = 1 << 6 | 1 << 8,
+		BREAK_MANDATORY = 1 << 0,
+		BREAK_WORD_BOUND = 1 << 1,
+		BREAK_GRAPHEME_BOUND = 1 << 2,
+		BREAK_ADAPTIVE = 1 << 3,
 	};
 
 	enum OverrunBehavior {
@@ -218,8 +218,8 @@ public:
 
 	virtual int64_t font_get_face_count(const RID &p_font_rid) const = 0;
 
-	virtual void font_set_style(const RID &p_font_rid, int64_t /*FontStyle*/ p_style) = 0;
-	virtual int64_t /*FontStyle*/ font_get_style(const RID &p_font_rid) const = 0;
+	virtual void font_set_style(const RID &p_font_rid, BitField<FontStyle> p_style) = 0;
+	virtual BitField<FontStyle> font_get_style(const RID &p_font_rid) const = 0;
 
 	virtual void font_set_name(const RID &p_font_rid, const String &p_name) = 0;
 	virtual String font_get_name(const RID &p_font_rid) const = 0;
@@ -398,7 +398,7 @@ public:
 	virtual RID shaped_text_substr(const RID &p_shaped, int64_t p_start, int64_t p_length) const = 0; // Copy shaped substring (e.g. line break) without reshaping, but correctly reordered, preservers range.
 	virtual RID shaped_text_get_parent(const RID &p_shaped) const = 0;
 
-	virtual double shaped_text_fit_to_width(const RID &p_shaped, double p_width, int64_t /*JustificationFlag*/ p_jst_flags = JUSTIFICATION_WORD_BOUND | JUSTIFICATION_KASHIDA) = 0;
+	virtual double shaped_text_fit_to_width(const RID &p_shaped, double p_width, BitField<TextServer::JustificationFlag> p_jst_flags = JUSTIFICATION_WORD_BOUND | JUSTIFICATION_KASHIDA) = 0;
 	virtual double shaped_text_tab_align(const RID &p_shaped, const PackedFloat32Array &p_tab_stops) = 0;
 
 	virtual bool shaped_text_shape(const RID &p_shaped) = 0;
@@ -415,9 +415,9 @@ public:
 
 	virtual Vector2i shaped_text_get_range(const RID &p_shaped) const = 0;
 
-	virtual PackedInt32Array shaped_text_get_line_breaks_adv(const RID &p_shaped, const PackedFloat32Array &p_width, int64_t p_start = 0, bool p_once = true, int64_t /*TextBreakFlag*/ p_break_flags = BREAK_MANDATORY | BREAK_WORD_BOUND) const;
-	virtual PackedInt32Array shaped_text_get_line_breaks(const RID &p_shaped, double p_width, int64_t p_start = 0, int64_t /*TextBreakFlag*/ p_break_flags = BREAK_MANDATORY | BREAK_WORD_BOUND) const;
-	virtual PackedInt32Array shaped_text_get_word_breaks(const RID &p_shaped, int64_t p_grapheme_flags = GRAPHEME_IS_SPACE | GRAPHEME_IS_PUNCTUATION) const;
+	virtual PackedInt32Array shaped_text_get_line_breaks_adv(const RID &p_shaped, const PackedFloat32Array &p_width, int64_t p_start = 0, bool p_once = true, BitField<TextServer::LineBreakFlag> p_break_flags = BREAK_MANDATORY | BREAK_WORD_BOUND) const;
+	virtual PackedInt32Array shaped_text_get_line_breaks(const RID &p_shaped, double p_width, int64_t p_start = 0, BitField<TextServer::LineBreakFlag> p_break_flags = BREAK_MANDATORY | BREAK_WORD_BOUND) const;
+	virtual PackedInt32Array shaped_text_get_word_breaks(const RID &p_shaped, BitField<TextServer::GraphemeFlag> p_grapheme_flags = GRAPHEME_IS_SPACE | GRAPHEME_IS_PUNCTUATION) const;
 
 	virtual int64_t shaped_text_get_trim_pos(const RID &p_shaped) const = 0;
 	virtual int64_t shaped_text_get_ellipsis_pos(const RID &p_shaped) const = 0;
@@ -425,7 +425,7 @@ public:
 	Array _shaped_text_get_ellipsis_glyphs_wrapper(const RID &p_shaped) const;
 	virtual int64_t shaped_text_get_ellipsis_glyph_count(const RID &p_shaped) const = 0;
 
-	virtual void shaped_text_overrun_trim_to_width(const RID &p_shaped, double p_width, int64_t p_trim_flags) = 0;
+	virtual void shaped_text_overrun_trim_to_width(const RID &p_shaped, double p_width, BitField<TextServer::TextOverrunFlag> p_trim_flags) = 0;
 
 	virtual Array shaped_text_get_objects(const RID &p_shaped) const = 0;
 	virtual Rect2 shaped_text_get_object_rect(const RID &p_shaped, const Variant &p_key) const = 0;
@@ -551,16 +551,16 @@ VARIANT_ENUM_CAST(TextServer::AutowrapMode);
 VARIANT_ENUM_CAST(TextServer::OverrunBehavior);
 VARIANT_ENUM_CAST(TextServer::Direction);
 VARIANT_ENUM_CAST(TextServer::Orientation);
-VARIANT_ENUM_CAST(TextServer::JustificationFlag);
-VARIANT_ENUM_CAST(TextServer::LineBreakFlag);
-VARIANT_ENUM_CAST(TextServer::TextOverrunFlag);
-VARIANT_ENUM_CAST(TextServer::GraphemeFlag);
+VARIANT_BITFIELD_CAST(TextServer::JustificationFlag);
+VARIANT_BITFIELD_CAST(TextServer::LineBreakFlag);
+VARIANT_BITFIELD_CAST(TextServer::TextOverrunFlag);
+VARIANT_BITFIELD_CAST(TextServer::GraphemeFlag);
 VARIANT_ENUM_CAST(TextServer::Hinting);
 VARIANT_ENUM_CAST(TextServer::SubpixelPositioning);
 VARIANT_ENUM_CAST(TextServer::Feature);
 VARIANT_ENUM_CAST(TextServer::ContourPointTag);
 VARIANT_ENUM_CAST(TextServer::SpacingType);
-VARIANT_ENUM_CAST(TextServer::FontStyle);
+VARIANT_BITFIELD_CAST(TextServer::FontStyle);
 VARIANT_ENUM_CAST(TextServer::StructuredTextParser);
 
 GDVIRTUAL_NATIVE_PTR(Glyph);