Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix nested var values #32

Merged
merged 1 commit into from
Jun 28, 2024
Merged

Fix nested var values #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Unreleased
* Add `backdrop-filter` support
* Fix nested `var` values

## 0.6.1 - Fast Follow
* Fix regex compatibility error for animation names in Sublime Text 2
Expand Down
13 changes: 13 additions & 0 deletions Syntaxes/Better Less.YAML-tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ repository:
patterns:
- include: '#less-strings'
- include: '#less-variables'
- include: '#var-function'
- include: '#comma-delimiter'
- include: '#percentage-type'
- include: '#number-type'
Expand All @@ -370,6 +371,7 @@ repository:
patterns:
- include: '#less-strings'
- include: '#less-variables'
- include: '#var-function'
- include: '#comma-delimiter'
- include: '#angle-type'
- include: '#percentage-type'
Expand All @@ -381,6 +383,7 @@ repository:
- include: '#color-functions'
- include: '#less-functions'
- include: '#less-variables'
- include: '#var-function'
- name: support.constant.color.w3c-standard-color-name.less
match: \b(aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow)\b
- name: support.constant.color.w3c-extended-color-keywords.less
Expand Down Expand Up @@ -429,6 +432,7 @@ repository:
patterns:
- include: '#less-strings'
- include: '#less-variables'
- include: '#var-function'
- name: entity.other.counter-name.less
match: (?:--(?:[[-\w][^\x{00}-\x{7F}]]|(?:\\\h{1,6}[\s\t\n\f]?|\\[^\n\f\h]))+|-?(?:[[_a-zA-Z][^\x{00}-\x{7F}]]|(?:\\\h{1,6}[\s\t\n\f]?|\\[^\n\f\h]))(?:[[-\w][^\x{00}-\x{7F}]]|(?:\\\h{1,6}[\s\t\n\f]?|\\[^\n\f\h]))*)
- begin: (?=,)
Expand Down Expand Up @@ -457,6 +461,7 @@ repository:
patterns:
- include: '#less-strings'
- include: '#less-variables'
- include: '#var-function'
- include: '#literal-string'
- include: '#comma-delimiter'
- name: support.constant.property-value.counter-style.less
Expand Down Expand Up @@ -498,6 +503,7 @@ repository:
'0': {name: punctuation.definition.group.begin.less}
end: (?=\))
patterns:
- include: '#var-function'
- include: '#comma-delimiter'
- include: '#number-type'

Expand Down Expand Up @@ -638,6 +644,7 @@ repository:
end: (?=\))
patterns:
- include: '#less-variables'
- include: '#var-function'
- include: '#angle-type'
- include: '#color-values'
- include: '#percentage-type'
Expand All @@ -661,6 +668,7 @@ repository:
end: (?=\))
patterns:
- include: '#less-variables'
- include: '#var-function'
- include: '#color-values'
- include: '#percentage-type'
- include: '#length-type'
Expand Down Expand Up @@ -772,6 +780,7 @@ repository:
end: (?=\))
patterns:
- include: '#less-variables'
- include: '#var-function'
- include: '#comma-delimiter'
- include: '#color-values'

Expand Down Expand Up @@ -808,6 +817,7 @@ repository:
end: (?=\))
patterns:
- include: '#less-variables'
- include: '#var-function'
- include: '#color-values'

less-color-functions:
Expand Down Expand Up @@ -1552,6 +1562,7 @@ repository:
end: (?=\))
patterns:
- include: '#less-variables'
- include: '#var-function'
- include: '#length-type'
- include: '#comma-delimiter'
- name: support.constant.property-value.less
Expand Down Expand Up @@ -1762,6 +1773,7 @@ repository:
- include: '#color-values'
- include: '#property-value-constants'
- include: '#literal-string'
- include: '#comma-delimiter'
- name: keyword.other.important.less
match: (\!)\s*important
captures:
Expand Down Expand Up @@ -2515,6 +2527,7 @@ repository:
- include: '#comma-delimiter'
- include: '#custom-property-name'
- include: '#less-variables'
- include: '#property-values'

