Add location() method to SourceSpan struct

A SourceSpan contains up to two SourceLocations: the location of the
span in the parsed source file (called in_merged), and the location of
the span in an original source file as per a path comment in the parsed
source file (called in_source). In places where only one location can
be reported, the in_source location is preferred but is not guaranteed
to exist, so the in_merged location is used as a fallback.

Because this pattern is used in multiple places, it was added as a
method to SourceSpan and all occurrences of the pattern were replaced
with a method call.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/locators/source.rs b/src/locators/source.rs
index 2f10bd9..20542e3 100644
--- a/src/locators/source.rs
+++ b/src/locators/source.rs
@@ -11,6 +11,12 @@ pub struct SourceSpan {
     pub in_source: Option<SourceLocation>,
 }
 
+impl SourceSpan {
+    pub fn location(&self) -> &SourceLocation {
+        self.in_source.as_ref().unwrap_or(&self.in_merged)
+    }
+}
+
 
 #[derive(Clone)]
 pub struct SourceLocation {