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

8 files changed, 83 insertions, 72 deletions

diff --git a/doc/classes/@GlobalScope.xml b/doc/classes/@GlobalScope.xml
index fce0341292..7acec9e63b 100644
--- a/doc/classes/@GlobalScope.xml
+++ b/doc/classes/@GlobalScope.xml
@@ -2652,6 +2652,8 @@
 		<constant name="PROPERTY_USAGE_SUBGROUP" value="256" enum="PropertyUsageFlags">
 			Used to group properties together in the editor in a subgroup (under a group). See [EditorInspector].
 		</constant>
+		<constant name="PROPERTY_USAGE_CLASS_IS_BITFIELD" value="512" enum="PropertyUsageFlags">
+		</constant>
 		<constant name="PROPERTY_USAGE_NO_INSTANCE_STATE" value="1024" enum="PropertyUsageFlags">
 			The property does not save its state in [PackedScene].
 		</constant>
diff --git a/doc/classes/CanvasItem.xml b/doc/classes/CanvasItem.xml
index acf08414d0..2d68ae6902 100644
--- a/doc/classes/CanvasItem.xml
+++ b/doc/classes/CanvasItem.xml
@@ -169,9 +169,10 @@
 			<argument index="5" name="font_size" type="int" default="16" />
 			<argument index="6" name="max_lines" type="int" default="-1" />
 			<argument index="7" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="8" name="flags" type="int" default="99" />
-			<argument index="9" name="direction" type="int" enum="TextServer.Direction" default="0" />
-			<argument index="10" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
+			<argument index="8" name="brk_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
+			<argument index="9" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
+			<argument index="10" name="direction" type="int" enum="TextServer.Direction" default="0" />
+			<argument index="11" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
 				Breaks [code]text[/code] to the lines and draws it using the specified [code]font[/code] at the [code]position[/code] (top-left corner). The text will have its color multiplied by [code]modulate[/code]. If [code]clip_w[/code] is greater than or equal to 0, the text will be clipped if it exceeds the specified width.
 			</description>
@@ -187,9 +188,10 @@
 			<argument index="6" name="max_lines" type="int" default="-1" />
 			<argument index="7" name="size" type="int" default="1" />
 			<argument index="8" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="9" name="flags" type="int" default="99" />
-			<argument index="10" name="direction" type="int" enum="TextServer.Direction" default="0" />
-			<argument index="11" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
+			<argument index="9" name="brk_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
+			<argument index="10" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
+			<argument index="11" name="direction" type="int" enum="TextServer.Direction" default="0" />
+			<argument index="12" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
 				Breaks [code]text[/code] to the lines and draws text outline using the specified [code]font[/code] at the [code]position[/code] (top-left corner). The text will have its color multiplied by [code]modulate[/code]. If [code]clip_w[/code] is greater than or equal to 0, the text will be clipped if it exceeds the specified width.
 			</description>
@@ -279,7 +281,7 @@
 			<argument index="4" name="width" type="float" default="-1" />
 			<argument index="5" name="font_size" type="int" default="16" />
 			<argument index="6" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="7" name="flags" type="int" default="3" />
+			<argument index="7" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
 			<argument index="8" name="direction" type="int" enum="TextServer.Direction" default="0" />
 			<argument index="9" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
@@ -316,7 +318,7 @@
 			<argument index="5" name="font_size" type="int" default="16" />
 			<argument index="6" name="size" type="int" default="1" />
 			<argument index="7" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="8" name="flags" type="int" default="3" />
+			<argument index="8" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
 			<argument index="9" name="direction" type="int" enum="TextServer.Direction" default="0" />
 			<argument index="10" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
diff --git a/doc/classes/Font.xml b/doc/classes/Font.xml
index b19386b398..e95f444d55 100644
--- a/doc/classes/Font.xml
+++ b/doc/classes/Font.xml
@@ -44,9 +44,10 @@
 			<argument index="5" name="font_size" type="int" default="16" />
 			<argument index="6" name="max_lines" type="int" default="-1" />
 			<argument index="7" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="8" name="flags" type="int" default="99" />
