Skip to content

Allow escaped characters in css selectors #289

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Allow escaped characters in css selectors #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c046c8
fixes escaped characters in css selectors
Dec 26, 2020
ed0e8ea
Add @, :, and / for completion providers regexs
Dec 27, 2020
66db0b0
Add escaped characters support for emmet provider
Dec 27, 2020
247b72f
Fix capturing unwanted pseudo selectors like `:hover`, `:focus`, etc
canvasplay Aug 17, 2021
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
12 changes: 6 additions & 6 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,29 +141,29 @@ const registerHTMLProviders = (disposables: Disposable[]) =>
workspace.getConfiguration()
?.get<string[]>(Configuration.HTMLLanguages)
?.forEach((extension) => {
disposables.push(registerCompletionProvider(extension, /class=["|']([\w- ]*$)/));
disposables.push(registerCompletionProvider(extension, /class=["|']([\w-@:\/ ]*$)/));
});

const registerCSSProviders = (disposables: Disposable[]) =>
const registerCSSProviders = (disposables: Disposable[]) =>
workspace.getConfiguration()
.get<string[]>(Configuration.CSSLanguages)
?.forEach((extension) => {
// The @apply rule was a CSS proposal which has since been abandoned,
// check the proposal for more info: http://tabatkins.github.io/specs/css-apply-rule/
// Its support should probably be removed
disposables.push(registerCompletionProvider(extension, /@apply ([.\w- ]*$)/, "."));
disposables.push(registerCompletionProvider(extension, /@apply ([.\w-@:\/ ]*$)/, "."));
});

const registerJavaScriptProviders = (disposables: Disposable[]) =>
workspace.getConfiguration()
.get<string[]>(Configuration.JavaScriptLanguages)
?.forEach((extension) => {
disposables.push(registerCompletionProvider(extension, /className=["|']([\w- ]*$)/));
disposables.push(registerCompletionProvider(extension, /class=["|']([\w- ]*$)/));
disposables.push(registerCompletionProvider(extension, /className=["|']([\w-@:\/ ]*$)/));
disposables.push(registerCompletionProvider(extension, /class=["|']([\w-@:\/ ]*$)/));
});

function registerEmmetProviders(disposables: Disposable[]) {
const emmetRegex = /(?=\.)([\w-. ]*$)/;
const emmetRegex = /(?=\.)([\w-@:\/. ]*$)/;

const registerProviders = (modes: string[]) => {
modes.forEach((language) => {
Expand Down
6 changes: 3 additions & 3 deletions src/parse-engines/common/css-class-extractor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default class CssClassExtractor {
* @description Extracts class names from CSS AST
*/
public static extract(ast: css.Stylesheet): CssClassDefinition[] {
const classNameRegex = /[.]([\w-]+)/g;
const classNameRegex = /[.](([\w-]|\\[@:/])+)/g;

const definitions: CssClassDefinition[] = [];

Expand All @@ -15,7 +15,7 @@ export default class CssClassExtractor {
rule.selectors?.forEach((selector: string) => {
let item: RegExpExecArray | null = classNameRegex.exec(selector);
while (item) {
definitions.push(new CssClassDefinition(item[1]));
definitions.push(new CssClassDefinition(item[1].replace("\\", "")));
item = classNameRegex.exec(selector);
}
});
Expand All @@ -35,4 +35,4 @@ export default class CssClassExtractor {
});
return definitions;
}
}
}