resolve angle-bracket includes under include/ and enable Ctrl+Click nav

Author: maxijabase

crates/base-db/src/include.rs

@@ -171,12 +171,38 @@ pub(crate) fn file_includes_query(
                     }
                     _ => continue,
                 };
+                // Try resolving relative to the current file's directory first
+                if let Some(include_file_id) = db.resolve_path(AnchoredPath::new(file_id, &path)) {
+                    res.push(Include::new(include_file_id, kind, type_, ext));
+                    continue;
+                }
+                // Try resolving relative to the file's `include/` subdirectory
+                if kind == IncludeKind::Chevrons {
+                    let anchored_with_include = format!("include/{}", path);
+                    if let Some(include_file_id) =
+                        db.resolve_path(AnchoredPath::new(file_id, &anchored_with_include))
+                    {
+                        res.push(Include::new(include_file_id, kind, type_, ext));
+                        continue;
+                    }
+                }
+                // Try resolving relative to the configured source roots
                 match db.resolve_path_relative_to_roots(&path) {
                     Some(include_file_id) => {
                         res.push(Include::new(include_file_id, kind, type_, ext));
                         continue;
                     }
                     None => {
+                        // Try common include subdirectory fallback for chevron includes
+                        if kind == IncludeKind::Chevrons {
+                            let fallback = format!("include/{}", path);
+                            if let Some(include_file_id) =
+                                db.resolve_path_relative_to_roots(&fallback)
+                            {
+                                res.push(Include::new(include_file_id, kind, type_, ext));
+                                continue;
+                            }
+                        }
                         if type_ == IncludeType::Include {
                             // TODO: Optional diagnostic for tryinclude ?
                             // FIXME: Emit the diagnostics in the preprocessor. This would make more sense as some

crates/hir-def/src/db.rs

@@ -218,8 +218,62 @@ pub fn resolve_include_node(
     };
     let extension = infer_include_ext(&mut text);
 
+    // Try resolving relative to current file directory first
+    if let Some(file_id) = db.resolve_path(AnchoredPath::new(file_id, &text)) {
+        return Some((
+            Some(file_id),
+            kind,
+            type_,
+            text.to_string(),
+            NodePtr::from(&path_node),
+            extension,
+        ));
+    }
+
+    // Try resolving relative to the file's include/ subdirectory for chevrons
+    if kind == IncludeKind::Chevrons {
+        let text_with_include = format!("include/{}", text);
+        if let Some(file_id) = db.resolve_path(AnchoredPath::new(file_id, &text_with_include)) {
+            return Some((
+                Some(file_id),
+                kind,
+                type_,
+                text.to_string(),
+                NodePtr::from(&path_node),
+                extension,
+            ));
+        }
+    }
+
+    // Try resolving relative to roots
+    if let Some(file_id) = db.resolve_path_relative_to_roots(&text) {
+        return Some((
+            Some(file_id),
+            kind,
+            type_,
+            text.to_string(),
+            NodePtr::from(&path_node),
+            extension,
+        ));
+    }
+
+    // Try resolving include/<path> relative to roots for chevrons
+    if kind == IncludeKind::Chevrons {
+        let text_with_include = format!("include/{}", text);
+        if let Some(file_id) = db.resolve_path_relative_to_roots(&text_with_include) {
+            return Some((
+                Some(file_id),
+                kind,
+                type_,
+                text.to_string(),
+                NodePtr::from(&path_node),
+                extension,
+            ));
+        }
+    }
+
     (
-        db.resolve_path_relative_to_roots(&text),
+        None,
         kind,
         type_,
         text,

crates/preprocessor/src/db.rs

@@ -103,6 +103,15 @@ pub(crate) fn _preprocess_file_params_query(
             if inc_file_id.is_none() {
                 inc_file_id = db.resolve_path_relative_to_roots(&path);
             }
+            if inc_file_id.is_none() {
+                inc_file_id = db.resolve_path(AnchoredPath::new(file_id, &path));
+            }
+            if inc_file_id.is_none() && !quoted {
+                let path_with_include = format!("include/{}", path);
+                inc_file_id = db
+                    .resolve_path_relative_to_roots(&path_with_include)
+                    .or_else(|| db.resolve_path(AnchoredPath::new(file_id, &path_with_include)));
+            }
             let inc_file_id = inc_file_id.ok_or_else(|| anyhow::anyhow!("Include not found"))?;
             if being_preprocessed.contains(&inc_file_id) {
                 // Avoid cyclic deps
@@ -170,6 +179,15 @@ pub(crate) fn _preprocess_file_data_query(
             if inc_file_id.is_none() {
                 inc_file_id = db.resolve_path_relative_to_roots(&path);
             }
+            if inc_file_id.is_none() {
+                inc_file_id = db.resolve_path(AnchoredPath::new(file_id, &path));
+            }
+            if inc_file_id.is_none() && !quoted {
+                let path_with_include = format!("include/{}", path);
+                inc_file_id = db
+                    .resolve_path_relative_to_roots(&path_with_include)
+                    .or_else(|| db.resolve_path(AnchoredPath::new(file_id, &path_with_include)));
+            }
             let inc_file_id = inc_file_id.ok_or_else(|| anyhow::anyhow!("Include not found"))?;
             macros.extend(
                 params