-			<argument index="9" name="direction" type="int" enum="TextServer.Direction" default="0" />
-			<argument index="10" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
+			<argument index="8" name="brk_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
+			<argument index="9" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
+			<argument index="10" name="direction" type="int" enum="TextServer.Direction" default="0" />
+			<argument index="11" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
 				Breaks [code]text[/code] to the lines using rules specified by [code]flags[/code] and draws it into a canvas item using the font, at a given position, with [code]modulate[/code] color, optionally clipping the width and aligning horizontally. [code]position[/code] specifies the baseline of the first line, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis.
 				See also [method CanvasItem.draw_multiline_string].
@@ -63,9 +64,10 @@
 			<argument index="6" name="max_lines" type="int" default="-1" />
 			<argument index="7" name="size" type="int" default="1" />
 			<argument index="8" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="9" name="flags" type="int" default="99" />
-			<argument index="10" name="direction" type="int" enum="TextServer.Direction" default="0" />
-			<argument index="11" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
+			<argument index="9" name="brk_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
+			<argument index="10" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
+			<argument index="11" name="direction" type="int" enum="TextServer.Direction" default="0" />
+			<argument index="12" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
 				Breaks [code]text[/code] to the lines using rules specified by [code]flags[/code] and draws text outline into a canvas item using the font, at a given position, with [code]modulate[/code] color and [code]size[/code] outline size, optionally clipping the width and aligning horizontally. [code]position[/code] specifies the baseline of the first line, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis.
 				See also [method CanvasItem.draw_multiline_string_outline].
@@ -80,7 +82,7 @@
 			<argument index="4" name="width" type="float" default="-1" />
 			<argument index="5" name="font_size" type="int" default="16" />
 			<argument index="6" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="7" name="flags" type="int" default="3" />
+			<argument index="7" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
 			<argument index="8" name="direction" type="int" enum="TextServer.Direction" default="0" />
 			<argument index="9" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
@@ -98,7 +100,7 @@
 			<argument index="5" name="font_size" type="int" default="16" />
 			<argument index="6" name="size" type="int" default="1" />
 			<argument index="7" name="modulate" type="Color" default="Color(1, 1, 1, 1)" />
-			<argument index="8" name="flags" type="int" default="3" />
+			<argument index="8" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
 			<argument index="9" name="direction" type="int" enum="TextServer.Direction" default="0" />
 			<argument index="10" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
@@ -160,7 +162,7 @@
 			</description>
 		</method>
 		<method name="get_font_style" qualifiers="const">
-			<return type="int" />
+			<return type="int" enum="TextServer.FontStyle" />
 			<description>
 				Returns font style flags, see [enum TextServer.FontStyle].
 			</description>
@@ -186,9 +188,10 @@
 			<argument index="2" name="width" type="float" default="-1" />
 			<argument index="3" name="font_size" type="int" default="16" />
 			<argument index="4" name="max_lines" type="int" default="-1" />
-			<argument index="5" name="flags" type="int" default="96" />
-			<argument index="6" name="direction" type="int" enum="TextServer.Direction" default="0" />
-			<argument index="7" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
+			<argument index="5" name="brk_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
+			<argument index="6" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
+			<argument index="7" name="direction" type="int" enum="TextServer.Direction" default="0" />
+			<argument index="8" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
 				Returns the size of a bounding box of a string broken into the lines, taking kerning and advance into account.
 				See also [method draw_multiline_string].
@@ -219,7 +222,7 @@
 			<argument index="1" name="alignment" type="int" enum="HorizontalAlignment" default="0" />
 			<argument index="2" name="width" type="float" default="-1" />
 			<argument index="3" name="font_size" type="int" default="16" />
-			<argument index="4" name="flags" type="int" default="3" />
+			<argument index="4" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
 			<argument index="5" name="direction" type="int" enum="TextServer.Direction" default="0" />
 			<argument index="6" name="orientation" type="int" enum="TextServer.Orientation" default="0" />
 			<description>
