refactor: wrap only the raw-hex hardware-address forms in the literal label (#501)

HARDWARE_ADDRESS wrapped its whole alternation in Labeled(Role.LITERAL),
but two branches — IPV4_ADDR and IPV6_ADDR — are already Labeled (IPv6 also
carries SemanticTag.IPV6). So an IP literal got a redundant second literal
region over the same span. Move the wrapper down onto just the raw-hex forms
(RAW_HARDWARE_ADDRESS) and let the already-labeled IP forms sit beside it, so
every accepted value now colours as exactly one region. No matching change.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: Steve Ramage

src/main/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/semanticdata/optionvalues/grammar/Combinators.kt

@@ -128,18 +128,26 @@ val MAC_ADDRESS = Labeled(Role.LITERAL, AlternativeCombinator(
   hwAddrGroups(HW_ADDR_WORD, DOT, 3),
 ))
 
-// A hardware address as accepted by parse_hw_addr_full with expected_len == 0 (Match=, Link=,
-// Neighbor.LinkLayerAddress=). Besides 6-byte MACs this also accepts 4-, 16- and 20-byte (Infiniband)
-// hardware addresses, and — because the parser first tries in_addr_from_string — plain IPv4 and IPv6
-// address literals. colon/hyphen use 1-byte fields (4/6/16/20 groups); dot uses 2-byte fields
-// (2/3/8/10 groups). Longest group counts come first so the classic (first-full-match) matcher never
-// stops on a shorter prefix.
-val HARDWARE_ADDRESS = Labeled(Role.LITERAL, AlternativeCombinator(
-  IPV6_ADDR,
-  IPV4_ADDR,
+// The raw hex forms of a hardware address (colon/hyphen use 1-byte fields → 4/6/16/20 groups; dot uses
+// 2-byte fields → 2/3/8/10 groups). Longest group counts come first so the classic (first-full-match)
+// matcher never stops on a shorter prefix. Wrapped once so the whole address reads as a single literal
+// span rather than per-field.
+private val RAW_HARDWARE_ADDRESS = Labeled(Role.LITERAL, AlternativeCombinator(
   hwAddrGroups(HW_ADDR_BYTE, COLON, 20), hwAddrGroups(HW_ADDR_BYTE, COLON, 16), hwAddrGroups(HW_ADDR_BYTE, COLON, 6), hwAddrGroups(HW_ADDR_BYTE, COLON, 4),
   hwAddrGroups(HW_ADDR_BYTE, HYPHEN, 20), hwAddrGroups(HW_ADDR_BYTE, HYPHEN, 16), hwAddrGroups(HW_ADDR_BYTE, HYPHEN, 6), hwAddrGroups(HW_ADDR_BYTE, HYPHEN, 4),
   hwAddrGroups(HW_ADDR_WORD, DOT, 10), hwAddrGroups(HW_ADDR_WORD, DOT, 8), hwAddrGroups(HW_ADDR_WORD, DOT, 3), hwAddrGroups(HW_ADDR_WORD, DOT, 2),
 ))
 
+// A hardware address as accepted by parse_hw_addr_full with expected_len == 0 (Match=, Link=,
+// Neighbor.LinkLayerAddress=). Besides 6-byte MACs it accepts 4-, 16- and 20-byte (Infiniband)
+// hardware addresses, and — because the parser first tries in_addr_from_string — plain IPv4 and IPv6
+// address literals. IPV4_ADDR / IPV6_ADDR are already Labeled (IPv6 also carries SemanticTag.IPV6), so
+// they sit alongside the wrapped raw forms rather than inside a second wrapper — a whole-alternation
+// Labeled would emit a redundant second literal region over an IP literal's span.
+val HARDWARE_ADDRESS = AlternativeCombinator(
+  IPV6_ADDR,
+  IPV4_ADDR,
+  RAW_HARDWARE_ADDRESS,
+)
+
 

src/test/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/semanticdata/optionvalues/grammar/MacAddressGrammarTest.kt

@@ -78,9 +78,17 @@ class MacAddressGrammarTest {
 
   @Test
   fun testAddressColorsAsOneLiteralSpan() {
-    // Both combinators are wrapped in Labeled(Role.LITERAL): the whole address is a single literal
-    // span (not coloured per octet / with the separators as operators).
+    // Both combinators wrap the raw hex forms in Labeled(Role.LITERAL): the whole address is a single
+    // literal span (not coloured per octet / with the separators as operators).
     assertEquals(listOf(Region(0, 17, Role.LITERAL)), mac.colorize("00:11:22:33:44:55"))
     assertEquals(listOf(Region(0, 17, Role.LITERAL)), hwAddr.colorize("00-11-22-33-44-55"))
   }
+
+  @Test
+  fun testIpLiteralInHardwareAddressColorsAsOneRegion() {
+    // The raw-hex wrapper is not layered over IPV4_ADDR / IPV6_ADDR (they are already Labeled), so an
+    // IP literal yields exactly one region — its own — carrying the IPv6 tag, not a doubled span.
+    assertEquals(listOf(Region(0, 11, Role.LITERAL, SemanticTag.IPV6)), hwAddr.colorize("2001:db8::1"))
+    assertEquals(listOf(Region(0, 11, Role.LITERAL)), hwAddr.colorize("192.168.1.1"))
+  }
 }