Fix offset + globalization issues in StringSegment#45022

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

Merged
GrabYourPitchforks merged 7 commits into from
Jan 23, 2021
Merged

Fix offset + globalization issues in StringSegment #45022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d8363af
Nullable-enable StringSegment
GrabYourPitchforks Nov 20, 2020
f3ba50c
Fix glob issues in StringSegment
GrabYourPitchforks Nov 20, 2020
daccefe
Remove nullable annotations from StringSegment
GrabYourPitchforks Nov 20, 2020
c2c7a5f
Merge remote-tracking branch 'origin/master' into stringsegment
GrabYourPitchforks Jan 20, 2021
f94fd97
Code cleanup, perf improvements, improve globalization tests
GrabYourPitchforks Jan 21, 2021
42f6f02
Simplify TrimEnd logic
GrabYourPitchforks Jan 22, 2021
58a99bb
skip some glob tests on netfx
GrabYourPitchforks Jan 23, 2021
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
138 changes: 62 additions & 76 deletions src/libraries/Microsoft.Extensions.Primitives/src/StringSegment.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,24 +146,20 @@ public char this[int index]
/// </returns>
public static int Compare(StringSegment a, StringSegment b, StringComparison comparisonType)
{
int minLength = Math.Min(a.Length, b.Length);
int diff = string.Compare(a.Buffer, a.Offset, b.Buffer, b.Offset, minLength, comparisonType);
if (diff == 0)
if (a.HasValue && b.HasValue)
{
diff = a.Length - b.Length;
return a.AsSpan().CompareTo(b.AsSpan(), comparisonType);
}
else
{
CheckStringComparison(comparisonType); // must arg check before returning
return !a.HasValue ? (b.HasValue ? -1 : 0) : 1; // null sorts less than non-null, and two nulls sort as equal
Comment thread
GrabYourPitchforks marked this conversation as resolved.
}

return diff;
}

/// <inheritdoc />
public override bool Equals(object obj)
{
if (obj is null)
{
return false;
}

return obj is StringSegment segment && Equals(segment);
}

Expand All@@ -182,12 +178,15 @@ public override bool Equals(object obj)
/// <returns><see langword="true" /> if the current object is equal to the other parameter; otherwise, <see langword="false" />.</returns>
public bool Equals(StringSegment other, StringComparison comparisonType)
{
if (Length != other.Length)
if (HasValue && other.HasValue)
{
return false;
return AsSpan().Equals(other.AsSpan(), comparisonType);
}
else
{
CheckStringComparison(comparisonType); // must arg check before returning
return !HasValue && !other.HasValue; // only return true if both are null
}

return string.Compare(Buffer, Offset, other.Buffer, other.Offset, other.Length, comparisonType) == 0;
}

// This handles StringSegment.Equals(string, StringSegment, StringComparison) and StringSegment.Equals(StringSegment, string, StringComparison)
Expand DownExpand Up@@ -232,20 +231,20 @@ public bool Equals(string text, StringComparison comparisonType)
ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
}

int textLength = text.Length;
if (!HasValue || Length != textLength)
if (!HasValue)
{
CheckStringComparison(comparisonType); // must arg check before returning
return false;
}

return string.Compare(Buffer, Offset, text, 0, textLength, comparisonType) == 0;
return AsSpan().Equals(text.AsSpan(), comparisonType);
}

/// <inheritdoc />
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public override int GetHashCode()
{
#if NETCOREAPP || NETSTANDARD2_1
#if NETCOREAPP
return string.GetHashCode(AsSpan());
#elif (NETSTANDARD2_0 || NETFRAMEWORK)
// This GetHashCode is expensive since it allocates on every call.
Expand All@@ -255,7 +254,6 @@ public override int GetHashCode()
#else
#error Target frameworks need to be updated.
#endif

}

/// <summary>
Expand DownExpand Up@@ -310,15 +308,13 @@ public bool StartsWith(string text, StringComparison comparisonType)
ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
}

bool result = false;
int textLength = text.Length;

if (HasValue && Length >= textLength)
if (!HasValue)
{
result = string.Compare(Buffer, Offset, text, 0, textLength, comparisonType) == 0;
CheckStringComparison(comparisonType); // must arg check before returning
return false;
}

return result;
return AsSpan().StartsWith(text.AsSpan(), comparisonType);
}

/// <summary>
Expand All@@ -338,16 +334,13 @@ public bool EndsWith(string text, StringComparison comparisonType)
ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
}

bool result = false;
int textLength = text.Length;
int comparisonLength = Offset + Length - textLength;

if (HasValue && comparisonLength > 0)
if (!HasValue)
{
result = string.Compare(Buffer, comparisonLength, text, 0, textLength, comparisonType) == 0;
CheckStringComparison(comparisonType); // must arg check before returning
return false;
}

return result;
return AsSpan().EndsWith(text.AsSpan(), comparisonType);
}

/// <summary>
Expand DownExpand Up@@ -445,10 +438,10 @@ public int IndexOf(char c, int start, int count)
ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.count);
}

int index = Buffer.IndexOf(c, offset, count);
if (index != -1)
int index = AsSpan().Slice(start, count).IndexOf(c);
if (index >= 0)
{
index -= Offset;
index += start;
}

return index;
Expand DownExpand Up@@ -552,18 +545,7 @@ public int IndexOfAny(char[] anyOf)
/// <returns>The zero-based index position of value if that character is found, or -1 if it is not.</returns>
public int LastIndexOf(char value)
{
int index = -1;

if (HasValue)
{
index = Buffer.LastIndexOf(value, Offset + Length - 1, Length);
if (index != -1)
{
index -= Offset;
}
}

return index;
return AsSpan().LastIndexOf(value);
}

/// <summary>
Expand All@@ -576,54 +558,40 @@ public int LastIndexOf(char value)
/// Removes all leading whitespaces.
/// </summary>
/// <returns>The trimmed <see cref="StringSegment"/>.</returns>
public unsafe StringSegment TrimStart()
public StringSegment TrimStart()
{
int trimmedStart = Offset;
int length = Offset + Length;
ReadOnlySpan<char> span = AsSpan();

fixed (char* p = Buffer)
int i;
for (i = 0; i < span.Length; i++)
{
while (trimmedStart < length)
if (!char.IsWhiteSpace(span[i]))
{
char c = p[trimmedStart];

if (!char.IsWhiteSpace(c))
{
break;
}

trimmedStart++;
break;
}
}

return new StringSegment(Buffer, trimmedStart, length - trimmedStart);
return Subsegment(i);
}

/// <summary>
/// Removes all trailing whitespaces.
/// </summary>
/// <returns>The trimmed <see cref="StringSegment"/>.</returns>
public unsafe StringSegment TrimEnd()
public StringSegment TrimEnd()
{
int offset = Offset;
int trimmedEnd = offset + Length - 1;
ReadOnlySpan<char> span = AsSpan();

fixed (char* p = Buffer)
int i;
for (i = span.Length - 1; i >= 0; i--)
{
while (trimmedEnd >= offset)
if (!char.IsWhiteSpace(span[i]))
{
char c = p[trimmedEnd];

if (!char.IsWhiteSpace(c))
{
break;
}

trimmedEnd--;
break;
}
}

return new StringSegment(Buffer, offset, trimmedEnd - offset + 1);
return Subsegment(0, i + 1);
}

/// <summary>
Expand DownExpand Up@@ -664,6 +632,15 @@ public override string ToString()
return Value ?? string.Empty;
}

private static void CheckStringComparison(StringComparison comparisonType)
{
// Single comparison to check if comparisonType is within [CurrentCulture .. OrdinalIgnoreCase]
if ((uint)comparisonType > (uint)StringComparison.OrdinalIgnoreCase)
{
ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.comparisonType);
}
}

// Methods that do no return (i.e. throw) are not inlined
// https://github.com/dotnet/coreclr/pull/6103
private static void ThrowInvalidArguments(string buffer, int offset, int length)
Expand DownExpand Up@@ -716,5 +693,14 @@ Exception GetInvalidArgumentsException(bool hasValue)
return ThrowHelper.GetArgumentException(ExceptionResource.Argument_InvalidOffsetLengthStringSegment);
}
}

/// <inheritdoc />
bool IEquatable<string>.Equals(string other)
{
// Explicit interface implementation for IEquatable<string> because
// the interface's Equals method allows null strings, which we return
// as not-equal.
return other != null && Equals(other);
}
}
}
3 changes: 2 additions & 1 deletion src/libraries/Microsoft.Extensions.Primitives/src/ThrowHelper.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,8 @@ internal enum ExceptionArgument
index,
value,
capacity,
separators
separators,
comparisonType
}