diff --git a/doc/classes/FontFile.xml b/doc/classes/FontFile.xml
index 98abc87b84..aaf871d55a 100644
--- a/doc/classes/FontFile.xml
+++ b/doc/classes/FontFile.xml
@@ -558,7 +558,7 @@
 		<member name="font_name" type="String" setter="set_font_name" getter="get_font_name" default="&quot;&quot;">
 			Font family name.
 		</member>
-		<member name="font_style" type="int" setter="set_font_style" getter="get_font_style" default="0">
+		<member name="font_style" type="int" setter="set_font_style" getter="get_font_style" enum="TextServer.FontStyle" default="0">
 			Font style flags, see [enum TextServer.FontStyle].
 		</member>
 		<member name="force_autohinter" type="bool" setter="set_force_autohinter" getter="is_force_autohinter" default="false">
diff --git a/doc/classes/TextLine.xml b/doc/classes/TextLine.xml
index c3574980b1..601650db2e 100644
--- a/doc/classes/TextLine.xml
+++ b/doc/classes/TextLine.xml
@@ -148,8 +148,8 @@
 		<member name="direction" type="int" setter="set_direction" getter="get_direction" enum="TextServer.Direction" default="0">
 			Text writing direction.
 		</member>
-		<member name="flags" type="int" setter="set_flags" getter="get_flags" default="3">
-			Line Alignment rules. For more info see [TextServer].
+		<member name="flags" type="int" setter="set_flags" getter="get_flags" enum="TextServer.JustificationFlag" default="3">
+			Line alignment rules. For more info see [TextServer].
 		</member>
 		<member name="orientation" type="int" setter="set_orientation" getter="get_orientation" enum="TextServer.Orientation" default="0">
 			Text orientation.
diff --git a/doc/classes/TextParagraph.xml b/doc/classes/TextParagraph.xml
index 6d615bd404..c733d8fcee 100644
--- a/doc/classes/TextParagraph.xml
+++ b/doc/classes/TextParagraph.xml
@@ -263,14 +263,17 @@
 		<member name="alignment" type="int" setter="set_alignment" getter="get_alignment" enum="HorizontalAlignment" default="0">
 			Paragraph horizontal alignment.
 		</member>
+		<member name="break_flags" type="int" setter="set_break_flags" getter="get_break_flags" enum="TextServer.LineBreakFlag" default="3">
+			Line breaking rules. For more info see [TextServer].
+		</member>
 		<member name="custom_punctuation" type="String" setter="set_custom_punctuation" getter="get_custom_punctuation" default="&quot;&quot;">
 			Custom punctuation character list, used for word breaking. If set to empty string, server defaults are used.
 		</member>
 		<member name="direction" type="int" setter="set_direction" getter="get_direction" enum="TextServer.Direction" default="0">
 			Text writing direction.
 		</member>
-		<member name="flags" type="int" setter="set_flags" getter="get_flags" default="99">
-			Line breaking and alignment rules. For more info see [TextServer].
+		<member name="justification_flags" type="int" setter="set_justification_flags" getter="get_justification_flags" enum="TextServer.JustificationFlag" default="3">
+			Line alignment rules. For more info see [TextServer].
 		</member>
 		<member name="max_lines_visible" type="int" setter="set_max_lines_visible" getter="get_max_lines_visible" default="-1">
 			Limits the lines of text shown.
diff --git a/doc/classes/TextServer.xml b/doc/classes/TextServer.xml
index 4c8cf3982e..e1b676427b 100644
--- a/doc/classes/TextServer.xml
+++ b/doc/classes/TextServer.xml
@@ -356,7 +356,7 @@
 			</description>
 		</method>
 		<method name="font_get_style" qualifiers="const">
-			<return type="int" />
+			<return type="int" enum="TextServer.FontStyle" />
 			<argument index="0" name="font_rid" type="RID" />
 			<description>
 				Returns font style flags, see [enum FontStyle].
@@ -786,7 +786,7 @@
 		<method name="font_set_style">
 			<return type="void" />
 			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="style" type="int" />
+			<argument index="1" name="style" type="int" enum="TextServer.FontStyle" />
 			<description>
 				Sets the font style flags, see [enum FontStyle].
 			</description>
