Remove literal as refactor context

Author: adamscott

modules/gdscript/gdscript_editor.cpp

@@ -4795,10 +4795,6 @@ ::Error GDScriptLanguage::refactor_rename_symbol_code(const String &p_code, cons
 	bool is_function = false;
 
 	switch (context.type) {
-		case GDScriptParser::REFACTOR_RENAME_TYPE_LITERAL: {
-			REFACTOR_RENAME_OUTSIDE_GDSCRIPT(REFACTOR_RENAME_SYMBOL_RESULT_LITERAL);
-			REFACTOR_RENAME_RETURN(OK);
-		} break;
 		case GDScriptParser::REFACTOR_RENAME_TYPE_BUILT_IN_TYPE_CONSTANT_OR_STATIC_METHOD: {
 			REFACTOR_RENAME_OUTSIDE_GDSCRIPT(REFACTOR_RENAME_SYMBOL_RESULT_CLASS_CONSTANT);
 			REFACTOR_RENAME_RETURN(OK);

modules/gdscript/gdscript_parser.cpp

@@ -443,23 +443,26 @@ bool GDScriptParser::refactor_rename_register(GDScriptParser::RefactorRenameType
 	context.current_line = tokenizer->get_cursor_line();
 	context.parser = this;
 	context.node = p_node;
-	context.identifier = nullptr;
+	context.value = nullptr;
 	if (previous.has_cursor()) {
 		context.token = previous;
 	}
 	refactor_rename_context = context;
 	return true;
 }
 
-bool GDScriptParser::refactor_rename_register_identifier(GDScriptParser::IdentifierNode *p_identifier) {
+bool GDScriptParser::refactor_rename_register_value(GDScriptParser::Node *p_value_node) {
 	if (!is_for_refactor_rename()) {
 		return false;
 	}
 	if (!previous.has_cursor()) {
 		return false;
 	}
 	ERR_FAIL_NULL_V(refactor_rename_context.node, false);
-	refactor_rename_context.identifier = p_identifier;
+	refactor_rename_context.value = p_value_node;
+	if (previous.has_cursor()) {
+		refactor_rename_context.token = previous;
+	}
 	return true;
 }
 
@@ -2855,7 +2858,7 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_identifier(ExpressionNode
 		ERR_FAIL_V_MSG(nullptr, "Parser bug: parsing identifier node without identifier token.");
 	}
 	IdentifierNode *identifier = alloc_node<IdentifierNode>();
-	refactor_rename_register_identifier(identifier);
+	refactor_rename_register_value(identifier);
 	complete_extents(identifier);
 
 	identifier->name = previous.get_identifier();
@@ -2913,7 +2916,7 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_literal(ExpressionNode *p_
 	}
 
 	LiteralNode *literal = alloc_node<LiteralNode>();
-	refactor_rename_register(REFACTOR_RENAME_TYPE_LITERAL, literal);
+	refactor_rename_register_value(literal);
 	literal->value = previous.literal;
 	reset_extents(literal, p_previous_operand);
 	update_extents(literal);
@@ -3268,13 +3271,14 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_assignment(ExpressionNode
 
 GDScriptParser::ExpressionNode *GDScriptParser::parse_await(ExpressionNode *p_previous_operand, bool p_can_assign) {
 	AwaitNode *await = alloc_node<AwaitNode>();
-	// TODO: refactor take token into account.
+	refactor_rename_register(REFACTOR_RENAME_TYPE_KEYWORD, await);
 	ExpressionNode *element = parse_precedence(PREC_AWAIT, false);
 	if (element == nullptr) {
 		push_error(R"(Expected signal or coroutine after "await".)");
 	}
 	await->to_await = element;
 	complete_extents(await);
+	refactor_rename_register(REFACTOR_RENAME_TYPE_KEYWORD, await);
 
 	if (current_function) { // Might be null in a getter or setter.
 		current_function->is_coroutine = true;

modules/gdscript/gdscript_parser.h

@@ -1795,12 +1795,11 @@ class GDScriptParser {
 		REFACTOR_RENAME_TYPE_TYPE_ATTRIBUTE, // Attribute in type name (Type.|).
 		REFACTOR_RENAME_TYPE_TYPE_NAME, // Name of type (after :).
 		REFACTOR_RENAME_TYPE_TYPE_NAME_OR_VOID, // Same as TYPE_NAME, but allows void (in function return type).
-		REFACTOR_RENAME_TYPE_LITERAL, // Declared literal (e.g. variable name).
 	};
 
 	struct RefactorRenameContext : ParsingContext {
 		RefactorRenameType type = REFACTOR_RENAME_TYPE_NONE;
-		GDScriptParser::IdentifierNode *identifier = nullptr;
+		GDScriptParser::Node *value = nullptr;
 		GDScriptTokenizer::Token token;
 	};
 
@@ -1986,7 +1985,7 @@ class GDScriptParser {
 	bool refactor_rename_was_cursor_just_parsed() const;
 	bool refactor_rename_is_node_more_specific(const GDScriptParser::Node *p_node) const;
 	bool refactor_rename_register(GDScriptParser::RefactorRenameType p_type, GDScriptParser::Node *p_node);
-	bool refactor_rename_register_identifier(GDScriptParser::IdentifierNode *p_node);
+	bool refactor_rename_register_value(GDScriptParser::Node *p_node);
 
 	GDScriptTokenizer::Token advance();
 	bool match(GDScriptTokenizer::Token::Type p_token_type);