internal enum ExceptionResource
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix offset + globalization issues in StringSegment#45022

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

 Merged

GrabYourPitchforks
merged 7 commits into

from

Jan 23, 2021
 Merged


Fix offset + globalization issues in StringSegment
#45022
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
d8363af

Nullable-enable StringSegment


GrabYourPitchforks Nov 20, 2020
f3ba50c

Fix glob issues in StringSegment


GrabYourPitchforks Nov 20, 2020
daccefe

Remove nullable annotations from StringSegment


GrabYourPitchforks Nov 20, 2020
c2c7a5f

Merge remote-tracking branch 'origin/master' into stringsegment


GrabYourPitchforks Jan 20, 2021
f94fd97

Code cleanup, perf improvements, improve globalization tests


GrabYourPitchforks Jan 21, 2021
42f6f02

Simplify TrimEnd logic


GrabYourPitchforks Jan 22, 2021
58a99bb

skip some glob tests on netfx


GrabYourPitchforks Jan 23, 2021

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


138 changes: 62 additions & 76 deletions
src/libraries/Microsoft.Extensions.Primitives/src/StringSegment.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,24 +146,20 @@ public char this[int index]
 /// </returns>
 public static int Compare(StringSegment a, StringSegment b, StringComparison comparisonType)
 {
 int minLength = Math.Min(a.Length, b.Length);
 int diff = string.Compare(a.Buffer, a.Offset, b.Buffer, b.Offset, minLength, comparisonType);
 if (diff == 0)
 if (a.HasValue && b.HasValue)
 {
 diff = a.Length - b.Length;
 return a.AsSpan().CompareTo(b.AsSpan(), comparisonType);
 }
 else
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return !a.HasValue ? (b.HasValue ? -1 : 0) : 1; // null sorts less than non-null, and two nulls sort as equal
Comment thread
GrabYourPitchforks marked this conversation as resolved.

 }

 return diff;
 }

 /// <inheritdoc />
 public override bool Equals(object obj)
 {
 if (obj is null)
 {
 return false;
 }

 return obj is StringSegment segment && Equals(segment);
 }

Expand All@@ -182,12 +178,15 @@ public override bool Equals(object obj)
 /// <returns><see langword="true" /> if the current object is equal to the other parameter; otherwise, <see langword="false" />.</returns>
 public bool Equals(StringSegment other, StringComparison comparisonType)
 {
 if (Length != other.Length)
 if (HasValue && other.HasValue)
 {
 return false;
 return AsSpan().Equals(other.AsSpan(), comparisonType);
 }
 else
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return !HasValue && !other.HasValue; // only return true if both are null
 }

 return string.Compare(Buffer, Offset, other.Buffer, other.Offset, other.Length, comparisonType) == 0;
 }

 // This handles StringSegment.Equals(string, StringSegment, StringComparison) and StringSegment.Equals(StringSegment, string, StringComparison)
Expand DownExpand Up@@ -232,20 +231,20 @@ public bool Equals(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 int textLength = text.Length;
 if (!HasValue || Length != textLength)
 if (!HasValue)
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return string.Compare(Buffer, Offset, text, 0, textLength, comparisonType) == 0;
 return AsSpan().Equals(text.AsSpan(), comparisonType);
 }

 /// <inheritdoc />
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public override int GetHashCode()
 {
#if NETCOREAPP || NETSTANDARD2_1
#if NETCOREAPP
 return string.GetHashCode(AsSpan());
#elif (NETSTANDARD2_0 || NETFRAMEWORK)
 // This GetHashCode is expensive since it allocates on every call.
Expand All@@ -255,7 +254,6 @@ public override int GetHashCode()
#else
#error Target frameworks need to be updated.
#endif

 }

 /// <summary>
Expand DownExpand Up@@ -310,15 +308,13 @@ public bool StartsWith(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 bool result = false;
 int textLength = text.Length;

 if (HasValue && Length >= textLength)
 if (!HasValue)
 {
 result = string.Compare(Buffer, Offset, text, 0, textLength, comparisonType) == 0;
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return result;
 return AsSpan().StartsWith(text.AsSpan(), comparisonType);
 }

 /// <summary>
Expand All@@ -338,16 +334,13 @@ public bool EndsWith(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 bool result = false;
 int textLength = text.Length;
 int comparisonLength = Offset + Length - textLength;

 if (HasValue && comparisonLength > 0)
 if (!HasValue)
 {
 result = string.Compare(Buffer, comparisonLength, text, 0, textLength, comparisonType) == 0;
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return result;
 return AsSpan().EndsWith(text.AsSpan(), comparisonType);
 }

 /// <summary>
Expand DownExpand Up@@ -445,10 +438,10 @@ public int IndexOf(char c, int start, int count)
 ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.count);
 }

 int index = Buffer.IndexOf(c, offset, count);
 if (index != -1)
 int index = AsSpan().Slice(start, count).IndexOf(c);
 if (index >= 0)
 {
 index -= Offset;
 index += start;
 }

 return index;
Expand DownExpand Up@@ -552,18 +545,7 @@ public int IndexOfAny(char[] anyOf)
 /// <returns>The zero-based index position of value if that character is found, or -1 if it is not.</returns>
 public int LastIndexOf(char value)
 {
 int index = -1;

 if (HasValue)
 {
 index = Buffer.LastIndexOf(value, Offset + Length - 1, Length);
 if (index != -1)
 {
 index -= Offset;
 }
 }

 return index;
 return AsSpan().LastIndexOf(value);
 }

 /// <summary>
Expand All@@ -576,54 +558,40 @@ public int LastIndexOf(char value)
 /// Removes all leading whitespaces.
 /// </summary>
 /// <returns>The trimmed <see cref="StringSegment"/>.</returns>
 public unsafe StringSegment TrimStart()
 public StringSegment TrimStart()
 {
 int trimmedStart = Offset;
 int length = Offset + Length;
 ReadOnlySpan<char> span = AsSpan();

 fixed (char* p = Buffer)
 int i;
 for (i = 0; i < span.Length; i++)
 {
while (trimmedStart < length)
if (!char.IsWhiteSpace(span[i]))
 {
 char c = p[trimmedStart];

 if (!char.IsWhiteSpace(c))
 {
 break;
 }

 trimmedStart++;
 break;
 }
 }

 return new StringSegment(Buffer, trimmedStart, length - trimmedStart);
 return Subsegment(i);
 }

 /// <summary>
 /// Removes all trailing whitespaces.
 /// </summary>
 /// <returns>The trimmed <see cref="StringSegment"/>.</returns>
 public unsafe StringSegment TrimEnd()
 public StringSegment TrimEnd()
 {
 int offset = Offset;
 int trimmedEnd = offset + Length - 1;
 ReadOnlySpan<char> span = AsSpan();

 fixed (char* p = Buffer)
 int i;
 for (i = span.Length - 1; i >= 0; i--)
 {
while (trimmedEnd >= offset)
if (!char.IsWhiteSpace(span[i]))
 {
 char c = p[trimmedEnd];

 if (!char.IsWhiteSpace(c))
 {
 break;
 }

 trimmedEnd--;
 break;
 }
 }

 return new StringSegment(Buffer, offset, trimmedEnd - offset + 1);
 return Subsegment(0, i + 1);
 }

 /// <summary>
Expand DownExpand Up@@ -664,6 +632,15 @@ public override string ToString()
 return Value ?? string.Empty;
 }

 private static void CheckStringComparison(StringComparison comparisonType)
 {
 // Single comparison to check if comparisonType is within [CurrentCulture .. OrdinalIgnoreCase]
 if ((uint)comparisonType > (uint)StringComparison.OrdinalIgnoreCase)
 {
 ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.comparisonType);
 }
 }

 // Methods that do no return (i.e. throw) are not inlined
 // https://github.com/dotnet/coreclr/pull/6103
 private static void ThrowInvalidArguments(string buffer, int offset, int length)
Expand DownExpand Up@@ -716,5 +693,14 @@ Exception GetInvalidArgumentsException(bool hasValue)
 return ThrowHelper.GetArgumentException(ExceptionResource.Argument_InvalidOffsetLengthStringSegment);
 }
 }

 /// <inheritdoc />
 bool IEquatable<string>.Equals(string other)
 {
 // Explicit interface implementation for IEquatable<string> because
 // the interface's Equals method allows null strings, which we return
 // as not-equal.
 return other != null && Equals(other);
 }
 }
}

3 changes: 2 additions & 1 deletion
src/libraries/Microsoft.Extensions.Primitives/src/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,8 @@ internal enum ExceptionArgument
 index,
 value,
 capacity,
 separators
 separators,
 comparisonType
 }

 internal enum ExceptionResource
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix offset + globalization issues in StringSegment#45022

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

 Merged

