readd shapes

Author: ajuvercr

Cargo.lock

@@ -7,8 +7,8 @@ edition = "2021"
 version = "0.1.0"
 
 [features]
-default = []
-shapes = ["rudof_lib"]
+default = ["shapes"]
+shapes = []
 tokio = ["tower-lsp/runtime-tokio"]
 agnostic = ["tower-lsp/runtime-agnostic"]
 
@@ -30,6 +30,14 @@ chrono = { version = "0.4.42", default-features = false, features = ["serde"] }
 lazy_static = "1.5.0"
 lov = { path = "../lov/" }
 
-rudof_lib = { git = "https://github.com/ajuvercr/rudof/", optional = true }
 oxigraph = { version = "0.5.3", features = ["rdf-12", "js"], default-features=false }
 
+shacl_rdf = "0.1.135"
+shacl_ir = "0.1.141"
+srdf = "0.1.146"
+shacl_ast = "0.1.135"
+prefixmap = "0.1.145"
+iri_s = "0.1.137"
+oxrdf = "0.3.2"
+rudof_lib = "0.1.146"
+

core/Cargo.toml

@@ -51,11 +51,13 @@ mod system {
             let Some(term) = triple.term() else {
                 continue;
             };
+            let _span = tracing::debug_span!("goto_definition", term=%term.value).entered();
 
-            tracing::debug!("Found {} with kind {:?}", term.value, target);
+            tracing::debug!("kind {:?}", target);
             if target == TermKind::Iri {
                 // This is a named node, we should look project wide
                 for (triples, rope, label) in &project {
+                    tracing::info!("Looking into buffer {}", label.as_str());
                     let subs: HashSet<_> = triples
                         .iter()
                         .map(|x| x.s())

core/src/feature/goto_definition.rs

@@ -36,7 +36,7 @@ pub fn setup_schedule<C: Client + Resource>(world: &mut World) {
         derive_ontologies.after(crate::store::load_store),
     ));
 
-    #[cfg(feature = "shapes")]
+    // #[cfg(feature = "shapes")]
     parse_schedule.add_systems((crate::systems::derive_shapes.after(triples),));
     world.add_schedule(parse_schedule);
     world.insert_resource(Store(oxigraph::store::Store::new().unwrap()));

core/src/feature/parse.rs

@@ -1,7 +1,7 @@
 use bevy_ecs::{schedule::ScheduleLabel, world::World};
 
 #[cfg(feature = "shapes")]
-pub use crate::systems::{validate_shapes, validate_with_updated_shapes};
+pub use crate::systems::validate_shapes;
 
 /// [`ScheduleLabel`] related to the OnSave schedule
 #[derive(ScheduleLabel, Clone, Eq, PartialEq, Debug, Hash)]
@@ -10,7 +10,7 @@ pub struct Label;
 pub fn setup_schedule(world: &mut World) {
     let mut on_save = bevy_ecs::schedule::Schedule::new(Label);
     #[cfg(feature = "shapes")]
-    on_save.add_systems((validate_shapes, validate_with_updated_shapes));
+    on_save.add_systems(validate_shapes);
 
     world.add_schedule(on_save);
 }