ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

enable some string BannedApis

Browse source
This commit is contained in:
goat 2024-07-11 00:20:00 +02:00
parent 577f17eb1b
commit 2cbb8b9e22
9 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Dalamud/Interface/FontAwesome/FontAwesomeHelpers.cs
View file

@ -73,9 +73,9 @@ public static class FontAwesomeHelpers
{
foreach (var icon in icons)
{
var name = Enum.GetName(icon)?.ToLower();
var name = Enum.GetName(icon)?.ToLowerInvariant();
var searchTerms = icon.GetSearchTerms();
if (name!.Contains(search.ToLower()) || searchTerms.Contains(search.ToLower()))
if (name!.Contains(search.ToLowerInvariant()) || searchTerms.Contains(search.ToLowerInvariant()))
{
result.Add(icon);
}
@ -102,10 +102,10 @@ public static class FontAwesomeHelpers
// search by both terms and category
foreach (var icon in icons)
{
var name = Enum.GetName(icon)?.ToLower();
var name = Enum.GetName(icon)?.ToLowerInvariant();
var searchTerms = icon.GetSearchTerms();
var categories = icon.GetCategories();
if ((name!.Contains(search.ToLower()) || searchTerms.Contains(search.ToLower())) && categories.Contains(category))
if ((name!.Contains(search.ToLowerInvariant()) || searchTerms.Contains(search.ToLowerInvariant())) && categories.Contains(category))
{
result.Add(icon);
}

2
Dalamud/Interface/ImGuiFileDialog/FileDialog.Filters.cs
View file

@ -89,7 +89,7 @@ public partial class FileDialog
foreach (var file in this.files)
{
var show = true;
if (!string.IsNullOrEmpty(this.searchBuffer) && !file.FileName.ToLower().Contains(this.searchBuffer.ToLower()))
if (!string.IsNullOrEmpty(this.searchBuffer) && !file.FileName.ToLowerInvariant().Contains(this.searchBuffer.ToLowerInvariant()))
{
show = false;
}

2
Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs
View file

@ -132,7 +132,7 @@ public partial class FileDialog
AddToIconMap(new[] { "csv" }, FontAwesomeIcon.FileCsv, miscTextColor);
}
return iconMap.TryGetValue(ext.ToLower(), out var icon) ? icon : new IconColorItem
return iconMap.TryGetValue(ext.ToLowerInvariant(), out var icon) ? icon : new IconColorItem
{
Icon = FontAwesomeIcon.File,
Color = standardTextColor,

6
Dalamud/Interface/Internal/DalamudCommands.cs
View file

@ -350,10 +350,10 @@ internal class DalamudCommands : IServiceType
var configuration = Service<DalamudConfiguration>.Get();
var localization = Service<Localization>.Get();
if (Localization.ApplicableLangCodes.Contains(arguments.ToLower()) || arguments.ToLower() == "en")
if (Localization.ApplicableLangCodes.Contains(arguments.ToLowerInvariant()) || arguments.ToLowerInvariant() == "en")
{
localization.SetupWithLangCode(arguments.ToLower());
configuration.LanguageOverride = arguments.ToLower();
localization.SetupWithLangCode(arguments.ToLowerInvariant());
configuration.LanguageOverride = arguments.ToLowerInvariant();
chatGui.Print(string.Format(Loc.Localize("DalamudLanguageSetTo", "Language set to {0}"), arguments));
}

2
Dalamud/Interface/Internal/UiDebug.cs
View file

@ -475,7 +475,7 @@ internal unsafe class UiDebug
var name = unitBase->NameString;
if (searching)
{
if (name == null || !name.ToLower().Contains(searchStr.ToLower())) continue;
if (name == null || !name.ToLowerInvariant().Contains(searchStr.ToLowerInvariant())) continue;
}
noResults = false;

2
Dalamud/Interface/Internal/Windows/Settings/SettingsWindow.cs
View file

@ -179,7 +179,7 @@ internal class SettingsWindow : Window
foreach (var settingsTab in this.tabs.Where(x => x.IsVisible))
{
var eligible = settingsTab.Entries.Where(x => !x.Name.IsNullOrEmpty() && x.Name.ToLower().Contains(this.searchInput.ToLower())).ToArray();
var eligible = settingsTab.Entries.Where(x => !x.Name.IsNullOrEmpty() && x.Name.ToLowerInvariant().Contains(this.searchInput.ToLowerInvariant())).ToArray();
if (!eligible.Any())
continue;

2
Dalamud/Localization.cs
View file

@ -138,7 +138,7 @@ public class Localization : IServiceType
/// <param name="langCode">The language code to set up the UI language with.</param>
public void SetupWithLangCode(string langCode)
{
if (langCode.ToLower() == FallbackLangCode)
if (langCode.Equals(FallbackLangCode, StringComparison.InvariantCultureIgnoreCase))
{
this.SetupWithFallbacks();
return;

2
Directory.Build.props
View file

@ -1,10 +1,10 @@
<!-- Code analysis settings for all Dalamud projects. -->
<Project>
<!--
<ItemGroup Label="Code Analysis">
<PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" PrivateAssets="All" />
<AdditionalFiles Include="$(MSBuildThisFileDirectory)tools\BannedSymbols.txt" />
</ItemGroup>
<!--
<PropertyGroup Label="Code Analysis">
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)tools\dalamud.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

14
tools/BannedSymbols.txt
View file

@ -1,11 +1,11 @@
M:System.Object.Equals(System.Object,System.Object)~System.Boolean;Don't use object.Equals. Use IEquatable<T> or EqualityComparer<T>.Default instead.
M:System.Object.Equals(System.Object)~System.Boolean;Don't use object.Equals. Use IEquatable<T> or EqualityComparer<T>.Default instead.
M:System.ValueType.Equals(System.Object)~System.Boolean;Don't use object.Equals(Fallbacks to ValueType). Use IEquatable<T> or EqualityComparer<T>.Default instead.
M:System.Nullable`1.Equals(System.Object)~System.Boolean;Use == instead.
T:System.IComparable;Don't use non-generic IComparable. Use generic version instead.
#M:System.Object.Equals(System.Object,System.Object)~System.Boolean;Don't use object.Equals. Use IEquatable<T> or EqualityComparer<T>.Default instead.
#M:System.Object.Equals(System.Object)~System.Boolean;Don't use object.Equals. Use IEquatable<T> or EqualityComparer<T>.Default instead.
#M:System.ValueType.Equals(System.Object)~System.Boolean;Don't use object.Equals(Fallbacks to ValueType). Use IEquatable<T> or EqualityComparer<T>.Default instead.
#M:System.Nullable`1.Equals(System.Object)~System.Boolean;Use == instead.
#T:System.IComparable;Don't use non-generic IComparable. Use generic version instead.
M:System.Guid.#ctor;Probably meaning to use Guid.NewGuid() instead. If actually wanting empty, use Guid.Empty.
M:System.Threading.Tasks.Task.Wait();Don't use Task.Wait. Use Task.WaitSafely() to ensure we avoid deadlocks.
P:System.Threading.Tasks.Task`1.Result;Don't use Task.Result. Use Task.GetResultSafely() to ensure we avoid deadlocks.
#M:System.Threading.Tasks.Task.Wait();Don't use Task.Wait. Use Task.WaitSafely() to ensure we avoid deadlocks.
#P:System.Threading.Tasks.Task`1.Result;Don't use Task.Result. Use Task.GetResultSafely() to ensure we avoid deadlocks.
M:System.Threading.ManualResetEventSlim.Wait();Specify a timeout to avoid waiting forever.
M:System.Char.ToLower(System.Char);char.ToLower() changes behaviour depending on CultureInfo.CurrentCulture. Use char.ToLowerInvariant() instead. If wanting culture-sensitive behaviour, explicitly provide CultureInfo.CurrentCulture.
M:System.Char.ToUpper(System.Char);char.ToUpper() changes behaviour depending on CultureInfo.CurrentCulture. Use char.ToUpperInvariant() instead. If wanting culture-sensitive behaviour, explicitly provide CultureInfo.CurrentCulture.