GrabYourPitchforks
merged 7 commits into

from

Jan 23, 2021
 Merged


Fix offset + globalization issues in StringSegment
#45022
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
d8363af

Nullable-enable StringSegment


GrabYourPitchforks Nov 20, 2020
f3ba50c

Fix glob issues in StringSegment


GrabYourPitchforks Nov 20, 2020
daccefe

Remove nullable annotations from StringSegment


GrabYourPitchforks Nov 20, 2020
c2c7a5f

Merge remote-tracking branch 'origin/master' into stringsegment


GrabYourPitchforks Jan 20, 2021
f94fd97

Code cleanup, perf improvements, improve globalization tests


GrabYourPitchforks Jan 21, 2021
42f6f02

Simplify TrimEnd logic


GrabYourPitchforks Jan 22, 2021
58a99bb

skip some glob tests on netfx


GrabYourPitchforks Jan 23, 2021

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


138 changes: 62 additions & 76 deletions
src/libraries/Microsoft.Extensions.Primitives/src/StringSegment.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,24 +146,20 @@ public char this[int index]
 /// </returns>
 public static int Compare(StringSegment a, StringSegment b, StringComparison comparisonType)
 {
 int minLength = Math.Min(a.Length, b.Length);
 int diff = string.Compare(a.Buffer, a.Offset, b.Buffer, b.Offset, minLength, comparisonType);
 if (diff == 0)
 if (a.HasValue && b.HasValue)
 {
 diff = a.Length - b.Length;
 return a.AsSpan().CompareTo(b.AsSpan(), comparisonType);
 }
 else
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return !a.HasValue ? (b.HasValue ? -1 : 0) : 1; // null sorts less than non-null, and two nulls sort as equal
Comment thread
GrabYourPitchforks marked this conversation as resolved.

 }

 return diff;
 }

 /// <inheritdoc />
 public override bool Equals(object obj)
 {
 if (obj is null)
 {
 return false;
 }

 return obj is StringSegment segment && Equals(segment);
 }

Expand All@@ -182,12 +178,15 @@ public override bool Equals(object obj)
 /// <returns><see langword="true" /> if the current object is equal to the other parameter; otherwise, <see langword="false" />.</returns>
 public bool Equals(StringSegment other, StringComparison comparisonType)
 {
 if (Length != other.Length)
 if (HasValue && other.HasValue)
 {
 return false;
 return AsSpan().Equals(other.AsSpan(), comparisonType);
 }
 else
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return !HasValue && !other.HasValue; // only return true if both are null
 }

 return string.Compare(Buffer, Offset, other.Buffer, other.Offset, other.Length, comparisonType) == 0;
 }

 // This handles StringSegment.Equals(string, StringSegment, StringComparison) and StringSegment.Equals(StringSegment, string, StringComparison)
Expand DownExpand Up@@ -232,20 +231,20 @@ public bool Equals(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 int textLength = text.Length;
 if (!HasValue || Length != textLength)
 if (!HasValue)
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return string.Compare(Buffer, Offset, text, 0, textLength, comparisonType) == 0;
 return AsSpan().Equals(text.AsSpan(), comparisonType);
 }

 /// <inheritdoc />
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public override int GetHashCode()
 {
#if NETCOREAPP || NETSTANDARD2_1
#if NETCOREAPP
 return string.GetHashCode(AsSpan());
#elif (NETSTANDARD2_0 || NETFRAMEWORK)
 // This GetHashCode is expensive since it allocates on every call.
Expand All@@ -255,7 +254,6 @@ public override int GetHashCode()
#else
#error Target frameworks need to be updated.
#endif

 }

 /// <summary>
Expand DownExpand Up@@ -310,15 +308,13 @@ public bool StartsWith(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 bool result = false;
 int textLength = text.Length;

 if (HasValue && Length >= textLength)
 if (!HasValue)
 {
 result = string.Compare(Buffer, Offset, text, 0, textLength, comparisonType) == 0;
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return result;
 return AsSpan().StartsWith(text.AsSpan(), comparisonType);
 }

 /// <summary>
Expand All@@ -338,16 +334,13 @@ public bool EndsWith(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 bool result = false;
 int textLength = text.Length;
 int comparisonLength = Offset + Length - textLength;

 if (HasValue && comparisonLength > 0)
 if (!HasValue)
 {
 result = string.Compare(Buffer, comparisonLength, text, 0, textLength, comparisonType) == 0;
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return result;
 return AsSpan().EndsWith(text.AsSpan(), comparisonType);
 }

 /// <summary>
Expand DownExpand Up@@ -445,10 +438,10 @@ public int IndexOf(char c, int start, int count)
 ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.count);
 }

 int index = Buffer.IndexOf(c, offset, count);
 if (index != -1)
 int index = AsSpan().Slice(start, count).IndexOf(c);
 if (index >= 0)
 {
 index -= Offset;
 index += start;
 }

 return index;
Expand DownExpand Up@@ -552,18 +545,7 @@ public int IndexOfAny(char[] anyOf)
 /// <returns>The zero-based index position of value if that character is found, or -1 if it is not.</returns>
 public int LastIndexOf(char value)
 {
 int index = -1;

 if (HasValue)
 {
 index = Buffer.LastIndexOf(value, Offset + Length - 1, Length);
 if (index != -1)
 {
 index -= Offset;
 }
 }

 return index;
 return AsSpan().LastIndexOf(value);
 }

 /// <summary>
Expand All@@ -576,54 +558,40 @@ public int LastIndexOf(char value)
 /// Removes all leading whitespaces.
 /// </summary>
 /// <returns>The trimmed <see cref="StringSegment"/>.</returns>
 public unsafe StringSegment TrimStart()
 public StringSegment TrimStart()
 {
 int trimmedStart = Offset;
 int length = Offset + Length;
 ReadOnlySpan<char> span = AsSpan();

 fixed (char* p = Buffer)
 int i;
 for (i = 0; i < span.Length; i++)
 {
while (trimmedStart < length)
if (!char.IsWhiteSpace(span[i]))
 {
 char c = p[trimmedStart];

 if (!char.IsWhiteSpace(c))
 {
 break;
 }

 trimmedStart++;
 break;
 }
 }

 return new StringSegment(Buffer, trimmedStart, length - trimmedStart);
 return Subsegment(i);
 }

 /// <summary>
 /// Removes all trailing whitespaces.
 /// </summary>
 /// <returns>The trimmed <see cref="StringSegment"/>.</returns>
 public unsafe StringSegment TrimEnd()
 public StringSegment TrimEnd()
 {
 int offset = Offset;
 int trimmedEnd = offset + Length - 1;
 ReadOnlySpan<char> span = AsSpan();

 fixed (char* p = Buffer)
 int i;
 for (i = span.Length - 1; i >= 0; i--)
 {
while (trimmedEnd >= offset)
if (!char.IsWhiteSpace(span[i]))
 {
 char c = p[trimmedEnd];

 if (!char.IsWhiteSpace(c))
 {
 break;
 }

 trimmedEnd--;
 break;
 }
 }

 return new StringSegment(Buffer, offset, trimmedEnd - offset + 1);
 return Subsegment(0, i + 1);
 }

 /// <summary>
Expand DownExpand Up@@ -664,6 +632,15 @@ public override string ToString()
 return Value ?? string.Empty;
 }

 private static void CheckStringComparison(StringComparison comparisonType)
 {
 // Single comparison to check if comparisonType is within [CurrentCulture .. OrdinalIgnoreCase]
 if ((uint)comparisonType > (uint)StringComparison.OrdinalIgnoreCase)
 {
 ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.comparisonType);
 }
 }

 // Methods that do no return (i.e. throw) are not inlined
 // https://github.com/dotnet/coreclr/pull/6103
 private static void ThrowInvalidArguments(string buffer, int offset, int length)
Expand DownExpand Up@@ -716,5 +693,14 @@ Exception GetInvalidArgumentsException(bool hasValue)
 return ThrowHelper.GetArgumentException(ExceptionResource.Argument_InvalidOffsetLengthStringSegment);
 }
 }

 /// <inheritdoc />
 bool IEquatable<string>.Equals(string other)
 {
 // Explicit interface implementation for IEquatable<string> because
 // the interface's Equals method allows null strings, which we return
 // as not-equal.
 return other != null && Equals(other);
 }
 }
}

3 changes: 2 additions & 1 deletion
src/libraries/Microsoft.Extensions.Primitives/src/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,8 @@ internal enum ExceptionArgument
 index,
 value,
 capacity,
 separators
 separators,
 comparisonType
 }

 internal enum ExceptionResource
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix offset + globalization issues in StringSegment#45022

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

 Merged

