From 488757bd00fc2ede59a4f80e5d5543cbf44b1aad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 5 Jul 2024 13:24:57 +0200 Subject: [PATCH] CI: Fix support for latest codespell (cherry picked from commit 7132627666fefdf29d9f39c611844a62ab2c4559) --- .github/workflows/static_checks.yml | 2 +- core/config/project_settings.cpp | 2 +- drivers/vulkan/rendering_device_vulkan.cpp | 2 +- editor/animation_track_editor.cpp | 2 +- misc/scripts/codespell.sh | 2 +- modules/openxr/openxr_api.cpp | 2 +- modules/text_server_adv/gdextension_build/methods.py | 4 ++-- modules/text_server_fb/gdextension_build/methods.py | 4 ++-- platform/macos/display_server_macos.mm | 2 +- platform/web/js/libs/library_godot_input.js | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/static_checks.yml b/.github/workflows/static_checks.yml index 909f9ed36a3..82fc75cca0d 100644 --- a/.github/workflows/static_checks.yml +++ b/.github/workflows/static_checks.yml @@ -106,5 +106,5 @@ jobs: 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,mis,nd,numer,ot,requestor,te,vai" + ignore_words_list: "breaked,checkin,curvelinear,doubleclick,expct,findn,gird,hel,inout,labelin,lod,mis,nd,numer,ot,pointin,requestor,te,textin,thirdparty,vai" path: ${{ env.CHANGED_FILES }} diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp index 715ed617703..fb4904a3ac0 100644 --- a/core/config/project_settings.cpp +++ b/core/config/project_settings.cpp @@ -819,7 +819,7 @@ Error ProjectSettings::_save_settings_binary(const String &p_file, const RBMapstore_32(count + 1); - //store how many properties are saved, add one for custom featuers, which must always go first + // Store how many properties are saved, add one for custom features, which must always go first. String key = CoreStringNames::get_singleton()->_custom_features; file->store_pascal_string(key); diff --git a/drivers/vulkan/rendering_device_vulkan.cpp b/drivers/vulkan/rendering_device_vulkan.cpp index c4694541b2f..0629adcd2da 100644 --- a/drivers/vulkan/rendering_device_vulkan.cpp +++ b/drivers/vulkan/rendering_device_vulkan.cpp @@ -2090,7 +2090,7 @@ RID RenderingDeviceVulkan::texture_create_shared(const TextureView &p_view, RID VkImageViewUsageCreateInfo usage_info; if (context->is_device_extension_enabled(VK_KHR_MAINTENANCE_2_EXTENSION_NAME)) { - // May need to make VK_KHR_maintenance2 manditory and thus has Vulkan 1.1 be our minimum supported version + // May need to make VK_KHR_maintenance2 mandatory and thus has Vulkan 1.1 be our minimum supported version // if we require setting this information. Vulkan 1.0 may simply not care.. usage_info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO; diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index 369330dd16c..3e74c6e711b 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation_track_editor.cpp @@ -6268,7 +6268,7 @@ bool AnimationTrackEditor::is_grouping_tracks() { void AnimationTrackEditor::_selection_changed() { if (selected_filter->is_pressed()) { - _update_tracks(); // Needs updatin. + _update_tracks(); // Needs updating. } else { _redraw_tracks(); _redraw_groups(); diff --git a/misc/scripts/codespell.sh b/misc/scripts/codespell.sh index a55a39bf99a..be6087172c1 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,mis,nd,numer,ot,requestor,te,vai" +IGNORE_LIST="breaked,checkin,curvelinear,doubleclick,expct,findn,gird,hel,inout,labelin,lod,mis,nd,numer,ot,outin,pointin,requestor,te,textin,thirdparty,vai" codespell -w -q 3 -S "${SKIP_LIST}" -L "${IGNORE_LIST}" --builtin "clear,rare,en-GB_to_en-US" diff --git a/modules/openxr/openxr_api.cpp b/modules/openxr/openxr_api.cpp index eb9e31cff7a..48fff8de39a 100644 --- a/modules/openxr/openxr_api.cpp +++ b/modules/openxr/openxr_api.cpp @@ -311,7 +311,7 @@ bool OpenXRAPI::create_instance() { for (auto &requested_extension : requested_extensions) { if (!is_extension_supported(requested_extension.key)) { if (requested_extension.value == nullptr) { - // nullptr means this is a manditory extension so we fail + // nullptr means this is a mandatory extension so we fail ERR_FAIL_V_MSG(false, String("OpenXR: OpenXR Runtime does not support ") + requested_extension.key + String(" extension!")); } else { // set this extension as not supported diff --git a/modules/text_server_adv/gdextension_build/methods.py b/modules/text_server_adv/gdextension_build/methods.py index 3c5229462c7..e58bc3abecb 100644 --- a/modules/text_server_adv/gdextension_build/methods.py +++ b/modules/text_server_adv/gdextension_build/methods.py @@ -99,8 +99,8 @@ def make_icu_data(target, source, env): def write_macos_plist(target, binary_name, identifier, name): - os.makedirs(f"{target}/Resourece/", exist_ok=True) - f = open(f"{target}/Resourece/Info.plist", "w") + os.makedirs(f"{target}/Resource/", exist_ok=True) + f = open(f"{target}/Resource/Info.plist", "w") f.write(f'\n') f.write(f'\n') diff --git a/modules/text_server_fb/gdextension_build/methods.py b/modules/text_server_fb/gdextension_build/methods.py index 3c5229462c7..e58bc3abecb 100644 --- a/modules/text_server_fb/gdextension_build/methods.py +++ b/modules/text_server_fb/gdextension_build/methods.py @@ -99,8 +99,8 @@ def make_icu_data(target, source, env): def write_macos_plist(target, binary_name, identifier, name): - os.makedirs(f"{target}/Resourece/", exist_ok=True) - f = open(f"{target}/Resourece/Info.plist", "w") + os.makedirs(f"{target}/Resource/", exist_ok=True) + f = open(f"{target}/Resource/Info.plist", "w") f.write(f'\n') f.write(f'\n') diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm index bf7799127b7..3f47664c320 100644 --- a/platform/macos/display_server_macos.mm +++ b/platform/macos/display_server_macos.mm @@ -2027,7 +2027,7 @@ NSRect pointInWindowRect = NSMakeRect(p_position.x / scale, contentRect.size.height - (p_position.y / scale), scale, scale); NSPoint pointOnScreen = [[wd.window_view window] convertRectToScreen:pointInWindowRect].origin; - // Point in scren coords. + // Point in screen coords. CGPoint lMouseWarpPos = { pointOnScreen.x, CGDisplayBounds(CGMainDisplayID()).size.height - pointOnScreen.y }; // Do the warping. diff --git a/platform/web/js/libs/library_godot_input.js b/platform/web/js/libs/library_godot_input.js index 1b221e78b37..4d1605aa074 100644 --- a/platform/web/js/libs/library_godot_input.js +++ b/platform/web/js/libs/library_godot_input.js @@ -137,7 +137,7 @@ const GodotInputGamepads = { const id = pad.id; // Chrom* style: NAME (Vendor: xxxx Product: xxxx) const exp1 = /vendor: ([0-9a-f]{4}) product: ([0-9a-f]{4})/i; - // Firefox/Safari style (safari may remove leading zeores) + // Firefox/Safari style (safari may remove leading zeroes) const exp2 = /^([0-9a-f]+)-([0-9a-f]+)-/i; let vendor = ''; let product = '';