Refactor build system stuff to standalone LSP module

Summary: Kyle wanted a refactor of the build system functionality into a standalone file. Not fully sure if this is what he meant, but probably a good thing to do anyway.

Reviewed By: kinto0

Differential Revision: D83537090

fbshipit-source-id: f7398b33dd884ff403e28474e2da83a42b56195c

Author: connernilsen

pyrefly/lib/lsp/build_system.rs

@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+use std::ffi::OsString;
+use std::sync::Arc;
+use std::sync::LazyLock;
+
+use dupe::Dupe as _;
+use pyrefly_build::handle::Handle;
+use pyrefly_config::config::ConfigFile;
+use pyrefly_python::COMPILED_FILE_SUFFIXES;
+use pyrefly_python::PYTHON_EXTENSIONS;
+use pyrefly_python::module_path::ModulePath;
+use pyrefly_util::arc_id::ArcId;
+use pyrefly_util::events::CategorizedEvents;
+use pyrefly_util::lock::Mutex;
+use starlark_map::small_map::SmallMap;
+use starlark_map::small_set::SmallSet;
+
+use crate::lsp::queue::HeavyTaskQueue;
+use crate::lsp::queue::LspEvent;
+use crate::lsp::queue::LspQueue;
+use crate::state::state::State;
+
+pub fn should_requery_build_system(events: &CategorizedEvents) -> bool {
+    static CONFIG_NAMES: LazyLock<SmallSet<OsString>> = LazyLock::new(|| {
+        ConfigFile::CONFIG_FILE_NAMES
+            .iter()
+            .chain(ConfigFile::ADDITIONAL_ROOT_FILE_NAMES.iter())
+            .map(OsString::from)
+            .collect()
+    });
+    static PYTHON_SUFFIXES: LazyLock<SmallSet<OsString>> = LazyLock::new(|| {
+        PYTHON_EXTENSIONS
+            .iter()
+            .chain(COMPILED_FILE_SUFFIXES.iter())
+            .map(OsString::from)
+            .collect()
+    });
+
+    events.iter().any(|f| {
+        !(f.file_name().is_some_and(|n| CONFIG_NAMES.contains(n))
+            || f.extension().is_some_and(|e| PYTHON_SUFFIXES.contains(e)))
+    })
+}
+
+/// Attempts to requery any open sourced_dbs for open files, and if there are changes,
+/// invalidate find and perform a recheck.
+pub fn queue_source_db_rebuild_and_recheck(
+    state: &State,
+    invalidated_configs: Arc<Mutex<SmallSet<ArcId<ConfigFile>>>>,
+    sourcedb_queue: HeavyTaskQueue,
+    lsp_queue: LspQueue,
+    handles: &[Handle],
+) {
+    let mut configs_to_paths: SmallMap<ArcId<ConfigFile>, SmallSet<ModulePath>> = SmallMap::new();
+    let config_finder = state.config_finder();
+    for handle in handles {
+        let config = config_finder.python_file(handle.module(), handle.path());
+        configs_to_paths
+            .entry(config)
+            .or_default()
+            .insert(handle.path().dupe());
+    }
+    sourcedb_queue.queue_task(Box::new(move || {
+        let new_invalidated_configs: SmallSet<ArcId<ConfigFile>> = configs_to_paths
+            .into_iter()
+            .filter(|(c, files)| match c.requery_source_db(files) {
+                Ok(reloaded) => reloaded,
+                Err(error) => {
+                    eprintln!("Error reloading source database for config: {error}");
+                    false
+                }
+            })
+            .map(|(c, _)| c)
+            .collect();
+        if !new_invalidated_configs.is_empty() {
+            let mut lock = invalidated_configs.lock();
+            for c in new_invalidated_configs {
+                lock.insert(c);
+            }
+            let _ = lsp_queue.send(LspEvent::InvalidateConfigFind);
+        }
+    }));
+}

pyrefly/lib/lsp/mod.rs

@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+mod build_system;
 pub mod features;
 pub mod lsp;
 pub mod module_helpers;

pyrefly/lib/lsp/server.rs

@@ -7,12 +7,10 @@
 
 use std::collections::HashMap;
 use std::collections::HashSet;
-use std::ffi::OsString;
 use std::iter::once;
 use std::path::Path;
 use std::path::PathBuf;
 use std::sync::Arc;
-use std::sync::LazyLock;
 use std::sync::atomic::AtomicBool;
 use std::sync::atomic::AtomicI32;
 use std::sync::atomic::Ordering;
@@ -147,7 +145,6 @@ use lsp_types::request::WorkspaceConfiguration;
 use lsp_types::request::WorkspaceSymbolRequest;
 use pyrefly_build::handle::Handle;
 use pyrefly_config::config::ConfigSource;
-use pyrefly_python::COMPILED_FILE_SUFFIXES;
 use pyrefly_python::PYTHON_EXTENSIONS;
 use pyrefly_python::module::TextRangeWithModule;
 use pyrefly_python::module_name::ModuleName;
