Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
50 changes: 50 additions & 0 deletions crates/biome_cli/tests/cases/handle_astro_files.rs
Original file line number Diff line number Diff line change
Expand Up @@ -913,3 +913,53 @@ fn use_import_type_not_triggered_for_enum_in_template() {
result,
));
}

#[test]
fn use_import_type_not_triggered_for_enum_in_template_v2() {
let fs = MemoryFileSystem::default();
let mut console = BufferConsole::default();

fs.insert(
"biome.json".into(),
r#"{ "html": { "linter": {"enabled": true}, "experimentalFullSupportEnabled": true } }"#
.as_bytes(),
);

let file = Utf8Path::new("file.astro");
fs.insert(
file.into(),
r#"---
import { Avatar as AvatarPrimitive } from "bits-ui";
import { cn } from "$lib/utils.js";

let {
ref = $bindable(null),
class: className,
}: AvatarPrimitive.FallbackProps = $props();
---

<!-- used as value here -->
<AvatarPrimitive.Fallback
bind:ref
class="something nice"
/>
"#
.as_bytes(),
);

let (fs, result) = run_cli(
fs,
&mut console,
Args::from(["lint", "--only=useImportType", file.as_str()].as_slice()),
);

assert!(result.is_ok(), "run_cli returned {result:?}");

assert_cli_snapshot(SnapshotPayload::new(
module_path!(),
"use_import_type_not_triggered_for_enum_in_template_v2",
fs,
console,
result,
));
}
50 changes: 50 additions & 0 deletions crates/biome_cli/tests/cases/handle_svelte_files.rs
Original file line number Diff line number Diff line change
Expand Up @@ -705,3 +705,53 @@ fn use_import_type_not_triggered_for_enum_in_template() {
result,
));
}

#[test]
fn use_import_type_not_triggered_for_enum_in_template_v2() {
let fs = MemoryFileSystem::default();
let mut console = BufferConsole::default();

fs.insert(
"biome.json".into(),
r#"{ "html": { "linter": {"enabled": true}, "experimentalFullSupportEnabled": true } }"#
.as_bytes(),
);

let file = Utf8Path::new("file.svelte");
fs.insert(
file.into(),
r#"<script lang="ts">
import { Avatar as AvatarPrimitive } from "bits-ui"; // <-- false positive
import { cn } from "$lib/utils.js";

let {
ref = $bindable(null),
class: className,
}: AvatarPrimitive.FallbackProps = $props();
</script>

<!-- used as value here -->
<AvatarPrimitive.Fallback
bind:ref
class="something nice"
/>
"#
.as_bytes(),
);

let (fs, result) = run_cli(
fs,
&mut console,
Args::from(["lint", "--only=useImportType", file.as_str()].as_slice()),
);

assert!(result.is_ok(), "run_cli returned {result:?}");

assert_cli_snapshot(SnapshotPayload::new(
module_path!(),
"use_import_type_not_triggered_for_enum_in_template_v2",
fs,
console,
result,
));
}
69 changes: 63 additions & 6 deletions crates/biome_cli/tests/cases/handle_vue_files.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1140,33 +1140,90 @@ import Component from "./Component.vue"
));
}

const VUE_ENUM_IN_TEMPLATE: &str = r#"<script setup lang="ts">
#[test]
fn use_import_type_not_triggered_for_enum_in_template() {
let fs = MemoryFileSystem::default();
let mut console = BufferConsole::default();

fs.insert(
"biome.json".into(),
r#"{ "html": { "linter": {"enabled": true}, "experimentalFullSupportEnabled": true } }"#
.as_bytes(),
);

let file = Utf8Path::new("file.vue");
fs.insert(
file.into(),
r#"<script setup lang="ts">
import { Component, FooEnum } from './types';
</script>
<template>
<Component />
<div>{{ FooEnum.Foo }}</div>
</template>"#;
</template>"#
.as_bytes(),
);

let (fs, result) = run_cli(
fs,
&mut console,
Args::from(["lint", "--only=useImportType", file.as_str()].as_slice()),
);

assert!(result.is_ok(), "run_cli returned {result:?}");

assert_cli_snapshot(SnapshotPayload::new(
module_path!(),
"use_import_type_not_triggered_for_enum_in_template",
fs,
console,
result,
));
}

