Merge pull request #3410 from Roy-Orbison/scss-tags-idents

Remove punctuation from SCSS classes & identifers
universal-ctags · Jun 17, 2022 · 8e3da60 · 8e3da60
2 parents 227c65e + 15434fe
commit 8e3da60
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/Units/parser-scss.r/placeholder.d/expected.tags b/Units/parser-scss.r/placeholder.d/expected.tags
@@ -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
diff --git a/Units/parser-scss.r/selectors.d/expected.tags b/Units/parser-scss.r/selectors.d/expected.tags
@@ -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
diff --git a/Units/parser-scss.r/variable.d/expected.tags b/Units/parser-scss.r/variable.d/expected.tags
@@ -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
diff --git a/optlib/scss.c b/optlib/scss.c
@@ -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",
 	                               "^.",

diff --git a/optlib/scss.ctags b/optlib/scss.ctags
@@ -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/.//