Implemented symbol isolation for functions in C source files

Author: IsaacShelton

Diff for: src/resolve/func_haystack.rs

@@ -16,6 +16,9 @@ use crate::{
 use itertools::Itertools;
 use std::collections::HashMap;
 
+/// A function haystack for a module.
+/// Specific files can have additional restrictions based on
+/// `ctx.physical_fs_node_id`
 #[derive(Clone, Debug)]
 pub struct FuncHaystack {
     pub available: HashMap<ResolvedName, Vec<asg::FuncRef>>,
@@ -55,12 +58,25 @@ impl FuncHaystack {
     pub fn find_near_matches(&self, ctx: &ResolveExprCtx, name: &Name) -> Vec<String> {
         // TODO: Clean up this function
 
+        let isolate_from_module = ctx
+            .asg
+            .workspace
+            .fs
+            .get(ctx.physical_fs_node_id)
+            .isolate_from_module;
+
+        let local_fs_node_id = if isolate_from_module {
+            ctx.physical_fs_node_id
+        } else {
+            self.module_fs_node_id
+        };
+
         let local_matches = self
             .available
-            .get(&ResolvedName::new(self.module_fs_node_id, name))
+            .get(&ResolvedName::new(local_fs_node_id, name))
             .into_iter()
             .chain(
-                (self.module_fs_node_id != ctx.physical_fs_node_id)
+                (local_fs_node_id != ctx.physical_fs_node_id)
                     .then(|| {
                         self.available
                             .get(&ResolvedName::new(ctx.physical_fs_node_id, name))
@@ -202,12 +218,25 @@ impl FuncHaystack {
         arguments: &[TypedExpr],
         source: Source,
     ) -> Option<Result<Callee, FindFunctionError>> {
+        let isolate_from_module = ctx
+            .asg
+            .workspace
+            .fs
+            .get(ctx.physical_fs_node_id)
+            .isolate_from_module;
+
+        let local_fs_node_id = if isolate_from_module {
+            ctx.physical_fs_node_id
+        } else {
+            self.module_fs_node_id
+        };
+
         let mut local_matches = self
             .available
-            .get(&ResolvedName::new(self.module_fs_node_id, name))
+            .get(&ResolvedName::new(local_fs_node_id, name))
             .into_iter()
             .chain(
-                (self.module_fs_node_id != ctx.physical_fs_node_id)
+                (local_fs_node_id != ctx.physical_fs_node_id)
                     .then(|| {
                         self.available
                             .get(&ResolvedName::new(ctx.physical_fs_node_id, name))

Diff for: src/resolve/helper_expr.rs

@@ -9,6 +9,7 @@ use crate::{
     asg::{Asg, HelperExprDecl},
     ast::AstWorkspace,
 };
+use std::borrow::Cow;
 
 pub fn resolve_helper_expressions(
     ctx: &mut ResolveCtx,
@@ -20,17 +21,18 @@ pub fn resolve_helper_expressions(
         let settings = &ast_workspace.settings[file.settings.unwrap_or_default().0];
 
         // NOTE: This module should already have a function haystack
-        let func_haystack = ctx
-            .func_haystacks
-            .get(&module_folder_id)
-            .expect("function haystack to exist for file");
+        let func_haystack = Cow::Borrowed(
+            ctx.func_haystacks
+                .get(&module_folder_id)
+                .expect("function haystack to exist for file"),
+        );
 
         for helper_expr in file.helper_exprs.iter() {
             let value = {
                 let variable_haystack = VariableHaystack::new();
                 let mut ctx = ResolveExprCtx {
                     asg,
-                    func_haystack,
+                    func_haystack: &func_haystack,
                     variable_haystack,
                     func_ref: None,
                     settings,

Diff for: src/workspace/fs.rs

@@ -34,6 +34,7 @@ impl Fs {
             parent: None,
             segment: OsString::new().into_boxed_os_str(),
             filename: OsString::new().into(),
+            isolate_from_module: false,
         };
 
         // We assume that the root is at index 0
@@ -100,6 +101,7 @@ pub struct FsNode {
     pub parent: Option<FsNodeId>,
     pub segment: Box<OsStr>,
     pub filename: Box<OsStr>,
+    pub isolate_from_module: bool,
 }
 
 impl FsNode {
@@ -136,6 +138,10 @@ impl FsNode {
                 .into_os_string()
                 .into_boxed_os_str();
 
+            let is_c_source_file = Path::new(&segment)
+                .extension()
+                .map_or(false, |extension| extension == "c");
+
             fs.new_node(FsNode {
                 last_modified_ms: last_modified_ms.into(),
                 node_type: rest
@@ -146,6 +152,7 @@ impl FsNode {
                 parent,
                 segment,
                 filename,
+                isolate_from_module: is_c_source_file,
             })
         };