Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[graphics] fix CA1307 and CA1309 for performance #14627

Merged
merged 1 commit into from
Apr 18, 2023
Merged

[graphics] fix CA1307 and CA1309 for performance #14627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Core/src/Graphics/MauiDrawable.Android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ void SetDefaultBackgroundColor()
if (_context.Theme.ResolveAttribute(global::Android.Resource.Attribute.WindowBackground, background, true))
{
var resource = _context.Resources.GetResourceTypeName(background.ResourceId);
var type = resource?.ToLower();
var type = resource?.ToLowerInvariant();

if (type == "color")
{
Expand Down
2 changes: 1 addition & 1 deletion src/Graphics/src/Graphics/Font.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public Font(string name, int weight = FontWeights.Normal, FontStyleType styleTyp
public FontStyleType StyleType { get; private set; }

public bool Equals(IFont other)
=> StyleType == other.StyleType && Weight == other.Weight && Name.Equals(other.Name);
=> StyleType == other.StyleType && Weight == other.Weight && Name.Equals(other.Name, StringComparison.Ordinal);

public override bool Equals(object obj)
=> obj is IFont font && Equals(font);
Expand Down
10 changes: 7 additions & 3 deletions src/Graphics/src/Graphics/FontSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@ public FontSource(string filename, int weight = FontWeights.Normal, FontStyleTyp
public readonly FontStyleType FontStyleType;

public bool Equals(FontSource other)
=> Name.Equals(other.Name)
=> Name.Equals(other.Name, StringComparison.Ordinal)
&& Weight.Equals(other.Weight)
&& FontStyleType.Equals(other.FontStyleType);

public override int GetHashCode()
=> Name.GetHashCode() ^ Weight.GetHashCode() ^ FontStyleType.GetHashCode();
public override int GetHashCode() => Name.GetHashCode(
#if !NETSTANDARD2_0
StringComparison.Ordinal
#endif
)
^ Weight.GetHashCode() ^ FontStyleType.GetHashCode();

public override bool Equals(object? obj) => obj is FontSource other && Equals(other);

Expand Down
2 changes: 1 addition & 1 deletion src/Graphics/src/Graphics/Graphics.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<Product>Microsoft.Maui.Graphics</Product>
<IsTrimmable>false</IsTrimmable>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);CA1307;CA1309;CS1591;RS0026;RS0027;RS0041</NoWarn>
<NoWarn>$(NoWarn);CS1591;RS0026;RS0027;RS0041</NoWarn>
</PropertyGroup>

<Import Project="$(MauiSrcDirectory)MultiTargeting.targets" />
Expand Down
12 changes: 11 additions & 1 deletion src/Graphics/src/Graphics/PathBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ private bool NextBoolValue
{
string vValueAsString = _commandStack.Pop();

if ("1".Equals(vValueAsString))
if ("1".Equals(vValueAsString, StringComparison.Ordinal))
{
return true;
}
Expand Down Expand Up @@ -112,11 +112,21 @@ public PathF BuildPath(string pathAsString)
#if DEBUG_PATH
System.Diagnostics.Debug.WriteLine(aPathString);
#endif
#if NETSTANDARD2_0
pathAsString = pathAsString.Replace("Infinity", "0");
#else
pathAsString = pathAsString.Replace("Infinity", "0", StringComparison.Ordinal);
#endif
pathAsString = Regex.Replace(pathAsString, "([a-zA-Z])", " $1 ");
#if NETSTANDARD2_0
pathAsString = pathAsString.Replace("-", " -");
pathAsString = pathAsString.Replace(" E -", "E-");
pathAsString = pathAsString.Replace(" e -", "e-");
#else
pathAsString = pathAsString.Replace("-", " -", StringComparison.Ordinal);
pathAsString = pathAsString.Replace(" E -", "E-", StringComparison.Ordinal);
pathAsString = pathAsString.Replace(" e -", "e-", StringComparison.Ordinal);
#endif
#if DEBUG_PATH
System.Diagnostics.Debug.WriteLine(aPathString);
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/Graphics/src/Graphics/PdfExportContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ protected PdfExportContext(
{
if (defaultWidth <= 0 || defaultHeight <= 0)
{
if ("en-US".Equals(Thread.CurrentThread.CurrentCulture.Name))
if ("en-US".Equals(Thread.CurrentThread.CurrentCulture.Name, StringComparison.Ordinal))
{
// Letter
defaultWidth = 612;
Expand Down
7 changes: 4 additions & 3 deletions src/Graphics/src/Graphics/Platforms/MaciOS/Text/NSAttributedStringExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
using NSFont = UIKit.UIFont;
using NSColor = UIKit.UIColor;
#endif
using System;
using System.Collections.Generic;
using Microsoft.Maui.Graphics.Text;
using System.IO;
using Microsoft.Maui.Graphics.Text;
using Foundation;

namespace Microsoft.Maui.Graphics.Platform
Expand Down Expand Up @@ -67,10 +68,10 @@ private static bool HandleAttributes(
formatAttributes.SetFontName(fontName);
else
{
if (fontName.Contains("Italic"))
if (fontName.Contains("Italic", StringComparison.Ordinal))
formatAttributes.SetItalic(true);

if (fontName.Contains("Bold"))
if (fontName.Contains("Bold", StringComparison.Ordinal))
formatAttributes.SetBold(true);
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/Graphics/src/Graphics/Text/XmlAttributedTextReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ protected void ElementStarted()
{
string elementName = _reader.Name;

if (XmlNames.Content.Equals(elementName))
if (XmlNames.Content.Equals(elementName, StringComparison.Ordinal))
{
_inContent = true;
_contentEncoded = ReadBool(XmlNames.Encoded);
}
else if (XmlNames.Run.Equals(elementName))
else if (XmlNames.Run.Equals(elementName, StringComparison.Ordinal))
{
ReadRun();
}
Expand All @@ -85,7 +85,7 @@ protected void ElementStarted()
protected void ElementEnded()
{
string elementName = _reader.Name;
if (XmlNames.Content.Equals(elementName))
if (XmlNames.Content.Equals(elementName, StringComparison.Ordinal))
_inContent = false;
}

Expand Down Expand Up @@ -121,7 +121,7 @@ private void ReadRun()
var attributeName = _reader.Name;
var attributeValue = _reader.Value;

if (!(XmlNames.Start.Equals(attributeName) || XmlNames.Length.Equals(attributeName)))
if (!(XmlNames.Start.Equals(attributeName, StringComparison.Ordinal) || XmlNames.Length.Equals(attributeName, StringComparison.Ordinal)))
{
if (Enum.TryParse(attributeName, out TextAttribute key))
attributes[key] = attributeValue;
Expand Down
4 changes: 2 additions & 2 deletions src/Graphics/src/Graphics/Text/XmlAttributedTextWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public void Write(
{
if (attributedText != null && !string.IsNullOrEmpty(attributedText.Text))
{
bool encode = attributedText.Text.Contains("]]");
bool encode = attributedText.Text.IndexOf("]]", StringComparison.Ordinal) != -1;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Switching to IndexOf() for this one felt better than having to do #if NETSTANDARD2_0.


writer.Write($"<{XmlNames.AttributedText}>");
if (encode)
Expand Down Expand Up @@ -83,7 +83,7 @@ private void Write(
{
currentAttributes.TryGetValue(key, out var value);

if (!string.Equals(value, defaultValue))
if (!string.Equals(value, defaultValue, StringComparison.Ordinal))
WriteAttribute(writer, key.ToString(), value);
}

Expand Down