GrabYourPitchforks
merged 7 commits into

from

Jan 23, 2021
 Merged


Fix offset + globalization issues in StringSegment
#45022
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
d8363af

Nullable-enable StringSegment


GrabYourPitchforks Nov 20, 2020
f3ba50c

Fix glob issues in StringSegment


GrabYourPitchforks Nov 20, 2020
daccefe

Remove nullable annotations from StringSegment


GrabYourPitchforks Nov 20, 2020
c2c7a5f

Merge remote-tracking branch 'origin/master' into stringsegment


GrabYourPitchforks Jan 20, 2021
f94fd97

Code cleanup, perf improvements, improve globalization tests


GrabYourPitchforks Jan 21, 2021
42f6f02

Simplify TrimEnd logic


GrabYourPitchforks Jan 22, 2021
58a99bb

skip some glob tests on netfx


GrabYourPitchforks Jan 23, 2021

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


138 changes: 62 additions & 76 deletions
src/libraries/Microsoft.Extensions.Primitives/src/StringSegment.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,24 +146,20 @@ public char this[int index]
 /// </returns>
 public static int Compare(StringSegment a, StringSegment b, StringComparison comparisonType)
 {
 int minLength = Math.Min(a.Length, b.Length);
 int diff = string.Compare(a.Buffer, a.Offset, b.Buffer, b.Offset, minLength, comparisonType);
 if (diff == 0)
 if (a.HasValue && b.HasValue)
 {
 diff = a.Length - b.Length;
 return a.AsSpan().CompareTo(b.AsSpan(), comparisonType);
 }
 else
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return !a.HasValue ? (b.HasValue ? -1 : 0) : 1; // null sorts less than non-null, and two nulls sort as equal
Comment thread
GrabYourPitchforks marked this conversation as resolved.

 }

 return diff;
 }

 /// <inheritdoc />
 public override bool Equals(object obj)
 {
 if (obj is null)
 {
 return false;
 }

 return obj is StringSegment segment && Equals(segment);
 }

Expand All@@ -182,12 +178,15 @@ public override bool Equals(object obj)
 /// <returns><see langword="true" /> if the current object is equal to the other parameter; otherwise, <see langword="false" />.</returns>
 public bool Equals(StringSegment other, StringComparison comparisonType)
 {
 if (Length != other.Length)
 if (HasValue && other.HasValue)
 {
 return false;
 return AsSpan().Equals(other.AsSpan(), comparisonType);
 }
 else
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return !HasValue && !other.HasValue; // only return true if both are null
 }

 return string.Compare(Buffer, Offset, other.Buffer, other.Offset, other.Length, comparisonType) == 0;
 }

 // This handles StringSegment.Equals(string, StringSegment, StringComparison) and StringSegment.Equals(StringSegment, string, StringComparison)
Expand DownExpand Up@@ -232,20 +231,20 @@ public bool Equals(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 int textLength = text.Length;
 if (!HasValue || Length != textLength)
 if (!HasValue)
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return string.Compare(Buffer, Offset, text, 0, textLength, comparisonType) == 0;
 return AsSpan().Equals(text.AsSpan(), comparisonType);
 }

 /// <inheritdoc />
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public override int GetHashCode()
 {
#if NETCOREAPP || NETSTANDARD2_1
#if NETCOREAPP
 return string.GetHashCode(AsSpan());
#elif (NETSTANDARD2_0 || NETFRAMEWORK)
 // This GetHashCode is expensive since it allocates on every call.
Expand All@@ -255,7 +254,6 @@ public override int GetHashCode()
#else
#error Target frameworks need to be updated.
#endif

 }

 /// <summary>
Expand DownExpand Up@@ -310,15 +308,13 @@ public bool StartsWith(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 bool result = false;
 int textLength = text.Length;

 if (HasValue && Length >= textLength)
 if (!HasValue)
 {
 result = string.Compare(Buffer, Offset, text, 0, textLength, comparisonType) == 0;
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return result;
 return AsSpan().StartsWith(text.AsSpan(), comparisonType);
 }

 /// <summary>
Expand All@@ -338,16 +334,13 @@ public bool EndsWith(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 bool result = false;
 int textLength = text.Length;
 int comparisonLength = Offset + Length - textLength;

 if (HasValue && comparisonLength > 0)
 if (!HasValue)
 {
 result = string.Compare(Buffer, comparisonLength, text, 0, textLength, comparisonType) == 0;
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return result;
 return AsSpan().EndsWith(text.AsSpan(), comparisonType);
 }

 /// <summary>
Expand DownExpand Up@@ -445,10 +438,10 @@ public int IndexOf(char c, int start, int count)
 ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.count);
 }

 int index = Buffer.IndexOf(c, offset, count);
 if (index != -1)
 int index = AsSpan().Slice(start, count).IndexOf(c);
 if (index >= 0)
 {
 index -= Offset;
 index += start;
 }

 return index;
Expand DownExpand Up@@ -552,18 +545,7 @@ public int IndexOfAny(char[] anyOf)
 /// <returns>The zero-based index position of value if that character is found, or -1 if it is not.</returns>
 public int LastIndexOf(char value)
 {
 int index = -1;

 if (HasValue)
 {
 index = Buffer.LastIndexOf(value, Offset + Length - 1, Length);
 if (index != -1)
 {
 index -= Offset;
 }
 }

 return index;
 return AsSpan().LastIndexOf(value);
 }

 /// <summary>
Expand All@@ -576,54 +558,40 @@ public int LastIndexOf(char value)
 /// Removes all leading whitespaces.
 /// </summary>
 /// <returns>The trimmed <see cref="StringSegment"/>.</returns>
 public unsafe StringSegment TrimStart()
 public StringSegment TrimStart()
 {
 int trimmedStart = Offset;
 int length = Offset + Length;
 ReadOnlySpan<char> span = AsSpan();

 fixed (char* p = Buffer)
 int i;
 for (i = 0; i < span.Length; i++)
 {
while (trimmedStart < length)
if (!char.IsWhiteSpace(span[i]))
 {
 char c = p[trimmedStart];

 if (!char.IsWhiteSpace(c))
 {
 break;
 }

 trimmedStart++;
 break;
 }
 }

 return new StringSegment(Buffer, trimmedStart, length - trimmedStart);
 return Subsegment(i);
 }

 /// <summary>
 /// Removes all trailing whitespaces.
 /// </summary>
 /// <returns>The trimmed <see cref="StringSegment"/>.</returns>
 public unsafe StringSegment TrimEnd()
 public StringSegment TrimEnd()
 {
 int offset = Offset;
 int trimmedEnd = offset + Length - 1;
 ReadOnlySpan<char> span = AsSpan();

 fixed (char* p = Buffer)
 int i;
 for (i = span.Length - 1; i >= 0; i--)
 {
while (trimmedEnd >= offset)
if (!char.IsWhiteSpace(span[i]))
 {
 char c = p[trimmedEnd];

 if (!char.IsWhiteSpace(c))
 {
 break;
 }

 trimmedEnd--;
 break;
 }
 }

 return new StringSegment(Buffer, offset, trimmedEnd - offset + 1);
 return Subsegment(0, i + 1);
 }

 /// <summary>
Expand DownExpand Up@@ -664,6 +632,15 @@ public override string ToString()
 return Value ?? string.Empty;
 }

 private static void CheckStringComparison(StringComparison comparisonType)
 {
 // Single comparison to check if comparisonType is within [CurrentCulture .. OrdinalIgnoreCase]
 if ((uint)comparisonType > (uint)StringComparison.OrdinalIgnoreCase)
 {
 ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.comparisonType);
 }
 }

 // Methods that do no return (i.e. throw) are not inlined
 // https://github.com/dotnet/coreclr/pull/6103
 private static void ThrowInvalidArguments(string buffer, int offset, int length)
Expand DownExpand Up@@ -716,5 +693,14 @@ Exception GetInvalidArgumentsException(bool hasValue)
 return ThrowHelper.GetArgumentException(ExceptionResource.Argument_InvalidOffsetLengthStringSegment);
 }
 }

 /// <inheritdoc />
 bool IEquatable<string>.Equals(string other)
 {
 // Explicit interface implementation for IEquatable<string> because
 // the interface's Equals method allows null strings, which we return
 // as not-equal.
 return other != null && Equals(other);
 }
 }
}

3 changes: 2 additions & 1 deletion
src/libraries/Microsoft.Extensions.Primitives/src/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,8 @@ internal enum ExceptionArgument
 index,
 value,
 capacity,
 separators
 separators,
 comparisonType
 }

 internal enum ExceptionResource
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix offset + globalization issues in StringSegment#45022

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

 Merged

