Skip to content

Fixes #32 Greedy tokenization fix #33

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
Nihlus merged 1 commit into from
Jun 20, 2026
Merged

Fixes #32 Greedy tokenization fix #33

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
7 changes: 6 additions & 1 deletion Remora.Commands/Tokenization/TokenizingEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public ref struct TokenizingEnumerator
{
private readonly TokenizerOptions _tokenizerOptions;
private bool _isInCombinedShortNameSegment;
private bool _isInAssignmentValueSegment;
private ReadOnlySpan<char> _segment;
private SpanSplitEnumerator _splitEnumerator;

Expand All @@ -51,6 +52,7 @@ public TokenizingEnumerator(ReadOnlySpan<char> value, TokenizerOptions? tokenize
_tokenizerOptions = tokenizerOptions ?? new TokenizerOptions();

_isInCombinedShortNameSegment = default;
_isInAssignmentValueSegment = default;
_segment = default;
_splitEnumerator = new SpanSplitEnumerator(value, _tokenizerOptions);
this.Current = default;
Expand All @@ -76,6 +78,7 @@ public bool MoveNext()
}

_isInCombinedShortNameSegment = false;
_isInAssignmentValueSegment = false;
_segment = _splitEnumerator.Current;
}

Expand All @@ -97,9 +100,10 @@ public bool MoveNext()
span = span[1..];
}
}
else if (span.StartsWith("="))
else if (_isInAssignmentValueSegment && span.StartsWith("="))
{
span = span[1..];
_isInAssignmentValueSegment = false;
}
else if (_isInCombinedShortNameSegment)
{
Expand All @@ -123,6 +127,7 @@ public bool MoveNext()
if (assignmentIndex > 0)
{
remainder = span[assignmentIndex..];
_isInAssignmentValueSegment = true;
span = span[..assignmentIndex];
}
}
Expand Down
5 changes: 5 additions & 0 deletions Tests/Remora.Commands.Tests/Tokenization/TokenizingEnumeratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ public class TokenizingEnumeratorTests
[InlineData("-xvf=value", new[] { ShortName, ShortName, ShortName, Value }, new[] { "x", "v", "f", "value" })]
[InlineData("-xvf=\"booga wooga\"", new[] { ShortName, ShortName, ShortName, Value }, new[] { "x", "v", "f", "booga wooga" })]
[InlineData("--a -10", new[] { LongName, Value }, new[] { "a", "-10" })]
[InlineData("1 == 1", new[] { Value, Value, Value }, new[] { "1", "==", "1" })]
[InlineData("1==1", new[] { Value }, new[] { "1==1" })]
[InlineData("--a==", new[] { LongName, Value }, new[] { "a", "=" })]
internal void TokenizesStringCorrectly
(
string value,
Expand Down Expand Up @@ -99,6 +102,8 @@ IEnumerable<string> expectedTokenValues
[InlineData("-xvf=value", new[] { ShortName, ShortName, ShortName, Value }, new[] { "x", "v", "f", "value" })]
[InlineData("-xvf=\"booga wooga\"", new[] { ShortName, ShortName, ShortName, Value }, new[] { "x", "v", "f", "\"booga wooga\"" })]
[InlineData("--a -10", new[] { LongName, Value }, new[] { "a", "-10" })]
[InlineData("1 == 1", new[] { Value, Value, Value }, new[] { "1", "==", "1" })]
[InlineData("--a==", new[] { LongName, Value }, new[] { "a", "=" })]
[InlineData("-a \"\"", new[] { ShortName, Value }, new[] { "a", "\"\"" })]
internal void RetainsQuotationMarksCorrectly
(
Expand Down
Loading