@@ -102,38 +102,42 @@ func _populate_menu(show_uninstall: bool = true) -> void:
102102 popup_menu .add_item (MENU_ITEMS ["format_script" ], current_item_index )
103103 popup_menu .set_item_metadata (current_item_index , "format_script" )
104104 popup_menu .set_item_tooltip (current_item_index , "Run the GDScript Formatter over the current script" )
105- current_item_index += 1
106105
106+ current_item_index += 1
107107 popup_menu .add_item (MENU_ITEMS ["lint_script" ], current_item_index )
108108 popup_menu .set_item_metadata (current_item_index , "lint_script" )
109109 popup_menu .set_item_tooltip (current_item_index , "Check the current script for linting issues" )
110- current_item_index += 1
111110
111+ current_item_index += 1
112112 popup_menu .add_item (MENU_ITEMS ["reorder_code" ], current_item_index )
113113 popup_menu .set_item_metadata (current_item_index , "reorder_code" )
114114 popup_menu .set_item_tooltip (current_item_index , "Reorder the code elements in the current script according to the GDScript Style Guide" )
115- current_item_index += 1
116115
117116 popup_menu .add_separator ()
118117
118+ # NOTE: When we add separators, it bumps the internal index of menu items.
119+ # That's why we have to increase it even on separators. Otherwise the
120+ # tooltip will lose sync.
121+ current_item_index += 2
119122 popup_menu .add_item (MENU_ITEMS ["install_update" ], current_item_index )
120123 popup_menu .set_item_metadata (current_item_index , "install_update" )
121124 popup_menu .set_item_tooltip (current_item_index , "Download the latest version of the GDScript Formatter" )
122- current_item_index += 1
123125
124126 if show_uninstall :
127+ current_item_index += 1
125128 popup_menu .add_item (MENU_ITEMS ["uninstall" ], current_item_index )
126129 popup_menu .set_item_metadata (current_item_index , "uninstall" )
127130 popup_menu .set_item_tooltip (current_item_index , "Remove the GDScript Formatter installed through this add-on from your computer" )
128- current_item_index += 1
129131
130132 popup_menu .add_separator ()
131133
134+ # Bumped index by 1 extra step because of the previous separator.
135+ current_item_index += 2
132136 popup_menu .add_item (MENU_ITEMS ["report_issue" ], current_item_index )
133137 popup_menu .set_item_metadata (current_item_index , "report_issue" )
134138 popup_menu .set_item_tooltip (current_item_index , "Tell us about problems or bugs you found" )
135- current_item_index += 1
136139
140+ current_item_index += 1
137141 popup_menu .add_item (MENU_ITEMS ["help" ], current_item_index )
138142 popup_menu .set_item_metadata (current_item_index , "help" )
139143 popup_menu .set_item_tooltip (current_item_index , "Learn how to use the GDScript Formatter" )
0 commit comments