GrabYourPitchforks
merged 7 commits into

from

Jan 23, 2021
 Merged


Fix offset + globalization issues in StringSegment
#45022
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
d8363af

Nullable-enable StringSegment


GrabYourPitchforks Nov 20, 2020
f3ba50c

Fix glob issues in StringSegment


GrabYourPitchforks Nov 20, 2020
daccefe

Remove nullable annotations from StringSegment


GrabYourPitchforks Nov 20, 2020
c2c7a5f

Merge remote-tracking branch 'origin/master' into stringsegment


GrabYourPitchforks Jan 20, 2021
f94fd97

Code cleanup, perf improvements, improve globalization tests


GrabYourPitchforks Jan 21, 2021
42f6f02

Simplify TrimEnd logic


GrabYourPitchforks Jan 22, 2021
58a99bb

skip some glob tests on netfx


GrabYourPitchforks Jan 23, 2021

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


138 changes: 62 additions & 76 deletions
src/libraries/Microsoft.Extensions.Primitives/src/StringSegment.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,24 +146,20 @@ public char this[int index]
 /// </returns>
 public static int Compare(StringSegment a, StringSegment b, StringComparison comparisonType)
 {
 int minLength = Math.Min(a.Length, b.Length);
 int diff = string.Compare(a.Buffer, a.Offset, b.Buffer, b.Offset, minLength, comparisonType);
 if (diff == 0)
 if (a.HasValue && b.HasValue)
 {
 diff = a.Length - b.Length;
 return a.AsSpan().CompareTo(b.AsSpan(), comparisonType);
 }
 else
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return !a.HasValue ? (b.HasValue ? -1 : 0) : 1; // null sorts less than non-null, and two nulls sort as equal
Comment thread
GrabYourPitchforks marked this conversation as resolved.

 }

 return diff;
 }

 /// <inheritdoc />
 public override bool Equals(object obj)
 {
 if (obj is null)
 {
 return false;
 }

 return obj is StringSegment segment && Equals(segment);
 }

Expand All@@ -182,12 +178,15 @@ public override bool Equals(object obj)
 /// <returns><see langword="true" /> if the current object is equal to the other parameter; otherwise, <see langword="false" />.</returns>
 public bool Equals(StringSegment other, StringComparison comparisonType)
 {
 if (Length != other.Length)
 if (HasValue && other.HasValue)
 {
 return false;
 return AsSpan().Equals(other.AsSpan(), comparisonType);
 }
 else
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return !HasValue && !other.HasValue; // only return true if both are null
 }

 return string.Compare(Buffer, Offset, other.Buffer, other.Offset, other.Length, comparisonType) == 0;
 }

 // This handles StringSegment.Equals(string, StringSegment, StringComparison) and StringSegment.Equals(StringSegment, string, StringComparison)
Expand DownExpand Up@@ -232,20 +231,20 @@ public bool Equals(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 int textLength = text.Length;
 if (!HasValue || Length != textLength)
 if (!HasValue)
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return string.Compare(Buffer, Offset, text, 0, textLength, comparisonType) == 0;
 return AsSpan().Equals(text.AsSpan(), comparisonType);
 }

 /// <inheritdoc />
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public override int GetHashCode()
 {
#if NETCOREAPP || NETSTANDARD2_1
#if NETCOREAPP
 return string.GetHashCode(AsSpan());
#elif (NETSTANDARD2_0 || NETFRAMEWORK)
 // This GetHashCode is expensive since it allocates on every call.
Expand All@@ -255,7 +254,6 @@ public override int GetHashCode()
#else
#error Target frameworks need to be updated.
#endif

 }

 /// <summary>
Expand DownExpand Up@@ -310,15 +308,13 @@ public bool StartsWith(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 bool result = false;
 int textLength = text.Length;

 if (HasValue && Length >= textLength)
 if (!HasValue)
 {
 result = string.Compare(Buffer, Offset, text, 0, textLength, comparisonType) == 0;
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return result;
 return AsSpan().StartsWith(text.AsSpan(), comparisonType);
 }

 /// <summary>
Expand All@@ -338,16 +334,13 @@ public bool EndsWith(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 bool result = false;
 int textLength = text.Length;
 int comparisonLength = Offset + Length - textLength;

 if (HasValue && comparisonLength > 0)
 if (!HasValue)
 {
 result = string.Compare(Buffer, comparisonLength, text, 0, textLength, comparisonType) == 0;
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return result;
 return AsSpan().EndsWith(text.AsSpan(), comparisonType);
 }

 /// <summary>
Expand DownExpand Up@@ -445,10 +438,10 @@ public int IndexOf(char c, int start, int count)
 ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.count);
 }

 int index = Buffer.IndexOf(c, offset, count);
 if (index != -1)
 int index = AsSpan().Slice(start, count).IndexOf(c);
 if (index >= 0)
 {
 index -= Offset;
 index += start;
 }

 return index;
Expand DownExpand Up@@ -552,18 +545,7 @@ public int IndexOfAny(char[] anyOf)
 /// <returns>The zero-based index position of value if that character is found, or -1 if it is not.</returns>
 public int LastIndexOf(char value)
 {
 int index = -1;

 if (HasValue)
 {
 index = Buffer.LastIndexOf(value, Offset + Length - 1, Length);
 if (index != -1)
 {
 index -= Offset;
 }
 }

 return index;
 return AsSpan().LastIndexOf(value);
 }

 /// <summary>
Expand All@@ -576,54 +558,40 @@ public int LastIndexOf(char value)
 /// Removes all leading whitespaces.
 /// </summary>
 /// <returns>The trimmed <see cref="StringSegment"/>.</returns>
 public unsafe StringSegment TrimStart()
 public StringSegment TrimStart()
 {
 int trimmedStart = Offset;
 int length = Offset + Length;
 ReadOnlySpan<char> span = AsSpan();

 fixed (char* p = Buffer)
 int i;
 for (i = 0; i < span.Length; i++)
 {
while (trimmedStart < length)
if (!char.IsWhiteSpace(span[i]))
 {
 char c = p[trimmedStart];

 if (!char.IsWhiteSpace(c))
 {
 break;
 }

 trimmedStart++;
 break;
 }
 }

 return new StringSegment(Buffer, trimmedStart, length - trimmedStart);
 return Subsegment(i);
 }

 /// <summary>
 /// Removes all trailing whitespaces.
 /// </summary>
 /// <returns>The trimmed <see cref="StringSegment"/>.</returns>
 public unsafe StringSegment TrimEnd()
 public StringSegment TrimEnd()
 {
 int offset = Offset;
 int trimmedEnd = offset + Length - 1;
 ReadOnlySpan<char> span = AsSpan();

 fixed (char* p = Buffer)
 int i;
 for (i = span.Length - 1; i >= 0; i--)
 {
while (trimmedEnd >= offset)
if (!char.IsWhiteSpace(span[i]))
 {
 char c = p[trimmedEnd];

 if (!char.IsWhiteSpace(c))
 {
 break;
 }

 trimmedEnd--;
 break;
 }
 }

 return new StringSegment(Buffer, offset, trimmedEnd - offset + 1);
 return Subsegment(0, i + 1);
 }

 /// <summary>
Expand DownExpand Up@@ -664,6 +632,15 @@ public override string ToString()
 return Value ?? string.Empty;
 }

 private static void CheckStringComparison(StringComparison comparisonType)
 {
 // Single comparison to check if comparisonType is within [CurrentCulture .. OrdinalIgnoreCase]
 if ((uint)comparisonType > (uint)StringComparison.OrdinalIgnoreCase)
 {
 ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.comparisonType);
 }
 }

 // Methods that do no return (i.e. throw) are not inlined
 // https://github.com/dotnet/coreclr/pull/6103
 private static void ThrowInvalidArguments(string buffer, int offset, int length)
Expand DownExpand Up@@ -716,5 +693,14 @@ Exception GetInvalidArgumentsException(bool hasValue)
 return ThrowHelper.GetArgumentException(ExceptionResource.Argument_InvalidOffsetLengthStringSegment);
 }
 }

 /// <inheritdoc />
 bool IEquatable<string>.Equals(string other)
 {
 // Explicit interface implementation for IEquatable<string> because
 // the interface's Equals method allows null strings, which we return
 // as not-equal.
 return other != null && Equals(other);
 }
 }
}

3 changes: 2 additions & 1 deletion
src/libraries/Microsoft.Extensions.Primitives/src/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,8 @@ internal enum ExceptionArgument
 index,
 value,
 capacity,
 separators
 separators,
 comparisonType
 }

 internal enum ExceptionResource
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix offset + globalization issues in StringSegment#45022

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

 Merged

GrabYourPitchforks
merged 7 commits into