vendor-prefix:
name: support.type.vendor-prefix.less
Expand Down
52 changes: 52 additions & 0 deletions Syntaxes/Better Less.tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,6 +1129,10 @@
<key>include</key>
<string>#less-variables</string>
</dict>
<dict>
<key>include</key>
<string>#var-function</string>
</dict>
<dict>
<key>include</key>
<string>#comma-delimiter</string>
Expand Down Expand Up @@ -1193,6 +1197,10 @@
<key>include</key>
<string>#less-variables</string>
</dict>
<dict>
<key>include</key>
<string>#var-function</string>
</dict>
<dict>
<key>include</key>
<string>#comma-delimiter</string>
Expand Down Expand Up @@ -1235,6 +1243,10 @@
<key>include</key>
<string>#less-variables</string>
</dict>
<dict>
<key>include</key>
<string>#var-function</string>
</dict>
<dict>
<key>match</key>
<string>\b(aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow)\b</string>
Expand Down Expand Up @@ -1375,6 +1387,10 @@
<key>include</key>
<string>#less-variables</string>
</dict>
<dict>
<key>include</key>
<string>#var-function</string>
</dict>
<dict>
<key>match</key>
<string>(?:--(?:[[-\w][^\x{00}-\x{7F}]]|(?:\\\h{1,6}[\s\t\n\f]?|\\[^\n\f\h]))+|-?(?:[[_a-zA-Z][^\x{00}-\x{7F}]]|(?:\\\h{1,6}[\s\t\n\f]?|\\[^\n\f\h]))(?:[[-\w][^\x{00}-\x{7F}]]|(?:\\\h{1,6}[\s\t\n\f]?|\\[^\n\f\h]))*)</string>
Expand Down Expand Up @@ -1465,6 +1481,10 @@
<key>include</key>
<string>#less-variables</string>
</dict>
<dict>
<key>include</key>
<string>#var-function</string>
</dict>
<dict>
<key>include</key>
<string>#literal-string</string>
Expand Down Expand Up @@ -1602,6 +1622,10 @@
<string>(?=\))</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#var-function</string>
</dict>
<dict>
<key>include</key>
<string>#comma-delimiter</string>
Expand Down Expand Up @@ -2054,6 +2078,10 @@
<key>include</key>
<string>#less-variables</string>
</dict>
<dict>
<key>include</key>
<string>#var-function</string>
</dict>
<dict>
<key>include</key>
<string>#angle-type</string>
Expand Down Expand Up @@ -2134,6 +2162,10 @@
<key>include</key>
<string>#less-variables</string>
</dict>
<dict>
<key>include</key>
<string>#var-function</string>
</dict>
<dict>
<key>include</key>
<string>#color-values</string>
Expand Down Expand Up @@ -2478,6 +2510,10 @@
<key>include</key>
<string>#less-variables</string>
</dict>
<dict>
<key>include</key>
<string>#var-function</string>
</dict>
<dict>
<key>include</key>
<string>#comma-delimiter</string>
Expand Down Expand Up @@ -2594,6 +2630,10 @@
<key>include</key>
<string>#less-variables</string>
</dict>
<dict>
<key>include</key>
<string>#var-function</string>
</dict>
<dict>
<key>include</key>
<string>#color-values</string>
Expand Down Expand Up @@ -5117,6 +5157,10 @@
<key>include</key>
<string>#less-variables</string>
</dict>
<dict>
<key>include</key>
<string>#var-function</string>
</dict>
<dict>
<key>include</key>
<string>#length-type</string>
Expand Down Expand Up @@ -5430,6 +5474,10 @@
<key>include</key>
<string>#literal-string</string>
</dict>
<dict>
<key>include</key>
<string>#comma-delimiter</string>
</dict>
<dict>
<key>captures</key>
<dict>
Expand Down Expand Up @@ -7763,6 +7811,10 @@
<key>include</key>
<string>#less-variables</string>
</dict>
<dict>
<key>include</key>
<string>#property-values</string>
</dict>
</array>
</dict>
</array>
Expand Down
9 changes: 9 additions & 0 deletions Tests/syntax_test_less.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,3 +999,12 @@ div {
.filter {
backdrop-filter: blur(10px);
}

:root {
--off-black: 0, 10, 20;
--text-primary: rgba(var(--off-black), 0.8);
--text-secondary: rgba(var(--off-black), 0.7);
color: rgba(var(--off-black),0.8);
background: #fff;
background: var(--text-primary, rgba(255, 0, 255, 0));
}