Use TextSpan

Author: JohanLarsson

AspNetCoreAnalyzers.Tests/Helpers/UrlTemplateTests.cs

@@ -97,14 +97,15 @@ public async Task<IActionResult> GetOrder([FromRoute]int id)
             Assert.AreEqual("id", parameter.Name.Text);
         }
 
-        [TestCase("orders/{id:alpha}",                               new[] { "orders", "{id:alpha}" })]
-        [TestCase("orders/{id:alpha:minlength(1)}",                  new[] { "orders", "{id:alpha:minlength(1)}" })]
-        [TestCase("orders/{id:minlength(1)}",                        new[] { "orders", "{id:minlength(1)}" })]
-        [TestCase("orders/{id:maxlength(1)}",                        new[] { "orders", "{id:maxlength(1)}" })]
-        [TestCase("orders/{id:length(1)}",                           new[] { "orders", "{id:length(1)}" })]
-        [TestCase("orders/{id:length(1,2)}",                         new[] { "orders", "{id:length(1,2)}" })]
+        [TestCase("orders/{id?}",                                          new[] { "orders", "{id?}" })]
+        [TestCase("orders/{id:alpha}",                                     new[] { "orders", "{id:alpha}" })]
+        [TestCase("orders/{id:alpha:minlength(1)}",                        new[] { "orders", "{id:alpha:minlength(1)}" })]
+        [TestCase("orders/{id:minlength(1)}",                              new[] { "orders", "{id:minlength(1)}" })]
+        [TestCase("orders/{id:maxlength(1)}",                              new[] { "orders", "{id:maxlength(1)}" })]
+        [TestCase("orders/{id:length(1)}",                                 new[] { "orders", "{id:length(1)}" })]
+        [TestCase("orders/{id:length(1,2)}",                               new[] { "orders", "{id:length(1,2)}" })]
         [TestCase("orders/{id:regex(^\\\\d{{3}}-\\\\d{{2}}-\\\\d{{4}}$)}", new[] { "orders", "{id:regex(^\\d{{3}}-\\d{{2}}-\\d{{4}}$)}" })]
-        [TestCase("orders/{id:regex(a/b)}",                          new[] { "orders", "{id:regex(a/b)}" })]
+        [TestCase("orders/{id:regex(a/b)}",                                new[] { "orders", "{id:regex(a/b)}" })]
         ////[TestCase("orders/{id:regex(a[)}/]b)}",                      new[] { "orders", "{id:regex(a[)}/]b)}" })]
         public void TryParseWhenStringParameter(string text, string[] expected)
         {

AspNetCoreAnalyzers/Helpers/TextAndLocation.cs

@@ -11,18 +11,15 @@ public struct TextAndLocation
         public TextAndLocation(LiteralExpressionSyntax literal, int start, int end)
         {
             this.literal = literal;
-            this.Start = start;
-            this.End = end;
+            this.Span = new TextSpan(start, end - start);
             this.Text = literal.Token.ValueText.Substring(start, end - start);
         }
 
-        public int Start { get; }
-
-        public int End { get; }
+        public TextSpan Span { get; }
 
         public string Text { get; }
 
-        public Location Location => Location.Create(this.literal.SyntaxTree, TextSpan.FromBounds(this.literal.SpanStart + this.Start, this.literal.SpanStart + this.End));
+        public Location Location => Location.Create(this.literal.SyntaxTree, this.Span);
 
         public static bool operator ==(TextAndLocation left, TextAndLocation right)
         {
@@ -36,7 +33,7 @@ public TextAndLocation(LiteralExpressionSyntax literal, int start, int end)
 
         public bool Equals(TextAndLocation other)
         {
-            return this.literal.Equals(other.literal) && this.Start == other.Start && this.End == other.End;
+            return this.literal.Equals(other.literal) && this.Span == other.Span;
         }
 
         public override bool Equals(object obj)
@@ -50,15 +47,14 @@ public override int GetHashCode()
             unchecked
             {
                 var hashCode = this.literal.GetHashCode();
-                hashCode = (hashCode * 397) ^ this.Start;
-                hashCode = (hashCode * 397) ^ this.End;
+                hashCode = (hashCode * 397) ^ this.Span.GetHashCode();
                 return hashCode;
             }
         }
 
         internal TextAndLocation Substring(int index, int length)
         {
-            return new TextAndLocation(this.literal, this.Start + index, this.Start + index + length);
+            return new TextAndLocation(this.literal, this.Span.Start + index, this.Span.Start + index + length);
         }
     }
 }

AspNetCoreAnalyzers/Helpers/UrlTemplate.cs

@@ -37,14 +37,14 @@ public static bool TryParse(LiteralExpressionSyntax literal, out UrlTemplate tem
             {
                 var text = literal.Token.ValueText;
                 var builder = ImmutableArray.CreateBuilder<PathSegment>();
-                var start = 0;
-                while (TryParse(literal, text, start, out var component))
+                var pos = 0;
+                while (TryParse(literal, text, pos, out var component))
                 {
                     builder.Add(component);
-                    start = component.Text.End;
+                    pos = component.Text.Span.End;
                 }
 
-                if (start == text.Length)
+                if (pos == text.Length)
                 {
                     template = new UrlTemplate(literal, builder.Count == builder.Capacity ? builder.MoveToImmutable() : builder.ToImmutable());
                     return true;