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, 1 insertions, 2 deletions

diff --git a/src/translators/symbols_generator.rs b/src/translators/symbols_generator.rs
index 6db1d46..d30facd 100644
--- a/src/translators/symbols_generator.rs
+++ b/src/translators/symbols_generator.rs
@@ -11,8 +11,7 @@ pub fn generate_symbols_file(semantic_tokens: &[SemanticToken]) -> String {
             let address = token.bytecode.location.address;
             if address > 0xffff { break; }
             let name = &definition.name;
-            let location = token.source.in_source.as_ref()
-                .unwrap_or(&token.source.in_merged);
+            let location = token.source.location();
             symbols.push_str(&format!("{address:04x} {name} {location}\n"));
         }
     }