language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-27 20:42:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Pull in RustPython parser (#6099)

Browse source
This commit is contained in:
Micha Reiser 2023-07-27 11:29:11 +02:00 • committed by GitHub
parent 86539c1fc5
commit 40f54375cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
779 changed files with 108400 additions and 2078 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ruff_wasm/src/lib.rs
View file

@ -2,8 +2,8 @@ use std::path::Path;
use js_sys::Error;
use rustpython_parser::lexer::LexResult;
use rustpython_parser::{parse_tokens, Mode};
use ruff_python_parser::lexer::LexResult;
use ruff_python_parser::{parse_tokens, Mode};
use serde::{Deserialize, Serialize};
use wasm_bindgen::prelude::*;
@ -268,7 +268,7 @@ impl Workspace {
}
pub fn format_ir(&self, contents: &str) -> Result<String, Error> {
let tokens: Vec<_> = rustpython_parser::lexer::lex(contents, Mode::Module).collect();
let tokens: Vec<_> = ruff_python_parser::lexer::lex(contents, Mode::Module).collect();
let mut comment_ranges = CommentRangesBuilder::default();
for (token, range) in tokens.iter().flatten() {
@ -291,13 +291,13 @@ impl Workspace {
/// Parses the content and returns its AST
pub fn parse(&self, contents: &str) -> Result<String, Error> {
let parsed = rustpython_parser::parse(contents, Mode::Module, ".").map_err(into_error)?;
let parsed = ruff_python_parser::parse(contents, Mode::Module, ".").map_err(into_error)?;
Ok(format!("{parsed:#?}"))
}
pub fn tokens(&self, contents: &str) -> Result<String, Error> {
let tokens: Vec<_> = rustpython_parser::lexer::lex(contents, Mode::Module).collect();
let tokens: Vec<_> = ruff_python_parser::lexer::lex(contents, Mode::Module).collect();
Ok(format!("{tokens:#?}"))
}