- Fix Position.ToString() and Range.ToString() implementation

- Use `Range.ToString()` in tests
- Add test case for `\r\n` line break (test fails).

Author: AlexanderSher

src/Analysis/Engine/Impl/Definitions/Position.cs

@@ -40,6 +40,6 @@ public struct Position {
         public static bool operator >(Position p1, Position p2) => p1.line > p2.line || p1.line == p2.line && p1.character > p2.character;
         public static bool operator <(Position p1, Position p2) => p1.line < p2.line || p1.line == p2.line && p1.character < p2.character;
 
-        public override string ToString() => ((SourceLocation)this).ToString();
+        public override string ToString() => $"({line}, {character})";
     }
 }

src/Analysis/Engine/Impl/Definitions/Range.cs

@@ -24,6 +24,6 @@ public struct Range {
         public static implicit operator SourceSpan(Range r) => new SourceSpan(r.start, r.end);
         public static implicit operator Range(SourceSpan span) => new Range { start = span.Start, end = span.End };
 
-        public override string ToString() => ((SourceSpan)this).ToString();
+        public override string ToString() => $"{start} - {end}";
     }
 }

src/Analysis/Engine/Test/FluentAssertions/AssertionsUtilities.cs

@@ -186,10 +186,6 @@ public static string GetName(object value) {
                     return scope.Name;
                 case IAnalysisValue analysisValue:
                     return $"value {analysisValue.Name}";
-                case Range range:
-                    return $"({range.start.line}, {range.start.character}) - ({range.end.line}, {range.end.character})";
-                case Position position:
-                    return $"({position.line}, {position.character})";
                 case string str:
                     return str;
                 default:

src/Analysis/Engine/Test/FluentAssertions/ReferenceCollectionAssertions.cs

@@ -87,7 +87,7 @@ public AndConstraint<ReferenceCollectionAssertions> OnlyHaveReferences(IEnumerab
         }
 
         private static string Format((Uri uri, (int, int, int, int) range, ReferenceKind? kind) reference) 
-            => $"({TestData.GetTestRelativePath(reference.uri)}, {GetName(reference.range)}, {reference.kind})";
+            => $"({TestData.GetTestRelativePath(reference.uri)}, {reference.range.ToString()}, {reference.kind})";
 
         [CustomAssertion]
         public AndConstraint<ReferenceCollectionAssertions> HaveReferenceAt(Uri documentUri, int startLine, int startCharacter, int endLine, int endCharacter, ReferenceKind? referenceKind = null, string because = "", params object[] reasonArgs) {
@@ -119,18 +119,18 @@ private string FindReference(Uri documentUri, string moduleName, Range range, Re
 
             foreach (var candidate in candidates.Where(c => RangeEquals(c.range, range))) {
                 return referenceKind.HasValue && candidate._kind != referenceKind
-                    ? $"Expected {GetSubjectName()} to have reference of type '{referenceKind}'{{reason}}, but reference in module '{moduleName}' at {GetName(range)} has type '{candidate._kind}'"
+                    ? $"Expected {GetSubjectName()} to have reference of type '{referenceKind}'{{reason}}, but reference in module '{moduleName}' at {range.ToString()} has type '{candidate._kind}'"
                     : string.Empty;
             }
 
-            var errorMessage = $"Expected {GetSubjectName()} to have reference at {GetName(range)}{{reason}}, but module '{moduleName}' has no references at that range.";
+            var errorMessage = $"Expected {GetSubjectName()} to have reference at {range.ToString()}{{reason}}, but module '{moduleName}' has no references at that range.";
             if (!referenceKind.HasValue) {
                 return errorMessage;
             }
 
             var matchingTypes = candidates.Where(av => av._kind == referenceKind).ToArray();
             var matchingTypesString = matchingTypes.Length > 0
-                ? $"References that match type '{referenceKind}' have spans {string.Join(" ,", matchingTypes.Select(av => GetName(av.range)))}"
+                ? $"References that match type '{referenceKind}' have spans {string.Join(" ,", matchingTypes.Select(av => av.range.ToString()))}"
                 : $"There are no references with type '{referenceKind}' either";
 
             return $"{errorMessage} {matchingTypesString}";

src/Analysis/Engine/Test/FluentAssertions/TextEditCollectionAssertions.cs

@@ -52,7 +52,7 @@ public AndConstraint<TextEditCollectionAssertions> OnlyHaveTextEdits(IEnumerable
                 .ToArray();
 
             if (excess.Length > 0) {
-                var excessString = string.Join(", ", excess.Select(((string text, (int, int, int, int) range) te) => $"({te.text}, {GetName(te.range)})"));
+                var excessString = string.Join(", ", excess.Select(((string text, (int, int, int, int) range) te) => $"({te.text}, {te.range.ToString()})"));
                 var errorMessage = expected.Length > 1
                     ? $"Expected {GetSubjectName()} to have only {expected.Length} textEdits{{reason}}, but it also has textEdits: {excessString}."
                     : expected.Length > 0
@@ -76,7 +76,7 @@ public AndConstraint<TextEditCollectionAssertions> HaveTextEditAt(string expecte
             if (errorMessage != string.Empty) {
                 var assertion = Execute.Assertion.BecauseOf(because, reasonArgs);
                 assertion.AddNonReportable("expectedText", expectedText);
-                assertion.AddNonReportable("expectedRange", GetName(expectedRange));
+                assertion.AddNonReportable("expectedRange", range);
                 assertion.AddNonReportable("currentTexts", GetQuotedNames(Subject.Select(te => te.newText)));
                 assertion.FailWith(errorMessage);
             }
@@ -94,14 +94,14 @@ private string GetHaveTextEditErrorMessage(string expectedText, Range expectedRa
 
             var candidatesWithRange = candidates.Where(c => RangeEquals(c.range, expectedRange)).ToArray();
             if (candidatesWithRange.Length > 1) {
-                return $"Expected {{context:subject}} to have only one text edit with newText '{{expectedText}}' a nd range {{expectedRange}}{{reason}}, but there are {candidatesWithRange.Length}";
+                return $"Expected {{context:subject}} to have only one text edit with newText '{{expectedText}}' and range {{expectedRange}}{{reason}}, but there are {candidatesWithRange.Length}";
             }
 
             if (candidatesWithRange.Length == 0) {
                 return "Expected {context:subject} to have text edit with newText \'{expectedText}\' in range {expectedRange}{reason}, but "
-                    + (candidatesWithRange.Length == 1 
-                        ? $"it has range {GetName(candidatesWithRange[0].range)}" 
-                        : $"they are in ranges {string.Join(", ", candidatesWithRange.Select(te => GetName(te.range)))}");
+                    + (candidates.Length == 1 
+                        ? $"it has range {candidates[0].range.ToString()}" 
+                        : $"they are in ranges {string.Join(", ", candidates.Select(te => te.range.ToString()))}");
             }
 
             return string.Empty;

src/Analysis/Engine/Test/LineFormatterTests.cs

@@ -348,12 +348,16 @@ public void LineContinuation() {
             AssertSingleLineFormat("a+b+ \\\n", "a + b + \\");
         }
 
-        [DataRow("foo.a() \\\n   .b() \\\n   .c()", "foo.a() \\", 0, 0)]
-        [DataRow("foo.a() \\\n   .b() \\\n   .c()", ".b() \\", 1, 3)]
-        [DataRow("foo.a() \\\n   .b() \\\n   .c()", ".c()", 2, 3)]
+        [DataRow("foo.a() \\\n   .b() \\\n   .c()", "foo.a() \\", 0, 0, 9)]
+        [DataRow("foo.a() \\\r\n   .b() \\\r\n   .c()", "foo.a() \\", 0, 0, 9)]
+        [DataRow("foo.a() \\\n   .b() \\\n   .c()", ".b() \\", 1, 3, 9)]
+        [DataRow("foo.a() \\\r\n   .b() \\\r\n   .c()", ".b() \\", 1, 3, 9)]
+        [DataRow("foo.a() \\\n   .b() \\\n   .c()", ".c()", 2, 3, 7)]
+        [DataRow("foo.a() \\\r\n   .b() \\\r\n   .c()", ".c()", 2, 3, 7)]
         [DataTestMethod, Priority(0)]
-        public void MultilineChainedCall(string code, string expected, int line, int editStart) {
-            AssertSingleLineFormat(code, expected, line: line, editStart: editStart);
+        public void MultilineChainedCall(string code, string expected, int line, int characterStart, int characterEnd) {
+            var edits = new LineFormatter(new StringReader(code), PythonLanguageVersion.V36).FormatLine(line + 1);
+            edits.Should().OnlyHaveTextEdit(expected, (line, characterStart, line, characterEnd));
         }