mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor shared literal_from_str code

Browse Source
This commit is contained in:
Victor Song 2024-01-30 01:09:00 -06:00
parent adf7adf3e8
commit e8c9ca2a2f
3 changed files with 74 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
crates/proc-macro-srv/src/server.rs
View File

@ -17,6 +17,7 @@
mod symbol;
pub mod token_id;
pub use symbol::*;
use syntax::ast::{self, HasModuleItem, IsString};
use tt::Spacing;
fn delim_to_internal<S>(d: proc_macro::Delimiter, span: bridge::DelimSpan<S>) -> tt::Delimiter<S> {
@ -54,6 +55,60 @@ fn spacing_to_external(spacing: Spacing) -> proc_macro::Spacing {
}
}
fn literal_to_external(literal: ast::LiteralKind) -> Option<proc_macro::bridge::LitKind> {
Some(match lit.kind() {
ast::LiteralKind::String(data) => {
if data.is_raw() {
bridge::LitKind::StrRaw(raw_delimiter_count(data)?)
} else {
bridge::LitKind::Str
}
}
ast::LiteralKind::ByteString(data) => {
if data.is_raw() {
bridge::LitKind::ByteStrRaw(raw_delimiter_count(data)?)
} else {
bridge::LitKind::ByteStr
}
}
ast::LiteralKind::CString(data) => {
if data.is_raw() {
bridge::LitKind::CStrRaw(raw_delimiter_count(data)?)
} else {
bridge::LitKind::CStr
}
}
ast::LiteralKind::IntNumber(num) => bridge::LitKind::Integer,
ast::LiteralKind::FloatNumber(num) => bridge::LitKind::Float,
ast::LiteralKind::Char(_) => bridge::LitKind::Char,
ast::LiteralKind::Byte(_) => bridge::LitKind::Byte,
ast::LiteralKind::Bool(_) => unreachable!(),
})
}
fn raw_delimiter_count<S: IsString>(s: S) -> Option<u8> {
let text = s.text();
let quote_range = s.text_range_between_quotes()?;
let range_start = s.syntax().text_range().start();
text[TextRange::up_to((quote_range - range_start).start())].matches('#').count().try_into().ok()
}
fn str_to_lit_node(input: &str) -> Option<ast::Literal> {
let input = input.trim();
let source_code = format!("fn f() {{ let _ = {input}; }}");
let parse = ast::SourceFile::parse(&source_code);
let file = parse.tree();
let ast::Item::Fn(func) = file.items().next()? else { return None };
let ast::Stmt::LetStmt(stmt) = func.body()?.stmt_list()?.statements().next()? else {
return None;
};
let ast::Expr::Literal(lit) = stmt.initializer()? else { return None };
Some(lit)
}
struct LiteralFormatter<S>(bridge::Literal<S, Symbol>);
impl<S> LiteralFormatter<S> {

70
crates/proc-macro-srv/src/server/rust_analyzer_span.rs
View File

@ -4,6 +4,7 @@
//! It is an unfortunate result of how the proc-macro API works that we need to look into the
//! concrete representation of the spans, and as such, RustRover cannot make use of this unless they
//! change their representation to be compatible with rust-analyzer's.
use core::num;
use std::{
collections::{HashMap, HashSet},
iter,
@ -13,11 +14,11 @@
use ::tt::{TextRange, TextSize};
use proc_macro::bridge::{self, server};
use span::{Span, FIXUP_ERASED_FILE_AST_ID_MARKER};
use syntax::ast::{self, HasModuleItem, IsString};
use syntax::ast;
use crate::server::{
delim_to_external, delim_to_internal, token_stream::TokenStreamBuilder, LiteralFormatter,
Symbol, SymbolInternerRef, SYMBOL_INTERNER,
delim_to_external, delim_to_internal, literal_to_external, str_to_lit_node,
token_stream::TokenStreamBuilder, LiteralFormatter, Symbol, SymbolInternerRef, SYMBOL_INTERNER,
};
mod tt {
pub use ::tt::*;
@ -71,66 +72,15 @@ fn literal_from_str(
&mut self,
s: &str,
) -> Result<bridge::Literal<Self::Span, Self::Symbol>, ()> {
let input = s.trim();
let source_code = format!("fn f() {{ let _ = {input}; }}");
let literal = str_to_lit_node(s).ok_or(Err(()))?;
let parse = ast::SourceFile::parse(&source_code);
let file = parse.tree();
let kind = literal_to_external(literal.kind()).ok_or(Err(()))?;
let Some(ast::Item::Fn(func)) = file.items().next() else { return Err(()) };
let Some(ast::Stmt::LetStmt(stmt)) =
func.body().ok_or(Err(()))?.stmt_list().ok_or(Err(()))?.statements().next()
else {
return Err(());
};
let Some(ast::Expr::Literal(lit)) = stmt.initializer() else { return Err(()) };
fn raw_delimiter_count<S: IsString>(s: S) -> Option<u8> {
let text = s.text();
let quote_range = s.text_range_between_quotes()?;
let range_start = s.syntax().text_range().start();
text[TextRange::up_to((quote_range - range_start).start())]
.matches('#')
.count()
.try_into()
.ok()
let suffix = match literal.kind() {
ast::LiteralKind::FloatNumber(num) | ast::LiteralKind::IntNumber(num) => num.suffix(),
_ => None,
}
let mut suffix = None;
let kind = match lit.kind() {
ast::LiteralKind::String(data) => {
if data.is_raw() {
bridge::LitKind::StrRaw(raw_delimiter_count(data).ok_or(Err(()))?)
} else {
bridge::LitKind::Str
}
}
ast::LiteralKind::ByteString(data) => {
if data.is_raw() {
bridge::LitKind::ByteStrRaw(raw_delimiter_count(data).ok_or(Err(()))?)
} else {
bridge::LitKind::ByteStr
}
}
ast::LiteralKind::CString(data) => {
if data.is_raw() {
bridge::LitKind::CStrRaw(raw_delimiter_count(data).ok_or(Err(()))?)
} else {
bridge::LitKind::CStr
}
}
ast::LiteralKind::IntNumber(num) => {
suffix = num.suffix();
bridge::LitKind::Integer
}
ast::LiteralKind::FloatNumber(num) => {
suffix = num.suffix();
bridge::LitKind::Float
}
ast::LiteralKind::Char(_) => bridge::LitKind::Char,
ast::LiteralKind::Byte(_) => bridge::LitKind::Byte,
ast::LiteralKind::Bool(_) => unreachable!(),
};
.map(|suffix| Symbol::intern(self.interner, suffix));
Ok(bridge::Literal {
kind,

69
crates/proc-macro-srv/src/server/token_id.rs
View File

@ -6,11 +6,11 @@
};
use proc_macro::bridge::{self, server};
use syntax::ast::{self, HasModuleItem, IsString};
use syntax::ast;
use crate::server::{
delim_to_external, delim_to_internal, token_stream::TokenStreamBuilder, LiteralFormatter,
Symbol, SymbolInternerRef, SYMBOL_INTERNER,
delim_to_external, delim_to_internal, literal_to_external, str_to_lit_node,
token_stream::TokenStreamBuilder, LiteralFormatter, Symbol, SymbolInternerRef, SYMBOL_INTERNER,
};
mod tt {
pub use proc_macro_api::msg::TokenId;
@ -63,66 +63,15 @@ fn literal_from_str(
&mut self,
s: &str,
) -> Result<bridge::Literal<Self::Span, Self::Symbol>, ()> {
let input = s.trim();
let source_code = format!("fn f() {{ let _ = {input}; }}");
let literal = str_to_lit_node(s).ok_or(Err(()))?;
let parse = ast::SourceFile::parse(&source_code);
let file = parse.tree();
let kind = literal_to_external(literal.kind()).ok_or(Err(()))?;
let Some(ast::Item::Fn(func)) = file.items().next() else { return Err(()) };
let Some(ast::Stmt::LetStmt(stmt)) =
func.body().ok_or(Err(()))?.stmt_list().ok_or(Err(()))?.statements().next()
else {
return Err(());
};
let Some(ast::Expr::Literal(lit)) = stmt.initializer() else { return Err(()) };
fn raw_delimiter_count<S: IsString>(s: S) -> Option<u8> {
let text = s.text();
let quote_range = s.text_range_between_quotes()?;
let range_start = s.syntax().text_range().start();
text[TextRange::up_to((quote_range - range_start).start())]
.matches('#')
.count()
.try_into()
.ok()
let suffix = match literal.kind() {
ast::LiteralKind::FloatNumber(num) | ast::LiteralKind::IntNumber(num) => num.suffix(),
_ => None,
}
let mut suffix = None;
let kind = match lit.kind() {
ast::LiteralKind::String(data) => {
if data.is_raw() {
bridge::LitKind::StrRaw(raw_delimiter_count(data).ok_or(Err(()))?)
} else {
bridge::LitKind::Str
}
}
ast::LiteralKind::ByteString(data) => {
if data.is_raw() {
bridge::LitKind::ByteStrRaw(raw_delimiter_count(data).ok_or(Err(()))?)
} else {
bridge::LitKind::ByteStr
}
}
ast::LiteralKind::CString(data) => {
if data.is_raw() {
bridge::LitKind::CStrRaw(raw_delimiter_count(data).ok_or(Err(()))?)
} else {
bridge::LitKind::CStr
}
}
ast::LiteralKind::IntNumber(num) => {
suffix = num.suffix();
bridge::LitKind::Integer
}
ast::LiteralKind::FloatNumber(num) => {
suffix = num.suffix();
bridge::LitKind::Float
}
ast::LiteralKind::Char(_) => bridge::LitKind::Char,
ast::LiteralKind::Byte(_) => bridge::LitKind::Byte,
ast::LiteralKind::Bool(_) => unreachable!(),
};
.map(|suffix| Symbol::intern(self.interner, suffix));
Ok(bridge::Literal {
kind,