From 9dfc1ddabb9ca1b25fbf92dd22267ffa580ab2d8 Mon Sep 17 00:00:00 2001
From: Darren Burns <darrenb900@gmail.com>
Date: Thu, 3 Feb 2022 13:16:11 +0000
Subject: [PATCH] Variable reference tokens location updated to usage location
 instead of definition location

---
 src/textual/css/parse.py     | 14 +++++++++-----
 src/textual/css/tokenizer.py |  9 +++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/textual/css/parse.py b/src/textual/css/parse.py
index b3b821535..59e5668e5 100644
--- a/src/textual/css/parse.py
+++ b/src/textual/css/parse.py
@@ -210,10 +210,9 @@ def _is_whitespace(token: Token) -> bool:
 def _unresolved(
     variable_name: str, location: tuple[int, int]
 ) -> UnresolvedVariableError:
-    line_no, col = location
+    line_idx, col_idx = location
     return UnresolvedVariableError(
-        f"variable ${variable_name} is not defined. "
-        f"attempted reference at line {line_no}, column {col}."
+        f"reference to undefined variable '${variable_name}' at line {line_idx + 1}, column {col_idx + 1}."
     )
 
 
@@ -260,7 +259,9 @@ def substitute_references(tokens: Iterator[Token]) -> Iterable[Token]:
                         variable_tokens = variables[variable_name]
                         reference_tokens = variables[ref_name]
                         variable_tokens.extend(reference_tokens)
-                        yield from reference_tokens
+                        ref_location = token.location
+                        for token in reference_tokens:
+                            yield token.with_location(location=ref_location)
                     else:
                         raise _unresolved(
                             variable_name=ref_name, location=token.location
@@ -271,7 +272,10 @@ def substitute_references(tokens: Iterator[Token]) -> Iterable[Token]:
         elif token.name == "variable_ref":
             variable_name = token.value[1:]  # Trim the $, so $x -> x
             if variable_name in variables:
-                yield from variables[variable_name]
+                variable_tokens = variables[variable_name]
+                ref_location = token.location
+                for token in variable_tokens:
+                    yield token.with_location(ref_location)
             else:
                 raise _unresolved(variable_name=variable_name, location=token.location)
         else:
diff --git a/src/textual/css/tokenizer.py b/src/textual/css/tokenizer.py
index 7746b9fd3..c15d9379a 100644
--- a/src/textual/css/tokenizer.py
+++ b/src/textual/css/tokenizer.py
@@ -46,6 +46,15 @@ class Token(NamedTuple):
     code: str
     location: tuple[int, int]
 
+    def with_location(self, location: tuple[int, int]) -> "Token":
+        return Token(
+            name=self.name,
+            value=self.value,
+            path=self.path,
+            code=self.code,
+            location=location,
+        )
+
     def __str__(self) -> str:
         return self.value