From 7615f06284695efda8c3fcd0694590bb619d3201 Mon Sep 17 00:00:00 2001 From: arch Date: Sun, 23 Aug 2026 10:28:24 +0300 Subject: [PATCH 1/2] Remove duplicated words in code comments --- core/io/resource_loader.cpp | 2 +- servers/rendering/rendering_device_graph.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index bcb653c4413f..0333cb35f2e2 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -462,7 +462,7 @@ void ResourceLoader::_run_load_task(void *p_userdata) { if (should_yield) { // We need to make sure we yield on our actual current task. If we are - // waiting we are certainly not the the task being ran. + // waiting we are certainly not the task being ran. yielders.push_back(WorkerThreadPool::get_singleton()->get_caller_task_id()); } diff --git a/servers/rendering/rendering_device_graph.cpp b/servers/rendering/rendering_device_graph.cpp index ae6a1e1b7476..570bcae7446f 100644 --- a/servers/rendering/rendering_device_graph.cpp +++ b/servers/rendering/rendering_device_graph.cpp @@ -337,7 +337,7 @@ void RenderingDeviceGraph::_check_discardable_attachment_dependency(ResourceTrac return; } - // Check if the command is a a draw list that clears the attachment completely. If it is, we don't need to modify the previous draw list. + // Check if the command is a draw list that clears the attachment completely. If it is, we don't need to modify the previous draw list. uint32_t command_offset = command_data_offsets[p_command_index]; RecordedDrawListCommand *draw_list_command = reinterpret_cast(&command_data[command_offset]); if (draw_list_command->type == RecordedCommand::TYPE_DRAW_LIST) { From f6a8468d69c1d347be72672ffa8b3295ae39f3bb Mon Sep 17 00:00:00 2001 From: arch Date: Sun, 23 Aug 2026 10:31:13 +0300 Subject: [PATCH 2/2] Rename occured -> occurred in ScriptEditorNavigationMarker methods --- editor/script/script_editor_navigation_marker.cpp | 4 ++-- editor/script/script_editor_navigation_marker.h | 4 ++-- editor/script/script_text_editor.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/editor/script/script_editor_navigation_marker.cpp b/editor/script/script_editor_navigation_marker.cpp index 292ea767fcc5..df6def0fc592 100644 --- a/editor/script/script_editor_navigation_marker.cpp +++ b/editor/script/script_editor_navigation_marker.cpp @@ -88,7 +88,7 @@ bool ScriptEditorNavigationMarker::is_traversing() const { return traverse_in_progress; } -bool ScriptEditorNavigationMarker::is_locate_just_occured() const { +bool ScriptEditorNavigationMarker::is_locate_just_occurred() const { if (Engine::get_singleton()->is_in_physics_frame()) { return locate_end_physics_frame == Engine::get_singleton()->get_physics_frames() || locate_end_physics_frame == Engine::get_singleton()->get_physics_frames() - 1; } else { @@ -96,7 +96,7 @@ bool ScriptEditorNavigationMarker::is_locate_just_occured() const { } } -bool ScriptEditorNavigationMarker::is_traverse_just_occured() const { +bool ScriptEditorNavigationMarker::is_traverse_just_occurred() const { if (Engine::get_singleton()->is_in_physics_frame()) { return traverse_end_physics_frame == Engine::get_singleton()->get_physics_frames() || traverse_end_physics_frame == Engine::get_singleton()->get_physics_frames() - 1; } else { diff --git a/editor/script/script_editor_navigation_marker.h b/editor/script/script_editor_navigation_marker.h index dab689d27218..e02e8154e433 100644 --- a/editor/script/script_editor_navigation_marker.h +++ b/editor/script/script_editor_navigation_marker.h @@ -61,6 +61,6 @@ class ScriptEditorNavigationMarker { bool is_locating() const; bool is_traversing() const; - bool is_locate_just_occured() const; - bool is_traverse_just_occured() const; + bool is_locate_just_occurred() const; + bool is_traverse_just_occurred() const; }; diff --git a/editor/script/script_text_editor.cpp b/editor/script/script_text_editor.cpp index 420f58836ffd..61d1114d3668 100644 --- a/editor/script/script_text_editor.cpp +++ b/editor/script/script_text_editor.cpp @@ -1215,7 +1215,7 @@ void ScriptTextEditor::_breakpoint_toggled(int p_row) { } void ScriptTextEditor::_on_caret_moved() { - if (ScriptEditorNavigationMarker::get_singleton()->is_locate_just_occured() || ScriptEditorNavigationMarker::get_singleton()->is_traverse_just_occured() || ScriptEditorNavigationMarker::get_singleton()->is_locating() || ScriptEditorNavigationMarker::get_singleton()->is_traversing()) { + if (ScriptEditorNavigationMarker::get_singleton()->is_locate_just_occurred() || ScriptEditorNavigationMarker::get_singleton()->is_traverse_just_occurred() || ScriptEditorNavigationMarker::get_singleton()->is_locating() || ScriptEditorNavigationMarker::get_singleton()->is_traversing()) { return; } if (code_editor->is_previewing_navigation_change()) {