Skip to content

Commit

Permalink
Remove punctuation from SCSS classes & identifiers
Browse files Browse the repository at this point in the history
Prevent appended pseudos as well. This should make the tags file output
more consistent with other language parsers, where the identifiers are
more important than the delimiters that denote their types. This aids
completion in existing tools and across languages (like HTML) where the
delimiters are not used.
  • Loading branch information
Roy-Orbison committed Jun 16, 2022
1 parent 227c65e commit 1cad233
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions Units/parser-scss.r/placeholder.d/expected.tags
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.alert:hover input.scss /^.alert:hover, %strong-alert {$/;" c
%strong-alert input.scss /^.alert:hover, %strong-alert {$/;" P
%strong-alert:hover input.scss /^%strong-alert:hover {$/;" P
%toolbelt input.scss /^%toolbelt {$/;" P
.action-buttons input.scss /^.action-buttons {$/;" c
.reset-buttons input.scss /^.reset-buttons {$/;" c
alert input.scss /^.alert:hover, %strong-alert {$/;" c
strong-alert input.scss /^.alert:hover, %strong-alert {$/;" P
strong-alert input.scss /^%strong-alert:hover {$/;" P
toolbelt input.scss /^%toolbelt {$/;" P
action-buttons input.scss /^.action-buttons {$/;" c
reset-buttons input.scss /^.reset-buttons {$/;" c
8 changes: 4 additions & 4 deletions Units/parser-scss.r/selectors.d/expected.tags
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.alert input.scss /^.alert, .warning {$/;" c
.warning input.scss /^.alert, .warning {$/;" c
.modal-open input.scss /^.modal-open {$/;" c
.modal input.scss /^ .modal {$/;" c
alert input.scss /^.alert, .warning {$/;" c
warning input.scss /^.alert, .warning {$/;" c
modal-open input.scss /^.modal-open {$/;" c
modal input.scss /^ .modal {$/;" c
foo input.scss /^ #foo {$/;" i
4 changes: 2 additions & 2 deletions Units/parser-scss.r/variable.d/expected.tags
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
base-color input.scss /^$base-color: #c6538c;$/;" v
border-dark input.scss /^$border-dark: rgba($base-color, 0.88);$/;" v
.alert input.scss /^.alert {$/;" c
alert input.scss /^.alert {$/;" c
i input.scss /^@for $i from 1 through 3 {$/;" v
sizes input.scss /^$sizes: 40px, 50px, 80px;$/;" v
size input.scss /^@each $size in $sizes {$/;" v
.icon- input.scss /^ .icon-#{$size} {$/;" c
icon- input.scss /^ .icon-#{$size} {$/;" c
6 changes: 3 additions & 3 deletions optlib/scss.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ static void initializeSCSSParser (const langType language)
"^\\$([A-Za-z0-9_-]+)[ \t]*:[^\n]*\n?",
"\\1", "v", "", NULL);
addLanguageTagMultiTableRegex (language, "toplevel",
"^([.][A-Za-z0-9_:-]+)",
"^[.]([A-Za-z0-9_-]+)",
"\\1", "c", "", NULL);
addLanguageTagMultiTableRegex (language, "toplevel",
"^(%[A-Za-z0-9_:-]+)",
"^%([A-Za-z0-9_-]+)",
"\\1", "P", "", NULL);
addLanguageTagMultiTableRegex (language, "toplevel",
"^#([A-Za-z0-9_:-]+)",
"^#([A-Za-z0-9_-]+)",
"\\1", "i", "", NULL);
addLanguageTagMultiTableRegex (language, "toplevel",
"^.",
Expand Down
6 changes: 3 additions & 3 deletions optlib/scss.ctags
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
--_mtable-regex-SCSS=toplevel/:[^\n{]+[;{]\n?//
--_mtable-regex-SCSS=toplevel/\$([A-Za-z0-9_-]+)[ \t]*:[ \t]*\(/\1/v/{tenter=map}
--_mtable-regex-SCSS=toplevel/\$([A-Za-z0-9_-]+)[ \t]*:[^\n]*\n?/\1/v/
--_mtable-regex-SCSS=toplevel/([.][A-Za-z0-9_:-]+)/\1/c/
--_mtable-regex-SCSS=toplevel/(%[A-Za-z0-9_:-]+)/\1/P/
--_mtable-regex-SCSS=toplevel/#([A-Za-z0-9_:-]+)/\1/i/
--_mtable-regex-SCSS=toplevel/[.]([A-Za-z0-9_-]+)/\1/c/
--_mtable-regex-SCSS=toplevel/%([A-Za-z0-9_-]+)/\1/P/
--_mtable-regex-SCSS=toplevel/#([A-Za-z0-9_-]+)/\1/i/
--_mtable-regex-SCSS=toplevel/.//
--_mtable-regex-SCSS=comment/\*\///{tleave}
--_mtable-regex-SCSS=comment/.//
Expand Down

0 comments on commit 1cad233

Please sign in to comment.