From 6fb391bc2366cf51780f5bb6eaa199d5b63b9ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 16 Jun 2023 08:45:35 +0200 Subject: [PATCH] Fix various typos with codespell And ignore some false positives introduced by recent versions of codespell. --- .github/workflows/static_checks.yml | 4 ++-- core/input/input.cpp | 2 +- doc/classes/NavigationServer2D.xml | 2 +- doc/classes/NavigationServer3D.xml | 2 +- main/main.cpp | 10 +++++----- misc/scripts/codespell.sh | 2 +- scene/2d/navigation_agent_2d.h | 2 +- scene/3d/navigation_agent_3d.h | 2 +- servers/navigation_server_2d.h | 2 +- servers/navigation_server_3d.h | 2 +- tests/scene/test_code_edit.h | 6 +++--- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/static_checks.yml b/.github/workflows/static_checks.yml index f35206ab57d..c6ec244b7d8 100644 --- a/.github/workflows/static_checks.yml +++ b/.github/workflows/static_checks.yml @@ -103,8 +103,8 @@ jobs: - name: Spell checks via codespell if: github.event_name == 'pull_request' && env.CHANGED_FILES != '' - uses: codespell-project/actions-codespell@v1 + uses: codespell-project/actions-codespell@v2 with: skip: "./bin,./thirdparty,*.desktop,*.gen.*,*.po,*.pot,*.rc,./AUTHORS.md,./COPYRIGHT.txt,./DONORS.md,./core/input/gamecontrollerdb.txt,./core/string/locales.h,./editor/project_converter_3_to_4.cpp,./misc/scripts/codespell.sh,./platform/android/java/lib/src/com,./platform/web/node_modules,./platform/web/package-lock.json" - ignore_words_list: "curvelinear,doubleclick,expct,findn,gird,hel,inout,lod,nd,numer,ot,te,vai" + ignore_words_list: "curvelinear,doubleclick,expct,findn,gird,hel,inout,lod,mis,nd,numer,ot,requestor,te,vai" path: ${{ env.CHANGED_FILES }} diff --git a/core/input/input.cpp b/core/input/input.cpp index b4945b41a87..cf8d71b9a74 100644 --- a/core/input/input.cpp +++ b/core/input/input.cpp @@ -1544,7 +1544,7 @@ Input::Input() { legacy_just_pressed_behavior = GLOBAL_DEF("input_devices/compatibility/legacy_just_pressed_behavior", false); if (Engine::get_singleton()->is_editor_hint()) { - // Always use standard behaviour in the editor. + // Always use standard behavior in the editor. legacy_just_pressed_behavior = false; } } diff --git a/doc/classes/NavigationServer2D.xml b/doc/classes/NavigationServer2D.xml index f46f2912b33..ee3fdda3d5a 100644 --- a/doc/classes/NavigationServer2D.xml +++ b/doc/classes/NavigationServer2D.xml @@ -156,7 +156,7 @@ - Sets [param velocity] as the new wanted velocity for the specified [param agent]. The avoidance simulation will try to fulfil this velocity if possible but will modify it to avoid collision with other agent's and obstacles. When an agent is teleported to a new position far away use [method agent_set_velocity_forced] instead to reset the internal velocity state. + Sets [param velocity] as the new wanted velocity for the specified [param agent]. The avoidance simulation will try to fulfill this velocity if possible but will modify it to avoid collision with other agent's and obstacles. When an agent is teleported to a new position far away use [method agent_set_velocity_forced] instead to reset the internal velocity state. diff --git a/doc/classes/NavigationServer3D.xml b/doc/classes/NavigationServer3D.xml index 4c759beac0b..1ecf425fd5f 100644 --- a/doc/classes/NavigationServer3D.xml +++ b/doc/classes/NavigationServer3D.xml @@ -181,7 +181,7 @@ - Sets [param velocity] as the new wanted velocity for the specified [param agent]. The avoidance simulation will try to fulfil this velocity if possible but will modify it to avoid collision with other agent's and obstacles. When an agent is teleported to a new position use [method agent_set_velocity_forced] as well to reset the internal simulation velocity. + Sets [param velocity] as the new wanted velocity for the specified [param agent]. The avoidance simulation will try to fulfill this velocity if possible but will modify it to avoid collision with other agent's and obstacles. When an agent is teleported to a new position use [method agent_set_velocity_forced] as well to reset the internal simulation velocity. diff --git a/main/main.cpp b/main/main.cpp index a9e2d357fa1..ed6a320e4c9 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1011,19 +1011,19 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph } else if (I->get() == "--delta-smoothing") { if (I->next()) { String string = I->next()->get(); - bool recognised = false; + bool recognized = false; if (string == "enable") { OS::get_singleton()->set_delta_smoothing(true); delta_smoothing_override = true; - recognised = true; + recognized = true; } if (string == "disable") { OS::get_singleton()->set_delta_smoothing(false); delta_smoothing_override = false; - recognised = true; + recognized = true; } - if (!recognised) { - OS::get_singleton()->print("Delta-smoothing argument not recognised, aborting.\n"); + if (!recognized) { + OS::get_singleton()->print("Delta-smoothing argument not recognized, aborting.\n"); goto error; } N = I->next()->next(); diff --git a/misc/scripts/codespell.sh b/misc/scripts/codespell.sh index d15b6593f73..a55a39bf99a 100755 --- a/misc/scripts/codespell.sh +++ b/misc/scripts/codespell.sh @@ -3,6 +3,6 @@ SKIP_LIST="./.*,./**/.*,./bin,./thirdparty,*.desktop,*.gen.*,*.po,*.pot,*.rc,./A SKIP_LIST+="./core/input/gamecontrollerdb.txt,./core/string/locales.h,./editor/renames_map_3_to_4.cpp,./misc/scripts/codespell.sh," SKIP_LIST+="./platform/android/java/lib/src/com,./platform/web/node_modules,./platform/web/package-lock.json," -IGNORE_LIST="curvelinear,doubleclick,expct,findn,gird,hel,inout,lod,nd,numer,ot,te,vai" +IGNORE_LIST="curvelinear,doubleclick,expct,findn,gird,hel,inout,lod,mis,nd,numer,ot,requestor,te,vai" codespell -w -q 3 -S "${SKIP_LIST}" -L "${IGNORE_LIST}" --builtin "clear,rare,en-GB_to_en-US" diff --git a/scene/2d/navigation_agent_2d.h b/scene/2d/navigation_agent_2d.h index ca43abf8331..358dac46d98 100644 --- a/scene/2d/navigation_agent_2d.h +++ b/scene/2d/navigation_agent_2d.h @@ -75,7 +75,7 @@ class NavigationAgent2D : public Node { Vector2 safe_velocity; /// The submitted target velocity, sets the "wanted" rvo agent velocity on the next update - // this velocity is not guaranteed, the simulation will try to fulfil it if possible + // this velocity is not guaranteed, the simulation will try to fulfill it if possible // if other agents or obstacles interfere it will be changed accordingly Vector2 velocity; bool velocity_submitted = false; diff --git a/scene/3d/navigation_agent_3d.h b/scene/3d/navigation_agent_3d.h index b74e816d43a..ea6657c4255 100644 --- a/scene/3d/navigation_agent_3d.h +++ b/scene/3d/navigation_agent_3d.h @@ -78,7 +78,7 @@ class NavigationAgent3D : public Node { Vector3 safe_velocity; /// The submitted target velocity, sets the "wanted" rvo agent velocity on the next update - // this velocity is not guaranteed, the simulation will try to fulfil it if possible + // this velocity is not guaranteed, the simulation will try to fulfill it if possible // if other agents or obstacles interfere it will be changed accordingly Vector3 velocity; bool velocity_submitted = false; diff --git a/servers/navigation_server_2d.h b/servers/navigation_server_2d.h index 36c964e2ea9..fa50772872e 100644 --- a/servers/navigation_server_2d.h +++ b/servers/navigation_server_2d.h @@ -222,7 +222,7 @@ public: virtual void agent_set_velocity_forced(RID p_agent, Vector2 p_velocity); /// The wanted velocity for the agent as a "suggestion" to the avoidance simulation. - /// The simulation will try to fulfil this velocity wish if possible but may change the velocity depending on other agent's and obstacles'. + /// The simulation will try to fulfill this velocity wish if possible but may change the velocity depending on other agent's and obstacles'. virtual void agent_set_velocity(RID p_agent, Vector2 p_velocity); /// Position of the agent in world space. diff --git a/servers/navigation_server_3d.h b/servers/navigation_server_3d.h index a524f0f595b..d74e72ed669 100644 --- a/servers/navigation_server_3d.h +++ b/servers/navigation_server_3d.h @@ -244,7 +244,7 @@ public: virtual void agent_set_velocity_forced(RID p_agent, Vector3 p_velocity) = 0; /// The wanted velocity for the agent as a "suggestion" to the avoidance simulation. - /// The simulation will try to fulfil this velocity wish if possible but may change the velocity depending on other agent's and obstacles'. + /// The simulation will try to fulfill this velocity wish if possible but may change the velocity depending on other agent's and obstacles'. virtual void agent_set_velocity(RID p_agent, Vector3 p_velocity) = 0; /// Position of the agent in world space. diff --git a/tests/scene/test_code_edit.h b/tests/scene/test_code_edit.h index c8ce49f3188..d6858fbcb41 100644 --- a/tests/scene/test_code_edit.h +++ b/tests/scene/test_code_edit.h @@ -3496,7 +3496,7 @@ TEST_CASE("[SceneTree][CodeEdit] completion") { code_edit->confirm_code_completion(); CHECK(code_edit->get_line(0) == "test"); - /* Favorize good capitalisation. */ + /* Favorize good capitalization. */ code_edit->clear(); code_edit->insert_text_at_caret("te"); code_edit->set_caret_column(2); @@ -3506,7 +3506,7 @@ TEST_CASE("[SceneTree][CodeEdit] completion") { code_edit->confirm_code_completion(); CHECK(code_edit->get_line(0) == "test"); - /* Favorize location to good capitalisation. */ + /* Favorize location to good capitalization. */ code_edit->clear(); code_edit->insert_text_at_caret("te"); code_edit->set_caret_column(2); @@ -3526,7 +3526,7 @@ TEST_CASE("[SceneTree][CodeEdit] completion") { code_edit->confirm_code_completion(); CHECK(code_edit->get_line(0) == "stest"); - /* Favorize good capitalisation to closest to start. */ + /* Favorize good capitalization to closest to start. */ code_edit->clear(); code_edit->insert_text_at_caret("te"); code_edit->set_caret_column(2);