from

Jan 23, 2021
 Merged


Fix offset + globalization issues in StringSegment
#45022
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
d8363af

Nullable-enable StringSegment


GrabYourPitchforks Nov 20, 2020
f3ba50c

Fix glob issues in StringSegment


GrabYourPitchforks Nov 20, 2020
daccefe

Remove nullable annotations from StringSegment


GrabYourPitchforks Nov 20, 2020
c2c7a5f

Merge remote-tracking branch 'origin/master' into stringsegment


GrabYourPitchforks Jan 20, 2021
f94fd97

Code cleanup, perf improvements, improve globalization tests


GrabYourPitchforks Jan 21, 2021
42f6f02

Simplify TrimEnd logic


GrabYourPitchforks Jan 22, 2021
58a99bb

skip some glob tests on netfx


GrabYourPitchforks Jan 23, 2021

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


138 changes: 62 additions & 76 deletions
src/libraries/Microsoft.Extensions.Primitives/src/StringSegment.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,24 +146,20 @@ public char this[int index]
 /// </returns>
 public static int Compare(StringSegment a, StringSegment b, StringComparison comparisonType)
 {
 int minLength = Math.Min(a.Length, b.Length);
 int diff = string.Compare(a.Buffer, a.Offset, b.Buffer, b.Offset, minLength, comparisonType);
 if (diff == 0)
 if (a.HasValue && b.HasValue)
 {
 diff = a.Length - b.Length;
 return a.AsSpan().CompareTo(b.AsSpan(), comparisonType);
 }
 else
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return !a.HasValue ? (b.HasValue ? -1 : 0) : 1; // null sorts less than non-null, and two nulls sort as equal
Comment thread
GrabYourPitchforks marked this conversation as resolved.

 }

 return diff;
 }

 /// <inheritdoc />
 public override bool Equals(object obj)
 {
 if (obj is null)
 {
 return false;
 }

 return obj is StringSegment segment && Equals(segment);
 }

Expand All@@ -182,12 +178,15 @@ public override bool Equals(object obj)
 /// <returns><see langword="true" /> if the current object is equal to the other parameter; otherwise, <see langword="false" />.</returns>
 public bool Equals(StringSegment other, StringComparison comparisonType)
 {
 if (Length != other.Length)
 if (HasValue && other.HasValue)
 {
 return false;
 return AsSpan().Equals(other.AsSpan(), comparisonType);
 }
 else
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return !HasValue && !other.HasValue; // only return true if both are null
 }

 return string.Compare(Buffer, Offset, other.Buffer, other.Offset, other.Length, comparisonType) == 0;
 }

 // This handles StringSegment.Equals(string, StringSegment, StringComparison) and StringSegment.Equals(StringSegment, string, StringComparison)
Expand DownExpand Up@@ -232,20 +231,20 @@ public bool Equals(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 int textLength = text.Length;
 if (!HasValue || Length != textLength)
 if (!HasValue)
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return string.Compare(Buffer, Offset, text, 0, textLength, comparisonType) == 0;
 return AsSpan().Equals(text.AsSpan(), comparisonType);
 }

 /// <inheritdoc />
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public override int GetHashCode()
 {
#if NETCOREAPP || NETSTANDARD2_1
#if NETCOREAPP
 return string.GetHashCode(AsSpan());
#elif (NETSTANDARD2_0 || NETFRAMEWORK)
 // This GetHashCode is expensive since it allocates on every call.
Expand All@@ -255,7 +254,6 @@ public override int GetHashCode()
#else
#error Target frameworks need to be updated.
#endif

 }

 /// <summary>
Expand DownExpand Up@@ -310,15 +308,13 @@ public bool StartsWith(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 bool result = false;
 int textLength = text.Length;

 if (HasValue && Length >= textLength)
 if (!HasValue)
 {
 result = string.Compare(Buffer, Offset, text, 0, textLength, comparisonType) == 0;
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return result;
 return AsSpan().StartsWith(text.AsSpan(), comparisonType);
 }

 /// <summary>
Expand All@@ -338,16 +334,13 @@ public bool EndsWith(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 bool result = false;
 int textLength = text.Length;
 int comparisonLength = Offset + Length - textLength;

 if (HasValue && comparisonLength > 0)
 if (!HasValue)
 {
 result = string.Compare(Buffer, comparisonLength, text, 0, textLength, comparisonType) == 0;
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return result;
 return AsSpan().EndsWith(text.AsSpan(), comparisonType);
 }

 /// <summary>
Expand DownExpand Up@@ -445,10 +438,10 @@ public int IndexOf(char c, int start, int count)
 ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.count);
 }

 int index = Buffer.IndexOf(c, offset, count);
 if (index != -1)
 int index = AsSpan().Slice(start, count).IndexOf(c);
 if (index >= 0)
 {
 index -= Offset;
 index += start;
 }

 return index;
Expand DownExpand Up@@ -552,18 +545,7 @@ public int IndexOfAny(char[] anyOf)
 /// <returns>The zero-based index position of value if that character is found, or -1 if it is not.</returns>
 public int LastIndexOf(char value)
 {
 int index = -1;

 if (HasValue)
 {
 index = Buffer.LastIndexOf(value, Offset + Length - 1, Length);
 if (index != -1)
 {
 index -= Offset;
 }
 }

 return index;
 return AsSpan().LastIndexOf(value);
 }

 /// <summary>
Expand All@@ -576,54 +558,40 @@ public int LastIndexOf(char value)
 /// Removes all leading whitespaces.
 /// </summary>
 /// <returns>The trimmed <see cref="StringSegment"/>.</returns>
 public unsafe StringSegment TrimStart()
 public StringSegment TrimStart()
 {
 int trimmedStart = Offset;
 int length = Offset + Length;
 ReadOnlySpan<char> span = AsSpan();

 fixed (char* p = Buffer)
 int i;
 for (i = 0; i < span.Length; i++)
 {
while (trimmedStart < length)
if (!char.IsWhiteSpace(span[i]))
 {
 char c = p[trimmedStart];

 if (!char.IsWhiteSpace(c))
 {
 break;
 }

 trimmedStart++;
 break;
 }
 }

 return new StringSegment(Buffer, trimmedStart, length - trimmedStart);
 return Subsegment(i);
 }

 /// <summary>
 /// Removes all trailing whitespaces.
 /// </summary>
 /// <returns>The trimmed <see cref="StringSegment"/>.</returns>
 public unsafe StringSegment TrimEnd()
 public StringSegment TrimEnd()
 {
 int offset = Offset;
 int trimmedEnd = offset + Length - 1;
 ReadOnlySpan<char> span = AsSpan();

 fixed (char* p = Buffer)
 int i;
 for (i = span.Length - 1; i >= 0; i--)
 {
while (trimmedEnd >= offset)
if (!char.IsWhiteSpace(span[i]))
 {
 char c = p[trimmedEnd];

 if (!char.IsWhiteSpace(c))
 {
 break;
 }

 trimmedEnd--;
 break;
 }
 }

 return new StringSegment(Buffer, offset, trimmedEnd - offset + 1);
 return Subsegment(0, i + 1);
 }

 /// <summary>
Expand DownExpand Up@@ -664,6 +632,15 @@ public override string ToString()
 return Value ?? string.Empty;
 }

 private static void CheckStringComparison(StringComparison comparisonType)
 {
 // Single comparison to check if comparisonType is within [CurrentCulture .. OrdinalIgnoreCase]
 if ((uint)comparisonType > (uint)StringComparison.OrdinalIgnoreCase)
 {
 ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.comparisonType);
 }
 }

 // Methods that do no return (i.e. throw) are not inlined
 // https://github.com/dotnet/coreclr/pull/6103
 private static void ThrowInvalidArguments(string buffer, int offset, int length)
Expand DownExpand Up@@ -716,5 +693,14 @@ Exception GetInvalidArgumentsException(bool hasValue)
 return ThrowHelper.GetArgumentException(ExceptionResource.Argument_InvalidOffsetLengthStringSegment);
 }
 }

 /// <inheritdoc />
 bool IEquatable<string>.Equals(string other)
 {
 // Explicit interface implementation for IEquatable<string> because
 // the interface's Equals method allows null strings, which we return
 // as not-equal.
 return other != null && Equals(other);
 }
 }
}

3 changes: 2 additions & 1 deletion
src/libraries/Microsoft.Extensions.Primitives/src/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,8 @@ internal enum ExceptionArgument
 index,
 value,
 capacity,
 separators
 separators,
 comparisonType
 }

 internal enum ExceptionResource
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix offset + globalization issues in StringSegment#45022

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

 Merged

GrabYourPitchforks
merged 7 commits into