@@ -1077,7 +1077,7 @@
 			<return type="float" />
 			<argument index="0" name="shaped" type="RID" />
 			<argument index="1" name="width" type="float" />
-			<argument index="2" name="jst_flags" type="int" default="3" />
+			<argument index="2" name="jst_flags" type="int" enum="TextServer.JustificationFlag" default="3" />
 			<description>
 				Adjusts text with to fit to specified width, returns new text width.
 			</description>
@@ -1184,7 +1184,7 @@
 			<argument index="0" name="shaped" type="RID" />
 			<argument index="1" name="width" type="float" />
 			<argument index="2" name="start" type="int" default="0" />
-			<argument index="3" name="break_flags" type="int" default="96" />
+			<argument index="3" name="break_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
 			<description>
 				Breaks text to the lines and returns character ranges for each line.
 			</description>
@@ -1195,7 +1195,7 @@
 			<argument index="1" name="width" type="PackedFloat32Array" />
 			<argument index="2" name="start" type="int" default="0" />
 			<argument index="3" name="once" type="bool" default="true" />
-			<argument index="4" name="break_flags" type="int" default="96" />
+			<argument index="4" name="break_flags" type="int" enum="TextServer.LineBreakFlag" default="3" />
 			<description>
 				Breaks text to the lines and columns. Returns character ranges for each segment.
 			</description>
@@ -1306,7 +1306,7 @@
 		<method name="shaped_text_get_word_breaks" qualifiers="const">
 			<return type="PackedInt32Array" />
 			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="grapheme_flags" type="int" default="264" />
+			<argument index="1" name="grapheme_flags" type="int" enum="TextServer.GraphemeFlag" default="264" />
 			<description>
 				Breaks text into words and returns array of character ranges. Use [code]grapheme_flags[/code] to set what characters are used for breaking (see [enum GraphemeFlag]).
 			</description>
@@ -1346,7 +1346,7 @@
 			<return type="void" />
 			<argument index="0" name="shaped" type="RID" />
 			<argument index="1" name="width" type="float" default="0" />
-			<argument index="2" name="overrun_trim_flags" type="int" default="0" />
+			<argument index="2" name="overrun_trim_flags" type="int" enum="TextServer.TextOverrunFlag" default="0" />
 			<description>
 				Trims text if it exceeds the given width.
 			</description>
@@ -1522,22 +1522,22 @@
 			Left to right text is written vertically from top to bottom.
 			Right to left text is written vertically from bottom to top.
 		</constant>
-		<constant name="JUSTIFICATION_NONE" value="0" enum="JustificationFlag">
+		<constant name="JUSTIFICATION_NONE" value="0" enum="JustificationFlag" is_bitfield="true">
 			Do not justify text.
 		</constant>
-		<constant name="JUSTIFICATION_KASHIDA" value="1" enum="JustificationFlag">
+		<constant name="JUSTIFICATION_KASHIDA" value="1" enum="JustificationFlag" is_bitfield="true">
 			Justify text by adding and removing kashidas.
 		</constant>
-		<constant name="JUSTIFICATION_WORD_BOUND" value="2" enum="JustificationFlag">
+		<constant name="JUSTIFICATION_WORD_BOUND" value="2" enum="JustificationFlag" is_bitfield="true">
 			Justify text by changing width of the spaces between the words.
 		</constant>
-		<constant name="JUSTIFICATION_TRIM_EDGE_SPACES" value="4" enum="JustificationFlag">
+		<constant name="JUSTIFICATION_TRIM_EDGE_SPACES" value="4" enum="JustificationFlag" is_bitfield="true">
 			Remove trailing and leading spaces from the justified text.
 		</constant>
-		<constant name="JUSTIFICATION_AFTER_LAST_TAB" value="8" enum="JustificationFlag">
+		<constant name="JUSTIFICATION_AFTER_LAST_TAB" value="8" enum="JustificationFlag" is_bitfield="true">
 			Only apply justification to the part of the text after the last tab.
 		</constant>
