@@ -140,7 +140,7 @@ contexts:
141 - match: '(?=([\])};]|\b(else|then)\b))'
141 - match: '(?=([\])};]|\b(else|then)\b))'
142 pop: true
142 pop: true
143− - match: '(?=(\s*\}|\"|\binherit\b|\b[a-zA-Z\_][a-zA-Z0-9\_\''\-]*(\s*\.|\s*=[^=])))'
143+ - match: '(?=(\s*\}|\"|\binherit\b|\b[a-zA-Z\_][a-zA-Z0-9\_\''\-]*(\s*\.|\s*=[^=])|\$\{[a-zA-z0-9\_\''\-]+\}(\s*\.|\s*=[^=])))'
145 - match: '(?=([\])};,]|\b(else|then)\b))'
145 - match: '(?=([\])};,]|\b(else|then)\b))'
146 pop: true
146 pop: true
@@ -563,7 +563,7 @@ contexts:
563 pop: true
563 pop: true
564 - include: string-quoted
564 - include: string-quoted
565 - include: expression-cont
565 - include: expression-cont
566− - match: '([a-zA-Z0-9\.\_\-\+]*(\/[a-zA-Z0-9\.\_\-\+]+)+)'
566+ - match: '(~?[a-zA-Z0-9\.\_\-\+]*(\/[a-zA-Z0-9\.\_\-\+]+)+)'
567 captures:
567 captures:
568 0: string.unquoted.path.nix
568 0: string.unquoted.path.nix