Skip to content

Commit

Permalink
feat: track double colon location in external type paths
Browse files Browse the repository at this point in the history 
Keep track of the double colons that separate the individual segments of
the path in external types.
  • Loading branch information
@dnaka91
dnaka91 committed Feb 21, 2024
1 parent f481d61 commit 6a6de5a
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 26 deletions.
17 changes: 9 additions & 8 deletions crates/mabo-compiler/src/resolve/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
//! correct.

use mabo_parser::{
punctuated::Punctuated, DataType, Definition, ExternalType, Fields, Generics, Import, Name,
Schema, Spanned, Type,
punctuated::Punctuated,
token::{self, Punctuation},
DataType, Definition, ExternalType, Fields, Generics, Import, Name, Schema, Spanned, Type,
};
use miette::NamedSource;
use rustc_hash::FxHashMap;
Expand Down Expand Up @@ -133,7 +134,7 @@ impl Module<'_> {
let module = if ty.path.is_empty() {
self
} else {
ty.path.iter().try_fold(self, |module, name| {
ty.path.iter().try_fold(self, |module, (name, _)| {
module.modules.get(name.get()).ok_or_else(|| MissingModule {
name: name.get().to_owned(),
path: module.path_to_string(),
Expand Down Expand Up @@ -232,11 +233,11 @@ impl Module<'_> {
let module = if ty
.path
.first()
.is_some_and(|first| first.get() == self.name)
.is_some_and(|(first, _)| first.get() == self.name)
{
self
} else {
ty.path.iter().try_fold(self, |module, name| {
ty.path.iter().try_fold(self, |module, (name, _)| {
module.modules.get(name.get()).ok_or_else(|| MissingModule {
name: name.get().to_owned(),
path: module.path_to_string(),
Expand Down Expand Up @@ -528,7 +529,7 @@ pub(crate) fn resolve_type_remotely(
) -> Result<(), ResolveError> {
if imports.is_empty() {
return Err(ty.error.into());
} else if let Some(name) = ty.external.path.first() {
} else if let Some((name, _)) = ty.external.path.first() {
let module = imports.iter().find_map(|import| match import {
ResolvedImport::Module(module) => (module.name == name.get()).then_some(module),
ResolvedImport::Type { .. } => None,
Expand All @@ -543,9 +544,9 @@ pub(crate) fn resolve_type_remotely(
ty.external
.path
.iter()
.fold(String::new(), |mut acc, part| {
.fold(String::new(), |mut acc, (part, _)| {
acc.push_str(part.get());
acc.push_str("::");
acc.push_str(token::DoubleColon::VALUE);
acc
}),
ty.external.name
Expand Down
2 changes: 1 addition & 1 deletion crates/mabo-compiler/src/simplify.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ fn simplify_type<'a>(item: &'a mabo_parser::Type<'_>) -> Type<'a> {
Type::Array(simplify_type(ty).into(), size)
}
mabo_parser::DataType::External(ref ty) => Type::External(ExternalType {
path: ty.path.iter().map(mabo_parser::Name::get).collect(),
path: ty.path.iter().map(|(segment, _)| segment.get()).collect(),
name: ty.name.get(),
generics: ty.generics.as_ref().map_or(Vec::default(), |g| {
g.values().map(|ty| simplify_type(ty)).collect()
Expand Down
3 changes: 2 additions & 1 deletion crates/mabo-lsp/src/handlers/semantic_tokens.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,8 +418,9 @@ impl<'a> Visitor<'a> {
angle,
generics,
}) => {
for name in path {
for (name, token) in path {
self.add_span(name, &types::NAMESPACE, &[])?;
self.add_span(token, &types::DOUBLE_COLON, &[])?;
}
self.add_span(name, &types::TYPE, &[])?;
if let Some(angle) = angle {
Expand Down
6 changes: 3 additions & 3 deletions crates/mabo-parser/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,7 @@ impl Display for DataType<'_> {
#[derive(Clone, Debug, Eq, PartialEq)]
pub struct ExternalType<'a> {
/// Optional path, if the type wasn't fully imported with a `use` statement.
pub path: Vec<Name<'a>>,
pub path: Vec<(Name<'a>, token::DoubleColon)>,
/// Unique name of the type within the current scope (or the module if prefixed with a path).
pub name: Name<'a>,
/// Angles `<`...`>` to delimit the generic type parameters.
Expand All @@ -1044,8 +1044,8 @@ impl Display for ExternalType<'_> {
..
} = self;

for segment in path {
write!(f, "{segment}::")?;
for (segment, token) in path {
write!(f, "{segment}{token}")?;
}
name.fmt(f)?;
if let Some(generics) = generics {
Expand Down
14 changes: 7 additions & 7 deletions crates/mabo-parser/src/parser/types.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::ops::Range;
use mabo_derive::{ParserError, ParserErrorCause};
use winnow::{
ascii::{dec_uint, space0},
combinator::{alt, cut_err, empty, fail, opt, preceded, separated, terminated},
combinator::{alt, cut_err, empty, fail, opt, preceded, repeat},
dispatch,
error::ErrorKind,
stream::Location,
Expand Down Expand Up @@ -221,13 +221,13 @@ fn parse_array<'i>(input: &mut Input<'i>) -> Result<DataType<'i>, Cause> {

fn parse_external<'i>(input: &mut Input<'i>) -> Result<ExternalType<'i>, Cause> {
(
opt(terminated(
separated(
1..,
opt(repeat(
1..,
(
imports::parse_segment.map_err(Cause::from),
token::DoubleColon::VALUE,
),
token::DoubleColon::VALUE,
token::DoubleColon::VALUE.span(),
)
.map(|(segment, token)| (segment, token.into())),
))
.map(Option::unwrap_or_default),
parse_external_name,
Expand Down
9 changes: 6 additions & 3 deletions crates/mabo-parser/tests/snapshots/parser__parse@mixed.mabo.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,12 @@ Schema {
value: External(
ExternalType {
path: [
Name {
value: "birthday",
},
(
Name {
value: "birthday",
},
DoubleColon,
),
],
name: Name {
value: "DayOfBirth",
Expand Down
9 changes: 6 additions & 3 deletions crates/mabo-parser/tests/snapshots/parser__parse@module_basic.mabo.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,12 @@ Schema {
value: External(
ExternalType {
path: [
Name {
value: "b",
},
(
Name {
value: "b",
},
DoubleColon,
),
],
name: Name {
value: "Sample",
Expand Down

0 comments on commit 6a6de5a

Please sign in to comment.