Revert ":bug: - fix faulty parse logic"

This reverts commit b16c67f.
rescript-lang · Apr 16, 2024 · 044fddd · 044fddd
1 parent 775b36b
commit 044fddd
Showing 1 changed file with 36 additions and 68 deletions.
diff --git a/src/build/parse.rs b/src/build/parse.rs
@@ -103,90 +103,58 @@ pub fn generate_asts(
                     .packages
                     .get(&module.package_name)
                     .expect("Package not found");
-                if is_dirty {
-                    module.compile_dirty = true
-                }
-                match ast_path {
-                    Ok((_path, err)) => {
-                        match module.source_type {
-                            SourceType::SourceFile(ref mut source_file) => {
-                                source_file.implementation.parse_dirty = false;
-                                source_file
-                                    .interface
-                                    .as_mut()
-                                    .map(|interface| interface.parse_dirty = false);
-                            }
-                            _ => (),
-                        }
-                        // supress warnings in non-pinned deps
-                        match module.source_type {
-                            SourceType::SourceFile(ref mut source_file) => {
-                                source_file.implementation.parse_state = ParseState::Success;
-                            }
-                            _ => (),
-                        }
-
-                        if package.is_pinned_dep {
-                            if let Some(err) = err {
-                                match module.source_type {
-                                    SourceType::SourceFile(ref mut source_file) => {
-                                        source_file.implementation.parse_state = ParseState::Warning;
-                                        source_file.implementation.parse_dirty = true;
-                                    }
-                                    _ => (),
-                                }
-                                logs::append(package, &err);
-                                stderr.push_str(&err);
-                            }
+                match (ast_path, module.source_type.to_owned()) {
+                    // supress warnings in non-pinned deps
+                    (Ok((_path, Some(err))), SourceType::SourceFile(ref mut source_file))
+                        if package.is_pinned_dep =>
+                    {
+                        source_file.implementation.parse_state = ParseState::Warning;
+                        source_file.implementation.parse_dirty = true;
+                        if let Some(interface) = source_file.interface.as_mut() {
+                            interface.parse_dirty = false;
                         }
+                        logs::append(package, &err);
+                        stderr.push_str(&err);
                     }
-                    Err(err) => {
-                        match module.source_type {
-                            SourceType::SourceFile(ref mut source_file) => {
-                                source_file.implementation.parse_state = ParseState::ParseError;
-                                source_file.implementation.parse_dirty = true;
-                            }
-                            _ => (),
+                    (Ok((_path, None)), SourceType::SourceFile(ref mut source_file)) => {
+                        source_file.implementation.parse_state = ParseState::Success;
+                        source_file.implementation.parse_dirty = false;
+                        if let Some(interface) = source_file.interface.as_mut() {
+                            interface.parse_dirty = false;
                         }
+                    }
+                    (Err(err), SourceType::SourceFile(ref mut source_file)) => {
+                        source_file.implementation.parse_state = ParseState::ParseError;
+                        source_file.implementation.parse_dirty = true;
                         logs::append(package, &err);
                         has_failure = true;
                         stderr.push_str(&err);
                     }
+                    _ => (),
                 };
-                match iast_path {
-                    Ok(Some((_path, err))) => {
+
+                match (iast_path, module.source_type.to_owned()) {
+                    (Ok(Some((_path, Some(err)))), SourceType::SourceFile(ref mut source_file))
+                        if package.is_pinned_dep =>
+                    {
                         // supress warnings in non-pinned deps
-                        if package.is_pinned_dep {
-                            if let Some(err) = err {
-                                match module.source_type {
-                                    SourceType::SourceFile(ref mut source_file) => {
-                                        source_file.interface.as_mut().map(|interface| {
-                                            interface.parse_state = ParseState::ParseError;
-                                            interface.parse_dirty = true;
-                                        });
-                                    }
-                                    _ => (),
-                                }
-                                logs::append(package, &err);
-                                stderr.push_str(&err);
-                            }
+                        if let Some(interface) = source_file.interface.as_mut() {
+                            interface.parse_state = ParseState::Warning;
+                            interface.parse_dirty = true;
                         }
+                        logs::append(package, &err);
+                        stderr.push_str(&err);
                     }
-                    Ok(None) => (),
-                    Err(err) => {
-                        match module.source_type {
-                            SourceType::SourceFile(ref mut source_file) => {
-                                source_file.interface.as_mut().map(|interface| {
-                                    interface.parse_state = ParseState::ParseError;
-                                    interface.parse_dirty = true;
-                                });
-                            }
-                            _ => (),
+                    (Err(err), SourceType::SourceFile(ref mut source_file)) => {
+                        if let Some(interface) = source_file.interface.as_mut() {
+                            interface.parse_state = ParseState::ParseError;
+                            interface.parse_dirty = true;
                         }
                         logs::append(package, &err);
                         has_failure = true;
                         stderr.push_str(&err);
                     }
+                    _ => (),
                 };
             }
         });