#[test]
fn use_import_type_not_triggered_for_enum_in_template() {
fn use_import_type_not_triggered_for_enum_in_template_v2() {
let fs = MemoryFileSystem::default();
let mut console = BufferConsole::default();

fs.insert(
"biome.json".into(),
r#"{ "html": { "linter": {"enabled": true}, "experimentalFullSupportEnabled": true } }"#
.as_bytes(),
);

let file = Utf8Path::new("file.vue");
fs.insert(file.into(), VUE_ENUM_IN_TEMPLATE.as_bytes());
fs.insert(
file.into(),
r#"<script lang="ts">
import { Avatar as AvatarPrimitive } from "bits-ui"; // <-- false positive
import { cn } from "$lib/utils.js";

let {
ref = $bindable(null),
class: className,
}: AvatarPrimitive.FallbackProps = $props();
</script>

<!-- used as value here -->
<AvatarPrimitive.Fallback
bind:ref
class="something nice"
/>
"#
.as_bytes(),
);

let (fs, result) = run_cli(
fs,
&mut console,
Args::from(["lint", "--only=useImportType", file.as_str()].as_slice()),
);

assert!(result.is_ok(), "run_cli returned {result:?}");

assert_cli_snapshot(SnapshotPayload::new(
module_path!(),
"use_import_type_not_triggered_for_enum_in_template",
"use_import_type_not_triggered_for_enum_in_template_v2",
fs,
console,
result,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
---
source: crates/biome_cli/tests/snap_test.rs
expression: redactor(content)
---
## `biome.json`

```json
{
"html": {
"linter": { "enabled": true },
"experimentalFullSupportEnabled": true
}
}
```

## `file.astro`

```astro
---
import { Avatar as AvatarPrimitive } from "bits-ui";
import { cn } from "$lib/utils.js";

let {
ref = $bindable(null),
class: className,
}: AvatarPrimitive.FallbackProps = $props();
---

<!-- used as value here -->
<AvatarPrimitive.Fallback
bind:ref
class="something nice"
/>

```

# Emitted Messages

```block
Checked 1 file in <TIME>. No fixes applied.
```
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
---
source: crates/biome_cli/tests/snap_test.rs
expression: redactor(content)
---
## `biome.json`

```json
{
"html": {
"linter": { "enabled": true },
"experimentalFullSupportEnabled": true
}
}
```

## `file.svelte`

```svelte
<script lang="ts">
import { Avatar as AvatarPrimitive } from "bits-ui"; // <-- false positive
import { cn } from "$lib/utils.js";

let {
ref = $bindable(null),
class: className,
}: AvatarPrimitive.FallbackProps = $props();
</script>

<!-- used as value here -->
<AvatarPrimitive.Fallback
bind:ref
class="something nice"
/>

```

# Emitted Messages

```block
Checked 1 file in <TIME>. No fixes applied.
```
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@
source: crates/biome_cli/tests/snap_test.rs
expression: redactor(content)
---
## `biome.json`

```json
{
"html": {
"linter": { "enabled": true },
"experimentalFullSupportEnabled": true
}
}
```

## `file.vue`

```vue
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
---
source: crates/biome_cli/tests/snap_test.rs
expression: redactor(content)
---
## `biome.json`

```json
{
"html": {
"linter": { "enabled": true },
"experimentalFullSupportEnabled": true
}
}
```

## `file.vue`

```vue
<script lang="ts">
import { Avatar as AvatarPrimitive } from "bits-ui"; // <-- false positive
import { cn } from "$lib/utils.js";

let {
ref = $bindable(null),
class: className,
}: AvatarPrimitive.FallbackProps = $props();
</script>

<!-- used as value here -->
<AvatarPrimitive.Fallback
bind:ref
class="something nice"
/>

```

# Emitted Messages

```block
Checked 1 file in <TIME>. No fixes applied.
```
2 changes: 1 addition & 1 deletion crates/biome_html_analyze/src/a11y.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ pub(crate) fn is_hidden_from_screen_reader(element: &AnyHtmlTagElement) -> bool
return true;
}

match element.name_value_token().ok() {
match element.name_value_token() {
Some(name) if name.text_trimmed() == "input" => element
.find_attribute_by_name("type")
.is_some_and(|attr| attribute_value_equals_ignore_case(&attr, "hidden")),
Expand Down
4 changes: 2 additions & 2 deletions crates/biome_html_analyze/src/lint/a11y/no_autofocus.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ fn is_dialog_or_popover(tag_element: &AnyHtmlTagElement) -> bool {
let is_dialog = tag_element
.name()
.ok()
.and_then(|n| n.value_token().ok())
.is_some_and(|token| token.text_trimmed().eq_ignore_ascii_case("dialog"));
.and_then(|n| n.token_text_trimmed())
.is_some_and(|text| text.eq_ignore_ascii_case("dialog"));

is_dialog || tag_element.find_attribute_by_name("popover").is_some()
}
6 changes: 3 additions & 3 deletions crates/biome_html_analyze/src/lint/a11y/no_redundant_alt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ impl Rule for NoRedundantAlt {
let node = ctx.query();
let file_source = ctx.source_type::<HtmlFileSource>();

let name = node.name().ok()?.value_token().ok()?;
if (file_source.is_html() && !name.text_trimmed().eq_ignore_ascii_case("img"))
|| (!file_source.is_html() && name.text_trimmed() != "img")
let name = node.name().ok()?.token_text_trimmed()?;
if (file_source.is_html() && !name.eq_ignore_ascii_case("img"))
|| (!file_source.is_html() && name != "img")
{
return None;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,8 @@ fn has_valid_title_element(html_child_list: &HtmlElementList) -> Option<bool> {
let html_element = first_child.as_html_element()?;
let opening_element = html_element.opening_element().ok()?;
let name = opening_element.name().ok()?;
let name = name.value_token().ok()?;
let has_title_name = name.text_trimmed() == "title";
let name_text = name.token_text_trimmed()?;
let has_title_name = name_text == "title";
if !has_title_name {
return Some(false);
}
Expand Down
Loading