@@ -171,6 +168,8 @@ use starlark_map::small_set::SmallSet;
 use crate::commands::lsp::IndexingMode;
 use crate::config::config::ConfigFile;
 use crate::error::error::Error;
+use crate::lsp::build_system::queue_source_db_rebuild_and_recheck;
+use crate::lsp::build_system::should_requery_build_system;
 use crate::lsp::features::hover::get_hover;
 use crate::lsp::lsp::apply_change_events;
 use crate::lsp::lsp::as_notification;
@@ -1078,7 +1077,7 @@ impl Server {
                 ide_transaction_manager.save(transaction);
             }
         }
-        Self::queue_source_db_rebuild_and_recheck(
+        queue_source_db_rebuild_and_recheck(
             &self.state,
             self.invalidated_configs.dupe(),
             self.sourcedb_queue.dupe(),
@@ -1087,47 +1086,6 @@ impl Server {
         );
     }
 
-    /// Attempts to requery any open sourced_dbs for open files, and if there are changes,
-    /// invalidate find and perform a recheck.
-    fn queue_source_db_rebuild_and_recheck(
-        state: &State,
-        invalidated_configs: Arc<Mutex<SmallSet<ArcId<ConfigFile>>>>,
-        sourcedb_queue: HeavyTaskQueue,
-        lsp_queue: LspQueue,
-        handles: &[Handle],
-    ) {
-        let mut configs_to_paths: SmallMap<ArcId<ConfigFile>, SmallSet<ModulePath>> =
-            SmallMap::new();
-        let config_finder = state.config_finder();
-        for handle in handles {
-            let config = config_finder.python_file(handle.module(), handle.path());
-            configs_to_paths
-                .entry(config)
-                .or_default()
-                .insert(handle.path().dupe());
-        }
-        sourcedb_queue.queue_task(Box::new(move || {
-            let new_invalidated_configs: SmallSet<ArcId<ConfigFile>> = configs_to_paths
-                .into_iter()
-                .filter(|(c, files)| match c.requery_source_db(files) {
-                    Ok(reloaded) => reloaded,
-                    Err(error) => {
-                        eprintln!("Error reloading source database for config: {error}");
-                        false
-                    }
-                })
-                .map(|(c, _)| c)
-                .collect();
-            if !new_invalidated_configs.is_empty() {
-                let mut lock = invalidated_configs.lock();
-                for c in new_invalidated_configs {
-                    lock.insert(c);
-                }
-                let _ = lsp_queue.send(LspEvent::InvalidateConfigFind);
-            }
-        }));
-    }
-
     fn invalidate_find_for_configs(&self, invalidated_configs: SmallSet<ArcId<ConfigFile>>) {
         self.invalidate(|t| t.invalidate_find_for_configs(invalidated_configs));
     }
@@ -1379,25 +1337,7 @@ impl Server {
 
         let events = CategorizedEvents::new_lsp(params.changes);
 
-        static CONFIG_NAMES: LazyLock<SmallSet<OsString>> = LazyLock::new(|| {
-            ConfigFile::CONFIG_FILE_NAMES
-                .iter()
-                .chain(ConfigFile::ADDITIONAL_ROOT_FILE_NAMES.iter())
-                .map(OsString::from)
-                .collect()
-        });
-        static PYTHON_SUFFIXES: LazyLock<SmallSet<OsString>> = LazyLock::new(|| {
-            PYTHON_EXTENSIONS
-                .iter()
-                .chain(COMPILED_FILE_SUFFIXES.iter())
-                .map(OsString::from)
-                .collect()
-        });
-
-        let should_requery_build_system = events.iter().any(|f| {
-            !(f.file_name().is_some_and(|n| CONFIG_NAMES.contains(n))
-                || f.extension().is_some_and(|e| PYTHON_SUFFIXES.contains(e)))
-        });
+        let should_requery_build_system = should_requery_build_system(&events);
 
         self.invalidate(move |t| t.invalidate_events(&events));
         // rewatch files in case we loaded or dropped any configs
@@ -1413,7 +1353,7 @@ impl Server {
                 .keys()
                 .map(|x| make_open_handle(&self.state, x))
                 .collect::<Vec<_>>();
-            Self::queue_source_db_rebuild_and_recheck(
+            queue_source_db_rebuild_and_recheck(
                 &self.state,
                 self.invalidated_configs.dupe(),
                 self.sourcedb_queue.dupe(),
@@ -1443,7 +1383,7 @@ impl Server {
             let handles =
                 Self::validate_in_memory_for_transaction(&state, &open_files, transaction.as_mut());
             state.commit_transaction(transaction);
-            Self::queue_source_db_rebuild_and_recheck(
+            queue_source_db_rebuild_and_recheck(
                 &state,
                 invalidated_configs,
                 sourcedb_queue,