-		<constant name="JUSTIFICATION_CONSTRAIN_ELLIPSIS" value="16" enum="JustificationFlag">
+		<constant name="JUSTIFICATION_CONSTRAIN_ELLIPSIS" value="16" enum="JustificationFlag" is_bitfield="true">
 			Apply justification to the trimmed line with ellipsis.
 		</constant>
 		<constant name="AUTOWRAP_OFF" value="0" enum="AutowrapMode">
@@ -1552,20 +1552,19 @@
 		<constant name="AUTOWRAP_WORD_SMART" value="3" enum="AutowrapMode">
 			Behaves similarly to [constant AUTOWRAP_WORD], but force-breaks a word if that single word does not fit in one line.
 		</constant>
-		<constant name="BREAK_NONE" value="0" enum="LineBreakFlag">
+		<constant name="BREAK_NONE" value="0" enum="LineBreakFlag" is_bitfield="true">
 			Do not break the line.
 		</constant>
-		<constant name="BREAK_MANDATORY" value="32" enum="LineBreakFlag">
+		<constant name="BREAK_MANDATORY" value="1" enum="LineBreakFlag" is_bitfield="true">
 			Break the line at the line mandatory break characters (e.g. [code]"\n"[/code]).
 		</constant>
-		<constant name="BREAK_WORD_BOUND" value="64" enum="LineBreakFlag">
+		<constant name="BREAK_WORD_BOUND" value="2" enum="LineBreakFlag" is_bitfield="true">
 			Break the line between the words.
 		</constant>
-		<constant name="BREAK_GRAPHEME_BOUND" value="128" enum="LineBreakFlag">
+		<constant name="BREAK_GRAPHEME_BOUND" value="4" enum="LineBreakFlag" is_bitfield="true">
 			Break the line between any unconnected graphemes.
 		</constant>
-		<constant name="BREAK_WORD_BOUND_ADAPTIVE" value="320" enum="LineBreakFlag">
-			Break the line between the words, or any unconnected graphemes if line is too short to fit the whole word.
+		<constant name="BREAK_ADAPTIVE" value="8" enum="LineBreakFlag" is_bitfield="true">
 		</constant>
 		<constant name="VC_CHARS_BEFORE_SHAPING" value="0" enum="VisibleCharactersBehavior">
 			Trims text before the shaping. e.g, increasing [member Label.visible_characters] or [member RichTextLabel.visible_characters] value is visually identical to typing the text.
@@ -1597,54 +1596,54 @@
 		<constant name="OVERRUN_TRIM_WORD_ELLIPSIS" value="4" enum="OverrunBehavior">
 			Trims the text per word and adds an ellipsis to indicate that parts are hidden.
 		</constant>
-		<constant name="OVERRUN_NO_TRIM" value="0" enum="TextOverrunFlag">
+		<constant name="OVERRUN_NO_TRIM" value="0" enum="TextOverrunFlag" is_bitfield="true">
 			No trimming is performed.
 		</constant>
-		<constant name="OVERRUN_TRIM" value="1" enum="TextOverrunFlag">
+		<constant name="OVERRUN_TRIM" value="1" enum="TextOverrunFlag" is_bitfield="true">
 			Trims the text when it exceeds the given width.
 		</constant>
-		<constant name="OVERRUN_TRIM_WORD_ONLY" value="2" enum="TextOverrunFlag">
+		<constant name="OVERRUN_TRIM_WORD_ONLY" value="2" enum="TextOverrunFlag" is_bitfield="true">
 			Trims the text per word instead of per grapheme.
 		</constant>
-		<constant name="OVERRUN_ADD_ELLIPSIS" value="4" enum="TextOverrunFlag">
+		<constant name="OVERRUN_ADD_ELLIPSIS" value="4" enum="TextOverrunFlag" is_bitfield="true">
 			Determines whether an ellipsis should be added at the end of the text.
 		</constant>
-		<constant name="OVERRUN_ENFORCE_ELLIPSIS" value="8" enum="TextOverrunFlag">
+		<constant name="OVERRUN_ENFORCE_ELLIPSIS" value="8" enum="TextOverrunFlag" is_bitfield="true">
 			Determines whether the ellipsis at the end of the text is enforced and may not be hidden.
 		</constant>
