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