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
152 changes: 76 additions & 76 deletions Cargo.lock

Large diffs are not rendered by default.

74 changes: 37 additions & 37 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,48 +16,48 @@
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
anyhow = "1.0.100"
biome_analyze = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49", features = [
biome_analyze = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f", features = [
"schema",
] }
biome_cli = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_configuration = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49", features = [
biome_cli = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_configuration = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f", features = [
"schema",
] }
biome_console = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_css_analyze = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_css_parser = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_css_semantic = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_css_syntax = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_deserialize = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_diagnostics = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_flags = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_formatter = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_fs = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_graphql_analyze = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_graphql_parser = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_graphql_syntax = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_html_analyze = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_html_parser = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_html_syntax = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_js_analyze = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_js_formatter = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_js_parser = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_js_syntax = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_json_analyze = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_json_factory = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_json_formatter = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_json_parser = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_json_syntax = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_module_graph = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_project_layout = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_rowan = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_ruledoc_utils = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_service = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_string_case = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_test_utils = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_text_edit = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49" }
biome_console = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_css_analyze = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_css_parser = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_css_semantic = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_css_syntax = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_deserialize = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_diagnostics = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_flags = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_formatter = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_fs = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_graphql_analyze = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_graphql_parser = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_graphql_syntax = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_html_analyze = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_html_parser = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_html_syntax = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_js_analyze = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_js_formatter = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_js_parser = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_js_syntax = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_json_analyze = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_json_factory = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_json_formatter = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_json_parser = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_json_syntax = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_module_graph = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_project_layout = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_rowan = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_ruledoc_utils = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_service = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_string_case = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_test_utils = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
biome_text_edit = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f" }
bpaf = { version = "0.9.20", features = ["docgen"] }
xtask_codegen = { git = "https://github.com/biomejs/biome.git", rev = "50c351357e4400c3c1890fc2e10a11a37c8fca49", features = [
xtask_codegen = { git = "https://github.com/biomejs/biome.git", rev = "bc0e8b47a276efabb0b76169d13dfc9d5325953f", features = [
"schema",
] }
# Needed to fix some weird dependency
Expand Down
4 changes: 2 additions & 2 deletions codegen/src/lintdoc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1695,11 +1695,11 @@ fn print_diagnostics_or_actions(
});
}
}
DocumentFileSource::Css(..) => {
DocumentFileSource::Css(file_source) => {
let parse_options = CssParserOptions::default()
.allow_css_modules()
.allow_tailwind_directives();
let parse = biome_css_parser::parse_css(code, parse_options);
let parse = biome_css_parser::parse_css(code, file_source, parse_options);

if parse.has_errors() {
for diag in parse.into_diagnostics() {
Expand Down
1 change: 1 addition & 0 deletions codegen/src/website.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ export function GET() {"#,
parse_module(&schema_js_content, JsParserOptions::default())
.tree()
.syntax(),
false,
)?
.print()?;

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@astrojs/starlight": "0.36.3",
"@biomejs/biome": "2.3.8",
"@biomejs/version-utils": "0.4.0",
"@biomejs/wasm-web": "https://pkg.pr.new/biomejs/biome/@biomejs/wasm-web@50c3513",
"@biomejs/wasm-web": "https://pkg.pr.new/biomejs/biome/@biomejs/wasm-web@bc0e8b4",
"@codemirror/lang-css": "6.3.1",
"@codemirror/lang-html": "6.4.11",
"@codemirror/lang-javascript": "6.2.4",
Expand Down
12 changes: 6 additions & 6 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/playground/PlaygroundLoader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,9 @@ function initState(
cssModules:
searchParams.get("cssModules") === "true" ||
defaultPlaygroundState.settings.cssModules,
experimentalEmbeddedSnippetsEnabled:
searchParams.get("experimentalEmbeddedSnippetsEnabled") === "true" ||
defaultPlaygroundState.settings.experimentalEmbeddedSnippetsEnabled,
experimentalFullSupportEnabled:
searchParams.get("experimentalFullSupportEnabled") === "true" ||
defaultPlaygroundState.settings.experimentalFullSupportEnabled,
Expand Down
38 changes: 34 additions & 4 deletions src/playground/tabs/SettingsTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ export default function SettingsTab({
allowComments,
attributePosition,
ruleDomains,
experimentalEmbeddedSnippetsEnabled,
experimentalFullSupportEnabled,
cssModules,
tailwindDirectives,
Expand Down Expand Up @@ -170,6 +171,11 @@ export default function SettingsTab({
"ruleDomains",
);

const setExperimentalEmbeddedSnippetsEnabled = createPlaygroundSettingsSetter(
setPlaygroundState,
"experimentalEmbeddedSnippetsEnabled",
);

const setExperimentalFullSupportEnabled = createPlaygroundSettingsSetter(
setPlaygroundState,
"experimentalFullSupportEnabled",
Expand Down Expand Up @@ -376,6 +382,12 @@ export default function SettingsTab({
setUnsafeParameterDecoratorsEnabled
}
setAllowComments={setAllowComments}
experimentalEmbeddedSnippetsEnabled={
experimentalEmbeddedSnippetsEnabled
}
setExperimentalEmbeddedSnippetsEnabled={
setExperimentalEmbeddedSnippetsEnabled
}
experimentalFullSupportEnabled={experimentalFullSupportEnabled}
setExperimentalFullSupportEnabled={setExperimentalFullSupportEnabled}
cssModules={cssModules}
Expand Down Expand Up @@ -605,6 +617,8 @@ function SyntaxSettings({
setUnsafeParameterDecoratorsEnabled,
setAllowComments,
allowComments,
experimentalEmbeddedSnippetsEnabled,
setExperimentalEmbeddedSnippetsEnabled,
experimentalFullSupportEnabled,
setExperimentalFullSupportEnabled,
cssModules,
Expand All @@ -618,6 +632,8 @@ function SyntaxSettings({
allowComments: boolean;
setUnsafeParameterDecoratorsEnabled: (value: boolean) => void;
setAllowComments: (value: boolean) => void;
experimentalEmbeddedSnippetsEnabled: boolean;
setExperimentalEmbeddedSnippetsEnabled: (value: boolean) => void;
experimentalFullSupportEnabled: boolean;
setExperimentalFullSupportEnabled: (value: boolean) => void;
cssModules: boolean;
Expand All @@ -629,6 +645,7 @@ function SyntaxSettings({
const enumSelectId = useId();
const allowCommentsId = useId();
const decoratorsId = useId();
const experimentalEmbeddedSnippetsId = useId();
const experimentalFullSupportId = useId();
const cssModulesId = useId();
const tailwindDirectivesId = useId();
Expand Down Expand Up @@ -679,10 +696,24 @@ function SyntaxSettings({
/>
<label htmlFor={allowCommentsId}>Allow comments in JSON files</label>
</div>
<div className="field-row">
<input
id={experimentalEmbeddedSnippetsId}
name="experimental-embedded-snippets"
type="checkbox"
checked={experimentalEmbeddedSnippetsEnabled}
onChange={(e) =>
setExperimentalEmbeddedSnippetsEnabled(e.target.checked)
}
/>
<label htmlFor={experimentalEmbeddedSnippetsId}>
Experimental embedded snippets support
</label>
</div>
<div className="field-row">
<input
id={experimentalFullSupportId}
name="allow-comments"
name="experimental-full-support"
type="checkbox"
checked={experimentalFullSupportEnabled}
onChange={(e) =>
Expand All @@ -693,11 +724,10 @@ function SyntaxSettings({
Experimental HTML-ish full support
</label>
</div>

<div className="field-row">
<input
id={cssModulesId}
name="allow-comments"
name="css-modules"
type="checkbox"
checked={cssModules}
onChange={(e) => setCssModules(e.target.checked)}
Expand All @@ -707,7 +737,7 @@ function SyntaxSettings({
<div className="field-row">
<input
id={tailwindDirectivesId}
name="allow-comments"
name="tailwind-directives"
type="checkbox"
checked={tailwindDirectives}
onChange={(e) => setTailwindDirectives(e.target.checked)}
Expand Down
2 changes: 2 additions & 0 deletions src/playground/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ export interface PlaygroundSettings {
ruleDomains: RuleDomains;
indentScriptAndStyle: boolean;
whitespaceSensitivity: WhitespaceSensitivity;
experimentalEmbeddedSnippetsEnabled: boolean;
experimentalFullSupportEnabled: boolean;
cssModules: boolean;
tailwindDirectives: boolean;
Expand Down Expand Up @@ -244,6 +245,7 @@ export const defaultPlaygroundState: PlaygroundState = {
ruleDomains: {},
indentScriptAndStyle: false,
whitespaceSensitivity: WhitespaceSensitivity.Css,
experimentalEmbeddedSnippetsEnabled: true,
experimentalFullSupportEnabled: true,
cssModules: false,
tailwindDirectives: true,
Expand Down
2 changes: 2 additions & 0 deletions src/playground/workers/biomeWorker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ self.addEventListener("message", async (e) => {
allowComments,
attributePosition,
ruleDomains,
experimentalEmbeddedSnippetsEnabled,
experimentalFullSupportEnabled,
cssModules,
tailwindDirectives,
Expand Down Expand Up @@ -152,6 +153,7 @@ self.addEventListener("message", async (e) => {
parser: {
unsafeParameterDecoratorsEnabled,
},
experimentalEmbeddedSnippetsEnabled,
},
css: {
formatter: {
Expand Down
7 changes: 6 additions & 1 deletion src/playground/workers/prettierWorker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ self.addEventListener("message", async (e) => {
bracketSameLine,
attributePosition,
expand,
experimentalEmbeddedSnippetsEnabled,
indentScriptAndStyle,
whitespaceSensitivity,
} = settings;
Expand All @@ -82,6 +83,7 @@ self.addEventListener("message", async (e) => {
singleAttributePerLine:
attributePosition === AttributePosition.Multiline,
expand,
embeddedLanguageFormatting: experimentalEmbeddedSnippetsEnabled,
vueIndentScriptAndStyle: indentScriptAndStyle,
whitespaceSensitivity,
});
Expand Down Expand Up @@ -117,6 +119,7 @@ async function formatWithPrettier(
bracketSameLine: boolean;
singleAttributePerLine?: boolean;
expand: Expand;
embeddedLanguageFormatting: boolean;
vueIndentScriptAndStyle: boolean;
whitespaceSensitivity: WhitespaceSensitivity;
},
Expand Down Expand Up @@ -149,7 +152,9 @@ async function formatWithPrettier(
bracketSameLine: options.bracketSameLine,
singleAttributePerLine: options.singleAttributePerLine ?? false,
objectWrap: options.expand === Expand.Never ? "collapse" : "preserve",
embeddedLanguageFormatting: "off",
embeddedLanguageFormatting: options.embeddedLanguageFormatting
? "auto"
: "off",
vueIndentScriptAndStyle: options.vueIndentScriptAndStyle,
htmlWhitespaceSensitivity: options.whitespaceSensitivity,
};
Expand Down