-		<constant name="OVERRUN_JUSTIFICATION_AWARE" value="16" enum="TextOverrunFlag">
+		<constant name="OVERRUN_JUSTIFICATION_AWARE" value="16" enum="TextOverrunFlag" is_bitfield="true">
 		</constant>
-		<constant name="GRAPHEME_IS_VALID" value="1" enum="GraphemeFlag">
+		<constant name="GRAPHEME_IS_VALID" value="1" enum="GraphemeFlag" is_bitfield="true">
 			Grapheme is supported by the font, and can be drawn.
 		</constant>
-		<constant name="GRAPHEME_IS_RTL" value="2" enum="GraphemeFlag">
+		<constant name="GRAPHEME_IS_RTL" value="2" enum="GraphemeFlag" is_bitfield="true">
 			Grapheme is part of right-to-left or bottom-to-top run.
 		</constant>
-		<constant name="GRAPHEME_IS_VIRTUAL" value="4" enum="GraphemeFlag">
+		<constant name="GRAPHEME_IS_VIRTUAL" value="4" enum="GraphemeFlag" is_bitfield="true">
 			Grapheme is not part of source text, it was added by justification process.
 		</constant>
-		<constant name="GRAPHEME_IS_SPACE" value="8" enum="GraphemeFlag">
+		<constant name="GRAPHEME_IS_SPACE" value="8" enum="GraphemeFlag" is_bitfield="true">
 			Grapheme is whitespace.
 		</constant>
-		<constant name="GRAPHEME_IS_BREAK_HARD" value="16" enum="GraphemeFlag">
+		<constant name="GRAPHEME_IS_BREAK_HARD" value="16" enum="GraphemeFlag" is_bitfield="true">
 			Grapheme is mandatory break point (e.g. [code]"\n"[/code]).
 		</constant>
-		<constant name="GRAPHEME_IS_BREAK_SOFT" value="32" enum="GraphemeFlag">
+		<constant name="GRAPHEME_IS_BREAK_SOFT" value="32" enum="GraphemeFlag" is_bitfield="true">
 			Grapheme is optional break point (e.g. space).
 		</constant>
-		<constant name="GRAPHEME_IS_TAB" value="64" enum="GraphemeFlag">
+		<constant name="GRAPHEME_IS_TAB" value="64" enum="GraphemeFlag" is_bitfield="true">
 			Grapheme is the tabulation character.
 		</constant>
-		<constant name="GRAPHEME_IS_ELONGATION" value="128" enum="GraphemeFlag">
+		<constant name="GRAPHEME_IS_ELONGATION" value="128" enum="GraphemeFlag" is_bitfield="true">
 			Grapheme is kashida.
 		</constant>
-		<constant name="GRAPHEME_IS_PUNCTUATION" value="256" enum="GraphemeFlag">
+		<constant name="GRAPHEME_IS_PUNCTUATION" value="256" enum="GraphemeFlag" is_bitfield="true">
 			Grapheme is punctuation character.
 		</constant>
-		<constant name="GRAPHEME_IS_UNDERSCORE" value="512" enum="GraphemeFlag">
+		<constant name="GRAPHEME_IS_UNDERSCORE" value="512" enum="GraphemeFlag" is_bitfield="true">
 			Grapheme is underscore character.
 		</constant>
-		<constant name="GRAPHEME_IS_CONNECTED" value="1024" enum="GraphemeFlag">
+		<constant name="GRAPHEME_IS_CONNECTED" value="1024" enum="GraphemeFlag" is_bitfield="true">
 			Grapheme is connected to the previous grapheme. Breaking line before this grapheme is not safe.
 		</constant>
 		<constant name="HINTING_NONE" value="0" enum="Hinting">
@@ -1737,13 +1736,15 @@
 		<constant name="SPACING_BOTTOM" value="3" enum="SpacingType">
 			Spacing at the bottom of the line.
 		</constant>
-		<constant name="FONT_BOLD" value="1" enum="FontStyle">
+		<constant name="SPACING_MAX" value="4" enum="SpacingType">
+		</constant>
+		<constant name="FONT_BOLD" value="1" enum="FontStyle" is_bitfield="true">
 			Font is bold.
 		</constant>
