Fix function refactor

Author: adamscott

modules/gdscript/gdscript_parser.cpp

@@ -1802,7 +1802,6 @@ GDScriptParser::FunctionNode *GDScriptParser::parse_function(bool p_is_static) {
 	function->is_static = p_is_static;
 
 	make_completion_context(COMPLETION_OVERRIDE_METHOD, function);
-	refactor_rename_register(REFACTOR_RENAME_TYPE_METHOD, function);
 
 #ifdef TOOLS_ENABLED
 	// The signature is something like `(a: int, b: int = 0) -> void`.
@@ -1819,6 +1818,7 @@ GDScriptParser::FunctionNode *GDScriptParser::parse_function(bool p_is_static) {
 	current_function = function;
 
 	function->identifier = parse_identifier();
+	refactor_rename_register(REFACTOR_RENAME_TYPE_IDENTIFIER, function->identifier);
 
 	SuiteNode *body = alloc_node<SuiteNode>();
 
@@ -1852,6 +1852,9 @@ GDScriptParser::FunctionNode *GDScriptParser::parse_function(bool p_is_static) {
 
 	current_function = previous_function;
 	complete_extents(function);
+
+	refactor_rename_register(REFACTOR_RENAME_TYPE_DECLARATION, function);
+
 	return function;
 }
 

modules/gdscript/gdscript_tokenizer.h

@@ -488,6 +488,34 @@ class GDScriptTokenizer {
 
 		CodeArea get_code_area() const { return CodeArea(start_line, start_column, end_line, end_column); }
 
+		constexpr bool operator==(const Token &p_right) {
+			if (type != p_right.type) {
+				return false;
+			}
+			if (literal != p_right.literal) {
+				return false;
+			}
+			if (start_line != p_right.start_line || start_column != p_right.start_column) {
+				return false;
+			}
+			if (end_line != p_right.end_line || end_column != p_right.end_column) {
+				return false;
+			}
+			if (cursor_position != p_right.cursor_position) {
+				return false;
+			}
+			if (cursor_place != p_right.cursor_place) {
+				return false;
+			}
+			if (source != p_right.source) {
+				return false;
+			}
+			return true;
+		}
+		constexpr bool operator!=(const Token &p_right) {
+			return !operator==(p_right);
+		}
+
 		Token(Type p_type) {
 			type = p_type;
 		}

modules/gdscript/tests/scripts/refactor/rename/tests/keyword/rename_func.cfg

@@ -2,7 +2,7 @@
 [input]
 refactor={
 	"file": "res://scripts/class_a.gd",
-	"line": 33,
+	"line": 35,
 	"column": 1,
 	"symbol": "func",
 }