dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-19 12:19:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(linter): support vue generic component (#1989)

Browse source 
closes #1938
This commit is contained in:
Boshen 2024-01-11 15:48:56 +08:00 committed by GitHub
parent 4e7b7dad78
commit b7ea4e53fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/oxc_cli/fixtures/vue/debugger.vue
View file

@ -6,6 +6,6 @@
debugger
</script>
<script setup>
<script setup lang="ts" generic="T extends Record<string, string>">
debugger
</script>

25
crates/oxc_linter/src/partial_loader/vue.rs
View file

@ -37,7 +37,7 @@ impl<'a> VuePartialLoader<'a> {
*pointer += offset + SCRIPT_START.len();
// find closing ">"
let offset = self.source_text[*pointer..].find('>')?;
let offset = self.find_script_closing_angle(*pointer)?;
// get ts and jsx attribute
let content = &self.source_text[*pointer..*pointer + offset];
@ -57,6 +57,27 @@ impl<'a> VuePartialLoader<'a> {
SourceType::default().with_module(true).with_typescript(is_ts).with_jsx(is_jsx);
Some(JavaScriptSource::new(source_text, source_type, js_start))
}
/// Find closing angle for situations where there is another `>` in between.
/// e.g. `<script generic="T extends Record<string, string>">`
fn find_script_closing_angle(&self, pointer: usize) -> Option<usize> {
let mut numbers_of_open_angle = 0;
for (offset, c) in self.source_text[pointer..].char_indices() {
match c {
'>' => {
if numbers_of_open_angle == 0 {
return Some(offset);
}
numbers_of_open_angle -= 1;
}
'<' => {
numbers_of_open_angle += 1;
}
_ => {}
}
}
None
}
}
#[cfg(test)]
@ -84,7 +105,7 @@ mod test {
#[test]
fn test_build_vue_with_ts_flag_1() {
let source_text = r#"
<script lang="ts" setup>
<script lang="ts" setup generic="T extends Record<string, string>">
1/1
</script>
"#;