from

Jan 23, 2021
 Merged


Fix offset + globalization issues in StringSegment
#45022
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
d8363af

Nullable-enable StringSegment


GrabYourPitchforks Nov 20, 2020
f3ba50c

Fix glob issues in StringSegment


GrabYourPitchforks Nov 20, 2020
daccefe

Remove nullable annotations from StringSegment


GrabYourPitchforks Nov 20, 2020
c2c7a5f

Merge remote-tracking branch 'origin/master' into stringsegment


GrabYourPitchforks Jan 20, 2021
f94fd97

Code cleanup, perf improvements, improve globalization tests


GrabYourPitchforks Jan 21, 2021
42f6f02

Simplify TrimEnd logic


GrabYourPitchforks Jan 22, 2021
58a99bb

skip some glob tests on netfx


GrabYourPitchforks Jan 23, 2021

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


138 changes: 62 additions & 76 deletions
src/libraries/Microsoft.Extensions.Primitives/src/StringSegment.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,24 +146,20 @@ public char this[int index]
 /// </returns>
 public static int Compare(StringSegment a, StringSegment b, StringComparison comparisonType)
 {
 int minLength = Math.Min(a.Length, b.Length);
 int diff = string.Compare(a.Buffer, a.Offset, b.Buffer, b.Offset, minLength, comparisonType);
 if (diff == 0)
 if (a.HasValue && b.HasValue)
 {
 diff = a.Length - b.Length;
 return a.AsSpan().CompareTo(b.AsSpan(), comparisonType);
 }
 else
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return !a.HasValue ? (b.HasValue ? -1 : 0) : 1; // null sorts less than non-null, and two nulls sort as equal
Comment thread
GrabYourPitchforks marked this conversation as resolved.

 }

 return diff;
 }

 /// <inheritdoc />
 public override bool Equals(object obj)
 {
 if (obj is null)
 {
 return false;
 }

 return obj is StringSegment segment && Equals(segment);
 }

Expand All@@ -182,12 +178,15 @@ public override bool Equals(object obj)
 /// <returns><see langword="true" /> if the current object is equal to the other parameter; otherwise, <see langword="false" />.</returns>
 public bool Equals(StringSegment other, StringComparison comparisonType)
 {
 if (Length != other.Length)
 if (HasValue && other.HasValue)
 {
 return false;
 return AsSpan().Equals(other.AsSpan(), comparisonType);
 }
 else
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return !HasValue && !other.HasValue; // only return true if both are null
 }

 return string.Compare(Buffer, Offset, other.Buffer, other.Offset, other.Length, comparisonType) == 0;
 }

 // This handles StringSegment.Equals(string, StringSegment, StringComparison) and StringSegment.Equals(StringSegment, string, StringComparison)
Expand DownExpand Up@@ -232,20 +231,20 @@ public bool Equals(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 int textLength = text.Length;
 if (!HasValue || Length != textLength)
 if (!HasValue)
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return string.Compare(Buffer, Offset, text, 0, textLength, comparisonType) == 0;
 return AsSpan().Equals(text.AsSpan(), comparisonType);
 }

 /// <inheritdoc />
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public override int GetHashCode()
 {
#if NETCOREAPP || NETSTANDARD2_1
#if NETCOREAPP
 return string.GetHashCode(AsSpan());
#elif (NETSTANDARD2_0 || NETFRAMEWORK)
 // This GetHashCode is expensive since it allocates on every call.
Expand All@@ -255,7 +254,6 @@ public override int GetHashCode()
#else
#error Target frameworks need to be updated.
#endif

 }

 /// <summary>
Expand DownExpand Up@@ -310,15 +308,13 @@ public bool StartsWith(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 bool result = false;
 int textLength = text.Length;

 if (HasValue && Length >= textLength)
 if (!HasValue)
 {
 result = string.Compare(Buffer, Offset, text, 0, textLength, comparisonType) == 0;
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return result;
 return AsSpan().StartsWith(text.AsSpan(), comparisonType);
 }

 /// <summary>
Expand All@@ -338,16 +334,13 @@ public bool EndsWith(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 bool result = false;
 int textLength = text.Length;
 int comparisonLength = Offset + Length - textLength;

 if (HasValue && comparisonLength > 0)
 if (!HasValue)
 {
 result = string.Compare(Buffer, comparisonLength, text, 0, textLength, comparisonType) == 0;
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return result;
 return AsSpan().EndsWith(text.AsSpan(), comparisonType);
 }

 /// <summary>
Expand DownExpand Up@@ -445,10 +438,10 @@ public int IndexOf(char c, int start, int count)
 ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.count);
 }

 int index = Buffer.IndexOf(c, offset, count);
 if (index != -1)
 int index = AsSpan().Slice(start, count).IndexOf(c);
 if (index >= 0)
 {
 index -= Offset;
 index += start;
 }

 return index;
Expand DownExpand Up@@ -552,18 +545,7 @@ public int IndexOfAny(char[] anyOf)
 /// <returns>The zero-based index position of value if that character is found, or -1 if it is not.</returns>
 public int LastIndexOf(char value)
 {
 int index = -1;

 if (HasValue)
 {
 index = Buffer.LastIndexOf(value, Offset + Length - 1, Length);
 if (index != -1)
 {
 index -= Offset;
 }
 }

 return index;
 return AsSpan().LastIndexOf(value);
 }

 /// <summary>
Expand All@@ -576,54 +558,40 @@ public int LastIndexOf(char value)
 /// Removes all leading whitespaces.
 /// </summary>
 /// <returns>The trimmed <see cref="StringSegment"/>.</returns>
 public unsafe StringSegment TrimStart()
 public StringSegment TrimStart()
 {
 int trimmedStart = Offset;
 int length = Offset + Length;
 ReadOnlySpan<char> span = AsSpan();

 fixed (char* p = Buffer)
 int i;
 for (i = 0; i < span.Length; i++)
 {
while (trimmedStart < length)
if (!char.IsWhiteSpace(span[i]))
 {
 char c = p[trimmedStart];

 if (!char.IsWhiteSpace(c))
 {
 break;
 }

 trimmedStart++;
 break;
 }
 }

 return new StringSegment(Buffer, trimmedStart, length - trimmedStart);
 return Subsegment(i);
 }

 /// <summary>
 /// Removes all trailing whitespaces.
 /// </summary>
 /// <returns>The trimmed <see cref="StringSegment"/>.</returns>
 public unsafe StringSegment TrimEnd()
 public StringSegment TrimEnd()
 {
 int offset = Offset;
 int trimmedEnd = offset + Length - 1;
 ReadOnlySpan<char> span = AsSpan();

 fixed (char* p = Buffer)
 int i;
 for (i = span.Length - 1; i >= 0; i--)
 {
while (trimmedEnd >= offset)
if (!char.IsWhiteSpace(span[i]))
 {
 char c = p[trimmedEnd];

 if (!char.IsWhiteSpace(c))
 {
 break;
 }

 trimmedEnd--;
 break;
 }
 }

 return new StringSegment(Buffer, offset, trimmedEnd - offset + 1);
 return Subsegment(0, i + 1);
 }

 /// <summary>
Expand DownExpand Up@@ -664,6 +632,15 @@ public override string ToString()
 return Value ?? string.Empty;
 }

 private static void CheckStringComparison(StringComparison comparisonType)
 {
 // Single comparison to check if comparisonType is within [CurrentCulture .. OrdinalIgnoreCase]
 if ((uint)comparisonType > (uint)StringComparison.OrdinalIgnoreCase)
 {
 ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.comparisonType);
 }
 }

 // Methods that do no return (i.e. throw) are not inlined
 // https://github.com/dotnet/coreclr/pull/6103
 private static void ThrowInvalidArguments(string buffer, int offset, int length)
Expand DownExpand Up@@ -716,5 +693,14 @@ Exception GetInvalidArgumentsException(bool hasValue)
 return ThrowHelper.GetArgumentException(ExceptionResource.Argument_InvalidOffsetLengthStringSegment);
 }
 }

 /// <inheritdoc />
 bool IEquatable<string>.Equals(string other)
 {
 // Explicit interface implementation for IEquatable<string> because
 // the interface's Equals method allows null strings, which we return
 // as not-equal.
 return other != null && Equals(other);
 }
 }
}

3 changes: 2 additions & 1 deletion
src/libraries/Microsoft.Extensions.Primitives/src/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,8 @@ internal enum ExceptionArgument
 index,
 value,
 capacity,
 separators
 separators,
 comparisonType
 }

 internal enum ExceptionResource
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix offset + globalization issues in StringSegment#45022

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

 Merged

GrabYourPitchforks
merged 7 commits into

from

Jan 23, 2021
 Merged


