Updated mapping data structure

crates/analyzer/src/builder.rs

@@ -6,7 +6,7 @@ use std::{
 };
 
 use cargo_metadata::{CompilerMessage, Message};
-use mist_parser::rev_mapper::{self, RustMap, find_mapping};
+use mist_parser::rev_mapper;
 
 #[derive(Debug, Clone)]
 pub struct MistDiagnosticMessage {

crates/analyzer/src/lib.rs

@@ -57,29 +57,30 @@ impl Backend {
 
         match self.mapping.lock().await.get(&rs_path) {
             Some(mapping) => {
+                rs_loc
                 // FIX: Match the find_mapping operation instead of calling .expect("Failed to map")
-                match rev_mapper::find_mapping(
-                    mapping,
-                    &rev_mapper::RustMap(
-                        rs_loc.range.start.line as usize,
-                        rs_loc.range.start.character as usize,
-                    ),
-                ) {
-                    Some((_, rev_mapper::MistMap(line, character))) => Location {
-                        uri: Url::from_file_path(from_rust_to_mist(rs_path)).unwrap(),
-                        range: Range {
-                            start: Position {
-                                line: line as u32 - 1,
-                                character: character as u32,
-                            },
-                            end: Position {
-                                line: line as u32 - 1,
-                                character: character as u32 + 1,
-                            },
-                        },
-                    },
-                    None => rs_loc,
-                }
+                // match rev_mapper::find_mapping(
+                //     mapping,
+                //     &rev_mapper::RustMap(
+                //         rs_loc.range.start.line as usize,
+                //         rs_loc.range.start.character as usize,
+                //     ),
+                // ) {
+                //     Some((_, rev_mapper::MistMap(line, character))) => Location {
+                //         uri: Url::from_file_path(from_rust_to_mist(rs_path)).unwrap(),
+                //         range: Range {
+                //             start: Position {
+                //                 line: line as u32 - 1,
+                //                 character: character as u32,
+                //             },
+                //             end: Position {
+                //                 line: line as u32 - 1,
+                //                 character: character as u32 + 1,
+                //             },
+                //         },
+                //     },
+                //     None => rs_loc,
+                // }
             }
             None => rs_loc,
         }

crates/analyzer/src/transpiler.rs

@@ -135,19 +135,22 @@ pub fn transpile_file(path: &Path, output_path: &Path) -> Result<(), String> {
     // If parsing fails, return the error string back gracefully so the LSP can show it
     let ast = parser_result.map_err(|e| format!("parse failed in {}:\n{}", path.display(), e))?;
 
-    let mut gc = mist_codegen::RustCodegen::new();
-    let output = gc.generate(ast);
+    panic!();
 
-    fs::write(output_path, output)
-        .map_err(|e| format!("failed to write output {}: {}", output_path.display(), e))?;
+    // let mut gc = mist_codegen::RustCodegen::new();
+    // let output = gc.generate(ast);
 
-    Ok(())
+    // fs::write(output_path, output)
+    //     .map_err(|e| format!("failed to write output {}: {}", output_path.display(), e))?;
+
+    // Ok(())
 }
 
 pub fn transpile_text<'a>(source: &'a str) -> Result<String, ParseError<'a, Vec<TopLevel>>> {
-    let mut gc = mist_codegen::RustCodegen::new();
+    panic!();
+    // let mut gc = mist_codegen::RustCodegen::new();
 
-    Ok(gc.generate(mist_parser::parse(&source)?))
+    // Ok(gc.generate(mist_parser::parse(&source)?))
 }
 
 fn should_skip(source: &Path, output: &Path) -> bool {