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

refactor(ast_tools): faster formatting Rust code (#6972)

Browse source 
Speed up formatting Rust code. Don't convert to string and then re-parse, allow `syn` to skip a step by using existing `TokenStream`.
This commit is contained in:
overlookmotel 2024-10-28 01:13:36 +00:00
parent 149b02c535
commit 335eb38be6
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
napi/transform/test/transform.test.mjs
View file

@ -35,10 +35,10 @@ describe('react refresh plugin', () => {
it('matches output', () => {
const ret = oxc.transform('test.tsx', code, { jsx: { refresh: {} } });
console.log(ret.code)
console.log(ret.code);
assert.equal(
ret.code,
`import { useState } from "react";
`import { useState } from "react";
import { jsxs as _jsxs } from "react/jsx-runtime";
var _s = $RefreshSig$();
export const App = () => {
@ -53,7 +53,7 @@ _s(App, "oDgYfYHkD9Wkv4hrAPCkI/ev3YU=");
_c = App;
var _c;
$RefreshReg$(_c, "App");
`
`,
);
});
});

2
tasks/ast_tools/src/output/mod.rs
View file

@ -47,7 +47,7 @@ impl Output {
let (path, code) = match self {
Self::Rust { path, tokens } => {
let code = print_rust(&tokens, &generator_path);
let code = print_rust(tokens, &generator_path);
(path, code)
}
Self::Javascript { path, code } => {

6
tasks/ast_tools/src/output/rust.rs
View file

@ -6,13 +6,13 @@ use std::{
use lazy_static::lazy_static;
use proc_macro2::TokenStream;
use regex::{Captures, Regex, Replacer};
use syn::parse_file;
use syn::parse2;
use super::add_header;
/// Format Rust code, and add header.
pub fn print_rust(tokens: &TokenStream, generator_path: &str) -> String {
let code = prettyplease::unparse(&parse_file(tokens.to_string().as_str()).unwrap());
pub fn print_rust(tokens: TokenStream, generator_path: &str) -> String {
let code = prettyplease::unparse(&parse2(tokens).unwrap());
let code = COMMENT_REGEX.replace_all(&code, CommentReplacer).to_string();
let code = add_header(&code, generator_path, "//");
rust_fmt(&code)