language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-08 22:28:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Move Full from fmt to parse and reorganize confusingly-named Module ast type

Browse source
This commit is contained in:
Joshua Warner 2024-08-06 19:03:08 -07:00
parent 698bbc3cf1
commit d25c048d48
No known key found for this signature in database
GPG key ID: 89AD497003F93FDD
47 changed files with 1759 additions and 1776 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/language_server/src/analysis/parse_ast.rs
View file

@ -1,8 +1,8 @@
use bumpalo::Bump;
use roc_fmt::Buf;
use roc_parse::{
ast::{Defs, Module},
module::parse_module_defs,
ast::{Defs, Header, SpacesBefore},
header::parse_module_defs,
parser::SyntaxError,
};
use roc_region::all::Loc;
@ -15,23 +15,26 @@ mod format;
pub struct Ast<'a> {
arena: &'a Bump,
module: Module<'a>,
module: SpacesBefore<'a, Header<'a>>,
defs: Defs<'a>,
}
impl<'a> Ast<'a> {
pub fn parse(arena: &'a Bump, src: &'a str) -> Result<Ast<'a>, SyntaxError<'a>> {
use roc_parse::{module::parse_header, state::State};
use roc_parse::{header::parse_header, state::State};
let (module, state) = parse_header(arena, State::new(src.as_bytes()))
.map_err(|e| SyntaxError::Header(e.problem))?;
let (module, defs) = module.upgrade_header_imports(arena);
let (header, defs) = module.item.upgrade_header_imports(arena);
let defs = parse_module_defs(arena, state, defs)?;
Ok(Ast {
module,
module: SpacesBefore {
before: module.before,
item: header,
},
defs,
arena,
})
@ -40,7 +43,7 @@ impl<'a> Ast<'a> {
pub fn fmt(&self) -> FormattedAst<'a> {
let mut buf = Buf::new_in(self.arena);
roc_fmt::module::fmt_module(&mut buf, &self.module);
roc_fmt::header::fmt_header(&mut buf, &self.module);
roc_fmt::def::fmt_defs(&mut buf, &self.defs, 0);
@ -50,7 +53,7 @@ impl<'a> Ast<'a> {
}
pub fn semantic_tokens(&self) -> impl IntoIterator<Item = Loc<Token>> + '_ {
let header_tokens = self.module.iter_tokens(self.arena);
let header_tokens = self.module.item.iter_tokens(self.arena);
let body_tokens = self.defs.iter_tokens(self.arena);
header_tokens.into_iter().chain(body_tokens)

14
crates/language_server/src/analysis/tokens.rs
View file

@ -6,8 +6,8 @@ use roc_module::called_via::{BinOp, UnaryOp};
use roc_parse::{
ast::{
AbilityImpls, AbilityMember, AssignedField, Collection, Defs, Expr, Header, Implements,
ImplementsAbilities, ImplementsAbility, ImplementsClause, Module, OldRecordBuilderField,
Pattern, PatternAs, Spaced, StrLiteral, Tag, TypeAnnotation, TypeDef, TypeHeader, ValueDef,
ImplementsAbilities, ImplementsAbility, ImplementsClause, OldRecordBuilderField, Pattern,
PatternAs, Spaced, StrLiteral, Tag, TypeAnnotation, TypeDef, TypeHeader, ValueDef,
WhenBranch,
},
header::{
@ -189,16 +189,6 @@ impl<T: IterTokens, U: IterTokens> IterTokens for (T, U) {
}
}
impl IterTokens for Module<'_> {
fn iter_tokens<'a>(&self, arena: &'a Bump) -> BumpVec<'a, Loc<Token>> {
let Self {
comments: _,
header,
} = self;
header.iter_tokens(arena)
}
}
impl IterTokens for Header<'_> {
fn iter_tokens<'a>(&self, arena: &'a Bump) -> BumpVec<'a, Loc<Token>> {
match self {