浏览代码

Merge pull request #56268 from KoBeWi/🚗complete_setters

Rémi Verschelde 3 年之前
父节点
当前提交
f0382530a7
共有 3 个文件被更改,包括 1 次插入6 次删除
  1. 0 3
      doc/classes/ProjectSettings.xml
  2. 0 1
      modules/gdscript/gdscript.cpp
  3. 1 2
      modules/gdscript/gdscript_editor.cpp

+ 0 - 3
doc/classes/ProjectSettings.xml

@@ -331,9 +331,6 @@
 		<member name="debug/file_logging/max_log_files" type="int" setter="" getter="" default="5">
 			Specifies the maximum amount of log files allowed (used for rotation).
 		</member>
-		<member name="debug/gdscript/completion/autocomplete_setters_and_getters" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], displays getters and setters in autocompletion results in the script editor. This setting is meant to be used when porting old projects (Godot 2), as using member variables is the preferred style from Godot 3 onwards.
-		</member>
 		<member name="debug/gdscript/warnings/assert_always_false" type="bool" setter="" getter="" default="true">
 		</member>
 		<member name="debug/gdscript/warnings/assert_always_true" type="bool" setter="" getter="" default="true">

+ 0 - 1
modules/gdscript/gdscript.cpp

@@ -2206,7 +2206,6 @@ GDScriptLanguage::GDScriptLanguage() {
 	GLOBAL_DEF("debug/gdscript/warnings/enable", true);
 	GLOBAL_DEF("debug/gdscript/warnings/treat_warnings_as_errors", false);
 	GLOBAL_DEF("debug/gdscript/warnings/exclude_addons", true);
-	GLOBAL_DEF("debug/gdscript/completion/autocomplete_setters_and_getters", false);
 	for (int i = 0; i < (int)GDScriptWarning::WARNING_MAX; i++) {
 		String warning = GDScriptWarning::get_name_from_code((GDScriptWarning::Code)i).to_lower();
 		bool default_enabled = !warning.begins_with("unsafe_");

+ 1 - 2
modules/gdscript/gdscript_editor.cpp

@@ -966,8 +966,7 @@ static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base
 
 				if (!_static || Engine::get_singleton()->has_singleton(type)) {
 					List<MethodInfo> methods;
-					bool is_autocompleting_getters = GLOBAL_GET("debug/gdscript/completion/autocomplete_setters_and_getters").booleanize();
-					ClassDB::get_method_list(type, &methods, false, !is_autocompleting_getters);
+					ClassDB::get_method_list(type, &methods, false, true);
 					for (const MethodInfo &E : methods) {
 						if (E.name.begins_with("_")) {
 							continue;