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

fix(linter): fix vue parser not working for multiple scripts after <template> (#1904)

Browse source
This commit is contained in:
Boshen 2024-01-05 22:45:52 +08:00 committed by GitHub
parent 55a87b2e02
commit 24d209cdd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
crates/oxc_linter/src/partial_loader/vue_partial_loader.rs
View file

@ -25,35 +25,35 @@ impl<'a> VuePartialLoader<'a> {
/// * one <script setup> block (excluding normal <script>).
/// https://vuejs.org/api/sfc-spec.html#script
fn parse_scripts(&self) -> Vec<JavaScriptSource<'a>> {
let Some(result1) = self.parse_script(0) else { return vec![] };
let start = result1.source_text.len() + SCRIPT_END.len();
let Some(result2) = self.parse_script(start) else { return vec![result1] };
let mut pointer = 0;
let Some(result1) = self.parse_script(&mut pointer) else { return vec![] };
let Some(result2) = self.parse_script(&mut pointer) else { return vec![result1] };
vec![result1, result2]
}
fn parse_script(&self, start: usize) -> Option<JavaScriptSource<'a>> {
fn parse_script(&self, pointer: &mut usize) -> Option<JavaScriptSource<'a>> {
let script_start_finder = Finder::new(SCRIPT_START);
let script_end_finder = Finder::new(SCRIPT_END);
let mut pointer = start;
// find opening "<script"
let offset = script_start_finder.find(self.source_text[pointer..].as_bytes())?;
pointer += offset + SCRIPT_START.len();
let offset = script_start_finder.find(self.source_text[*pointer..].as_bytes())?;
*pointer += offset + SCRIPT_START.len();
// find closing ">"
let offset = self.source_text[pointer..].find('>')?;
let offset = self.source_text[*pointer..].find('>')?;
// get ts and jsx attribute
let content = &self.source_text[pointer..pointer + offset];
let content = &self.source_text[*pointer..*pointer + offset];
let is_ts = content.contains("ts");
let is_jsx = content.contains("tsx") || content.contains("jsx");
pointer += offset + 1;
let js_start = pointer;
*pointer += offset + 1;
let js_start = *pointer;
// find "</script>"
let offset = script_end_finder.find(self.source_text[pointer..].as_bytes())?;
let js_end = pointer + offset;
let offset = script_end_finder.find(self.source_text[*pointer..].as_bytes())?;
let js_end = *pointer + offset;
*pointer += offset + SCRIPT_END.len();
let source_text = &self.source_text[js_start..js_end];
let source_type =
@ -198,6 +198,7 @@ mod test {
#[test]
fn test_multiple_scripts() {
let source_text = r"
<template></template>
<script>a</script>
<script setup>b</script>
";