Allow custom preprocessors for 'vue' injections #5268
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kirawi
added
S-waiting-on-review
runtime/queries/vue/injections.scm
Outdated
Comment on lines
11
to
30
| ; <script> | ||
| ((script_element | ||
| (raw_text) @injection.content) | ||
| (#set! injection.language "javascript")) | ||
| (start_tag) @_no_lang | ||
| (raw_text) @injection.content) | ||
| (#not-match? @_no_lang "lang=") | ||
| (#set! injection.language "javascript")) | ||
|
|
||
| ; <script lang="js|javascript"> | ||
| ((script_element | ||
| (start_tag (attribute (quoted_attribute_value (attribute_value) @_lang))) | ||
| (raw_text) @injection.content) | ||
| (#match? @_lang "^(js|javascript)$") | ||
| (#set! injection.language "javascript")) | ||
|
|
||
| ; <script lang="ts|typescript"> | ||
| ((script_element | ||
| (start_tag (attribute (quoted_attribute_value (attribute_value) @_lang))) | ||
| (raw_text) @injection.content) | ||
| (#match? @_lang "^(ts|typescript)$") | ||
| (#set! injection.language "typescript")) |
There was a problem hiding this comment.
I think this can be a little cleaner by matching on the attribute_name:
((script_element
(start_tag
(attribute
(attribute_name) @_attr_name
(quoted_attribute_value (attribute_value) @injection.language)))
(raw_text) @injection.content)
(#eq? @_attr_name "lang"))
((script_element (raw_text) @injection.content)
(#set! injection.language "javascript"))and similar for the style tags
There was a problem hiding this comment.
@the-mikedavis thanks! that is much better. i totally forgot about injection-regex.
i am not sure if you intended this...
((script_element (raw_text) @injection.content)
(#set! injection.language "javascript"))
to act as a fallback for the no-lang case. that doesn't seem to work. it just overwrites the language to js because it will match any form of script tag.
i left in the no-lang query but updated the script/style matches with the lang attribute.
the-mikedavis
approved these changes
Dec 27, 2022
the-mikedavis
changed the title
hadronized
pushed a commit
to hadronized/helix
that referenced
this pull request
Jan 4, 2023
freqmod
pushed a commit
to freqmod/helix
that referenced
this pull request
Feb 8, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes the injections for Vue
scriptandstyletags to allow for custom preprocessors. Before they were hardcoded to plainjavascriptandcss.Vue tooling can specify a preprocessor via the
langattribute.This only adds injections for languages that helix already supports.
e.g.
<script lang="typescript">or very commonly used
<style lang="scss">