Merge pull request #64 from pontem-network/fix_for_build_panic

Fix for error mapping.

Author: RIg410

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "dove"
-version = "1.2.1"
+version = "1.2.2"
 authors = [
     "Alex Koz. <alexanderkozlovskii@wings.ai>",
     "Dm. Yakushev <dmitryyakushev@wings.ai>",

dove/Cargo.toml

@@ -14,6 +14,7 @@ use move_core_types::language_storage::{ModuleId, CORE_CODE_ADDRESS};
 use move_core_types::identifier::Identifier;
 use vm::CompiledModule;
 use vm::errors::Location;
+use lang::compiler::source_map::ProjectOffsetMap;
 
 /// Extracts metadata form source code.
 pub fn source_meta(
@@ -24,8 +25,10 @@ pub fn source_meta(
     let name = ConstPool::push(file.to_str().unwrap_or("source"));
     let source = fs::read_to_string(file)?;
 
-    let (defs, _, errors, _) =
-        parse_file(dialect, &mut HashMap::default(), name, &source, sender);
+    let mut files = HashMap::new();
+
+    let (defs, _, errors, file_offset_map) =
+        parse_file(dialect, &mut files, name, &source, sender);
     if errors.is_empty() {
         let mut metadata = Vec::new();
         for def in defs {
@@ -46,15 +49,15 @@ pub fn source_meta(
             meta: metadata,
         })
     } else {
-        let mut files = HashMap::new();
-        files.insert(name, source);
+        let offsets_map = ProjectOffsetMap::with_file_map(name, file_offset_map);
         let mut writer = StandardStream::stderr(ColorChoice::Auto);
-        errors::output_errors(&mut writer, files, errors);
+        errors::output_errors(&mut writer, files, offsets_map.transform(errors));
         Err(anyhow!("Failed to parse move file:{}", name))
     }
 }
 
 /// Move definition metadata.
+#[derive(Debug)]
 pub struct DefinitionMeta {
     /// Module identifier.
     pub module_id: ModuleId,
@@ -63,6 +66,7 @@ pub struct DefinitionMeta {
 }
 
 /// Move file metadata.
+#[derive(Debug)]
 pub struct FileMeta {
     /// File path.
     pub path: Rc<str>,

dove/src/index/meta.rs

@@ -16,7 +16,6 @@ vm = { git = "https://github.com/pontem-network/diem.git", branch = "release-1.2
 move-vm-types = { git = "https://github.com/pontem-network/diem.git", branch = "release-1.2.0-v1" }
 move-ir-types = { git = "https://github.com/pontem-network/diem.git", branch = "release-1.2.0-v1" }
 ir-to-bytecode-syntax = { git = "https://github.com/pontem-network/diem.git", branch = "release-1.2.0-v1" }
-
 compat = { path = "compat", package = "move-compat" }
 
 serde = "1.0.125"

lang/Cargo.toml

@@ -136,23 +136,23 @@ pub fn parse_file(
     Errors,
     FileOffsetMap,
 ) {
+    files.insert(fname, source_buffer.to_owned());
+
     let sender_str = sender.map(|sender| format!("{:#x}", sender));
     let mut mut_source = MutString::new(source_buffer);
     let file_source_map =
         normalize_source_text(dialect, (source_buffer, &mut mut_source), &sender_str);
 
-    let source_buffer = mut_source.freeze();
+    let mutated_source = mut_source.freeze();
 
-    let (no_comments_buffer, comment_map) = match strip_comments_and_verify(fname, &source_buffer)
-    {
-        Err(errors) => {
-            files.insert(fname, source_buffer);
-            return (vec![], Default::default(), errors, file_source_map);
-        }
-        Ok(result) => result,
-    };
+    let (no_comments_buffer, comment_map) =
+        match strip_comments_and_verify(fname, &mutated_source) {
+            Err(errors) => {
+                return (vec![], Default::default(), errors, file_source_map);
+            }
+            Ok(result) => result,
+        };
 
-    files.insert(fname, source_buffer);
     match parse_file_string(fname, &no_comments_buffer, FileCommentMap::default()) {
         Ok((defs, _)) => (defs, comment_map, Vec::default(), file_source_map),
         Err(errors) => (vec![], comment_map, errors, file_source_map),