Fix offset + globalization issues in StringSegment
#45022
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
d8363af

Nullable-enable StringSegment


GrabYourPitchforks Nov 20, 2020
f3ba50c

Fix glob issues in StringSegment


GrabYourPitchforks Nov 20, 2020
daccefe

Remove nullable annotations from StringSegment


GrabYourPitchforks Nov 20, 2020
c2c7a5f

Merge remote-tracking branch 'origin/master' into stringsegment


GrabYourPitchforks Jan 20, 2021
f94fd97

Code cleanup, perf improvements, improve globalization tests


GrabYourPitchforks Jan 21, 2021
42f6f02

Simplify TrimEnd logic


GrabYourPitchforks Jan 22, 2021
58a99bb

skip some glob tests on netfx


GrabYourPitchforks Jan 23, 2021

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


138 changes: 62 additions & 76 deletions
src/libraries/Microsoft.Extensions.Primitives/src/StringSegment.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,24 +146,20 @@ public char this[int index]
 /// </returns>
 public static int Compare(StringSegment a, StringSegment b, StringComparison comparisonType)
 {
 int minLength = Math.Min(a.Length, b.Length);
 int diff = string.Compare(a.Buffer, a.Offset, b.Buffer, b.Offset, minLength, comparisonType);
 if (diff == 0)
 if (a.HasValue && b.HasValue)
 {
 diff = a.Length - b.Length;
 return a.AsSpan().CompareTo(b.AsSpan(), comparisonType);
 }
 else
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return !a.HasValue ? (b.HasValue ? -1 : 0) : 1; // null sorts less than non-null, and two nulls sort as equal
Comment thread
GrabYourPitchforks marked this conversation as resolved.

 }

 return diff;
 }

 /// <inheritdoc />
 public override bool Equals(object obj)
 {
 if (obj is null)
 {
 return false;
 }

 return obj is StringSegment segment && Equals(segment);
 }

Expand All@@ -182,12 +178,15 @@ public override bool Equals(object obj)
 /// <returns><see langword="true" /> if the current object is equal to the other parameter; otherwise, <see langword="false" />.</returns>
 public bool Equals(StringSegment other, StringComparison comparisonType)
 {
 if (Length != other.Length)
 if (HasValue && other.HasValue)
 {
 return false;
 return AsSpan().Equals(other.AsSpan(), comparisonType);
 }
 else
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return !HasValue && !other.HasValue; // only return true if both are null
 }

 return string.Compare(Buffer, Offset, other.Buffer, other.Offset, other.Length, comparisonType) == 0;
 }

 // This handles StringSegment.Equals(string, StringSegment, StringComparison) and StringSegment.Equals(StringSegment, string, StringComparison)
Expand DownExpand Up@@ -232,20 +231,20 @@ public bool Equals(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 int textLength = text.Length;
 if (!HasValue || Length != textLength)
 if (!HasValue)
 {
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return string.Compare(Buffer, Offset, text, 0, textLength, comparisonType) == 0;
 return AsSpan().Equals(text.AsSpan(), comparisonType);
 }

 /// <inheritdoc />
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public override int GetHashCode()
 {
#if NETCOREAPP || NETSTANDARD2_1
#if NETCOREAPP
 return string.GetHashCode(AsSpan());
#elif (NETSTANDARD2_0 || NETFRAMEWORK)
 // This GetHashCode is expensive since it allocates on every call.
Expand All@@ -255,7 +254,6 @@ public override int GetHashCode()
#else
#error Target frameworks need to be updated.
#endif

 }

 /// <summary>
Expand DownExpand Up@@ -310,15 +308,13 @@ public bool StartsWith(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 bool result = false;
 int textLength = text.Length;

 if (HasValue && Length >= textLength)
 if (!HasValue)
 {
 result = string.Compare(Buffer, Offset, text, 0, textLength, comparisonType) == 0;
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return result;
 return AsSpan().StartsWith(text.AsSpan(), comparisonType);
 }

 /// <summary>
Expand All@@ -338,16 +334,13 @@ public bool EndsWith(string text, StringComparison comparisonType)
 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.text);
 }

 bool result = false;
 int textLength = text.Length;
 int comparisonLength = Offset + Length - textLength;

 if (HasValue && comparisonLength > 0)
 if (!HasValue)
 {
 result = string.Compare(Buffer, comparisonLength, text, 0, textLength, comparisonType) == 0;
 CheckStringComparison(comparisonType); // must arg check before returning
 return false;
 }

 return result;
 return AsSpan().EndsWith(text.AsSpan(), comparisonType);
 }

 /// <summary>
Expand DownExpand Up@@ -445,10 +438,10 @@ public int IndexOf(char c, int start, int count)
 ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.count);
 }

 int index = Buffer.IndexOf(c, offset, count);
 if (index != -1)
 int index = AsSpan().Slice(start, count).IndexOf(c);
 if (index >= 0)
 {
 index -= Offset;
 index += start;
 }

 return index;
Expand DownExpand Up@@ -552,18 +545,7 @@ public int IndexOfAny(char[] anyOf)
 /// <returns>The zero-based index position of value if that character is found, or -1 if it is not.</returns>
 public int LastIndexOf(char value)
 {
 int index = -1;

 if (HasValue)
 {
 index = Buffer.LastIndexOf(value, Offset + Length - 1, Length);
 if (index != -1)
 {
 index -= Offset;
 }
 }

 return index;
 return AsSpan().LastIndexOf(value);
 }

 /// <summary>
Expand All@@ -576,54 +558,40 @@ public int LastIndexOf(char value)
 /// Removes all leading whitespaces.
 /// </summary>
 /// <returns>The trimmed <see cref="StringSegment"/>.</returns>
 public unsafe StringSegment TrimStart()
 public StringSegment TrimStart()
 {
 int trimmedStart = Offset;
 int length = Offset + Length;
 ReadOnlySpan<char> span = AsSpan();

 fixed (char* p = Buffer)
 int i;
 for (i = 0; i < span.Length; i++)
 {
while (trimmedStart < length)
if (!char.IsWhiteSpace(span[i]))
 {
 char c = p[trimmedStart];

 if (!char.IsWhiteSpace(c))
 {
 break;
 }

 trimmedStart++;
 break;
 }
 }

 return new StringSegment(Buffer, trimmedStart, length - trimmedStart);
 return Subsegment(i);
 }

 /// <summary>
 /// Removes all trailing whitespaces.
 /// </summary>
 /// <returns>The trimmed <see cref="StringSegment"/>.</returns>
 public unsafe StringSegment TrimEnd()
 public StringSegment TrimEnd()
 {
 int offset = Offset;
 int trimmedEnd = offset + Length - 1;
 ReadOnlySpan<char> span = AsSpan();

 fixed (char* p = Buffer)
 int i;
 for (i = span.Length - 1; i >= 0; i--)
 {
while (trimmedEnd >= offset)
if (!char.IsWhiteSpace(span[i]))
 {
 char c = p[trimmedEnd];

 if (!char.IsWhiteSpace(c))
 {
 break;
 }

 trimmedEnd--;
 break;
 }
 }

 return new StringSegment(Buffer, offset, trimmedEnd - offset + 1);
 return Subsegment(0, i + 1);
 }

 /// <summary>
Expand DownExpand Up@@ -664,6 +632,15 @@ public override string ToString()
 return Value ?? string.Empty;
 }

 private static void CheckStringComparison(StringComparison comparisonType)
 {
 // Single comparison to check if comparisonType is within [CurrentCulture .. OrdinalIgnoreCase]
 if ((uint)comparisonType > (uint)StringComparison.OrdinalIgnoreCase)
 {
 ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.comparisonType);
 }
 }

 // Methods that do no return (i.e. throw) are not inlined
 // https://github.com/dotnet/coreclr/pull/6103
 private static void ThrowInvalidArguments(string buffer, int offset, int length)
Expand DownExpand Up@@ -716,5 +693,14 @@ Exception GetInvalidArgumentsException(bool hasValue)
 return ThrowHelper.GetArgumentException(ExceptionResource.Argument_InvalidOffsetLengthStringSegment);
 }
 }

 /// <inheritdoc />
 bool IEquatable<string>.Equals(string other)
 {
 // Explicit interface implementation for IEquatable<string> because
 // the interface's Equals method allows null strings, which we return
 // as not-equal.
 return other != null && Equals(other);
 }
 }
}

3 changes: 2 additions & 1 deletion
src/libraries/Microsoft.Extensions.Primitives/src/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,8 @@ internal enum ExceptionArgument
 index,
 value,
 capacity,
 separators
 separators,
 comparisonType
 }

 internal enum ExceptionResource
Expand Down
Loading