CI: Fix support for latest codespell
(cherry picked from commit 7132627666
)
This commit is contained in:
parent
eb296c7f9c
commit
488757bd00
|
@ -106,5 +106,5 @@ jobs:
|
||||||
uses: codespell-project/actions-codespell@v2
|
uses: codespell-project/actions-codespell@v2
|
||||||
with:
|
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"
|
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 }}
|
path: ${{ env.CHANGED_FILES }}
|
||||||
|
|
|
@ -819,7 +819,7 @@ Error ProjectSettings::_save_settings_binary(const String &p_file, const RBMap<S
|
||||||
|
|
||||||
if (!p_custom_features.is_empty()) {
|
if (!p_custom_features.is_empty()) {
|
||||||
file->store_32(count + 1);
|
file->store_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;
|
String key = CoreStringNames::get_singleton()->_custom_features;
|
||||||
file->store_pascal_string(key);
|
file->store_pascal_string(key);
|
||||||
|
|
||||||
|
|
|
@ -2090,7 +2090,7 @@ RID RenderingDeviceVulkan::texture_create_shared(const TextureView &p_view, RID
|
||||||
|
|
||||||
VkImageViewUsageCreateInfo usage_info;
|
VkImageViewUsageCreateInfo usage_info;
|
||||||
if (context->is_device_extension_enabled(VK_KHR_MAINTENANCE_2_EXTENSION_NAME)) {
|
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..
|
// if we require setting this information. Vulkan 1.0 may simply not care..
|
||||||
|
|
||||||
usage_info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO;
|
usage_info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO;
|
||||||
|
|
|
@ -6268,7 +6268,7 @@ bool AnimationTrackEditor::is_grouping_tracks() {
|
||||||
|
|
||||||
void AnimationTrackEditor::_selection_changed() {
|
void AnimationTrackEditor::_selection_changed() {
|
||||||
if (selected_filter->is_pressed()) {
|
if (selected_filter->is_pressed()) {
|
||||||
_update_tracks(); // Needs updatin.
|
_update_tracks(); // Needs updating.
|
||||||
} else {
|
} else {
|
||||||
_redraw_tracks();
|
_redraw_tracks();
|
||||||
_redraw_groups();
|
_redraw_groups();
|
||||||
|
|
|
@ -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+="./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,"
|
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"
|
codespell -w -q 3 -S "${SKIP_LIST}" -L "${IGNORE_LIST}" --builtin "clear,rare,en-GB_to_en-US"
|
||||||
|
|
|
@ -311,7 +311,7 @@ bool OpenXRAPI::create_instance() {
|
||||||
for (auto &requested_extension : requested_extensions) {
|
for (auto &requested_extension : requested_extensions) {
|
||||||
if (!is_extension_supported(requested_extension.key)) {
|
if (!is_extension_supported(requested_extension.key)) {
|
||||||
if (requested_extension.value == nullptr) {
|
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!"));
|
ERR_FAIL_V_MSG(false, String("OpenXR: OpenXR Runtime does not support ") + requested_extension.key + String(" extension!"));
|
||||||
} else {
|
} else {
|
||||||
// set this extension as not supported
|
// set this extension as not supported
|
||||||
|
|
|
@ -99,8 +99,8 @@ def make_icu_data(target, source, env):
|
||||||
|
|
||||||
|
|
||||||
def write_macos_plist(target, binary_name, identifier, name):
|
def write_macos_plist(target, binary_name, identifier, name):
|
||||||
os.makedirs(f"{target}/Resourece/", exist_ok=True)
|
os.makedirs(f"{target}/Resource/", exist_ok=True)
|
||||||
f = open(f"{target}/Resourece/Info.plist", "w")
|
f = open(f"{target}/Resource/Info.plist", "w")
|
||||||
|
|
||||||
f.write(f'<?xml version="1.0" encoding="UTF-8"?>\n')
|
f.write(f'<?xml version="1.0" encoding="UTF-8"?>\n')
|
||||||
f.write(f'<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n')
|
f.write(f'<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n')
|
||||||
|
|
|
@ -99,8 +99,8 @@ def make_icu_data(target, source, env):
|
||||||
|
|
||||||
|
|
||||||
def write_macos_plist(target, binary_name, identifier, name):
|
def write_macos_plist(target, binary_name, identifier, name):
|
||||||
os.makedirs(f"{target}/Resourece/", exist_ok=True)
|
os.makedirs(f"{target}/Resource/", exist_ok=True)
|
||||||
f = open(f"{target}/Resourece/Info.plist", "w")
|
f = open(f"{target}/Resource/Info.plist", "w")
|
||||||
|
|
||||||
f.write(f'<?xml version="1.0" encoding="UTF-8"?>\n')
|
f.write(f'<?xml version="1.0" encoding="UTF-8"?>\n')
|
||||||
f.write(f'<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n')
|
f.write(f'<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n')
|
||||||
|
|
|
@ -2027,7 +2027,7 @@ void DisplayServerMacOS::warp_mouse(const Point2i &p_position) {
|
||||||
NSRect pointInWindowRect = NSMakeRect(p_position.x / scale, contentRect.size.height - (p_position.y / scale), scale, scale);
|
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;
|
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 };
|
CGPoint lMouseWarpPos = { pointOnScreen.x, CGDisplayBounds(CGMainDisplayID()).size.height - pointOnScreen.y };
|
||||||
|
|
||||||
// Do the warping.
|
// Do the warping.
|
||||||
|
|
|
@ -137,7 +137,7 @@ const GodotInputGamepads = {
|
||||||
const id = pad.id;
|
const id = pad.id;
|
||||||
// Chrom* style: NAME (Vendor: xxxx Product: xxxx)
|
// Chrom* style: NAME (Vendor: xxxx Product: xxxx)
|
||||||
const exp1 = /vendor: ([0-9a-f]{4}) product: ([0-9a-f]{4})/i;
|
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;
|
const exp2 = /^([0-9a-f]+)-([0-9a-f]+)-/i;
|
||||||
let vendor = '';
|
let vendor = '';
|
||||||
let product = '';
|
let product = '';
|
||||||
|
|
Loading…
Reference in New Issue