-		<constant name="FONT_ITALIC" value="2" enum="FontStyle">
+		<constant name="FONT_ITALIC" value="2" enum="FontStyle" is_bitfield="true">
 			Font is italic or oblique.
 		</constant>
-		<constant name="FONT_FIXED_WIDTH" value="4" enum="FontStyle">
+		<constant name="FONT_FIXED_WIDTH" value="4" enum="FontStyle" is_bitfield="true">
 			Font have fixed-width characters.
 		</constant>
 		<constant name="STRUCTURED_TEXT_DEFAULT" value="0" enum="StructuredTextParser">
diff --git a/doc/classes/TextServerExtension.xml b/doc/classes/TextServerExtension.xml
index 2f7b31b663..4501ec744a 100644
--- a/doc/classes/TextServerExtension.xml
+++ b/doc/classes/TextServerExtension.xml
@@ -346,7 +346,7 @@
 			</description>
 		</method>
 		<method name="font_get_style" qualifiers="virtual const">
-			<return type="int" />
+			<return type="int" enum="TextServer.FontStyle" />
 			<argument index="0" name="font_rid" type="RID" />
 			<description>
 				Returns font style flags, see [enum TextServer.FontStyle].
@@ -782,7 +782,7 @@
 		<method name="font_set_style" qualifiers="virtual">
 			<return type="void" />
 			<argument index="0" name="font_rid" type="RID" />
-			<argument index="1" name="style" type="int" />
+			<argument index="1" name="style" type="int" enum="TextServer.FontStyle" />
 			<description>
 				Sets the font style flags, see [enum TextServer.FontStyle].
 			</description>
@@ -1074,7 +1074,7 @@
 			<return type="float" />
 			<argument index="0" name="shaped" type="RID" />
 			<argument index="1" name="width" type="float" />
-			<argument index="2" name="jst_flags" type="int" />
+			<argument index="2" name="jst_flags" type="int" enum="TextServer.JustificationFlag" />
 			<description>
 				Adjusts text with to fit to specified width, returns new text width.
 			</description>
@@ -1183,7 +1183,7 @@
 			<argument index="0" name="shaped" type="RID" />
 			<argument index="1" name="width" type="float" />
 			<argument index="2" name="start" type="int" />
-			<argument index="3" name="break_flags" type="int" />
+			<argument index="3" name="break_flags" type="int" enum="TextServer.LineBreakFlag" />
 			<description>
 				Breaks text to the lines and returns character ranges for each line.
 				[b]Note:[/b] If this method is not implemented in the plugin, the default implementation will be used.
@@ -1195,7 +1195,7 @@
 			<argument index="1" name="width" type="PackedFloat32Array" />
 			<argument index="2" name="start" type="int" />
 			<argument index="3" name="once" type="bool" />
-			<argument index="4" name="break_flags" type="int" />
+			<argument index="4" name="break_flags" type="int" enum="TextServer.LineBreakFlag" />
 			<description>
 				Breaks text to the lines and columns. Returns character ranges for each segment.
 				[b]Note:[/b] If this method is not implemented in the plugin, the default implementation will be used.
@@ -1308,7 +1308,7 @@
 		<method name="shaped_text_get_word_breaks" qualifiers="virtual const">
 			<return type="PackedInt32Array" />
 			<argument index="0" name="shaped" type="RID" />
-			<argument index="1" name="grapheme_flags" type="int" />
+			<argument index="1" name="grapheme_flags" type="int" enum="TextServer.GraphemeFlag" />
 			<description>
 				Breaks text into words and returns array of character ranges.
 				[b]Note:[/b] If this method is not implemented in the plugin, the default implementation will be used.
@@ -1352,7 +1352,7 @@
 			<return type="void" />
 			<argument index="0" name="shaped" type="RID" />
 			<argument index="1" name="width" type="float" />
-			<argument index="2" name="trim_flags" type="int" />
+			<argument index="2" name="trim_flags" type="int" enum="TextServer.TextOverrunFlag" />
 			<description>
 				Trims text if it exceeds the given width.
 			</description>