Index and emit R6 methods as methods

Author: lionel-

crates/ark/src/lsp/completions/sources/composite/call.rs

@@ -267,6 +267,7 @@ fn completions_from_workspace_arguments(
             return Ok(None);
         },
         indexer::IndexEntryData::Variable { .. } => return Ok(None),
+        indexer::IndexEntryData::Method { .. } => return Ok(None),
     }
 
     // Only 1 call worth of arguments are added to the completion set.

crates/ark/src/lsp/completions/sources/composite/workspace.rs

@@ -125,6 +125,9 @@ fn completions_from_workspace(
                 };
                 completions.push(completion);
             },
+
+            // Methods are currently only indexed for workspace symbols
+            indexer::IndexEntryData::Method { .. } => {},
         }
     });
 

crates/ark/src/lsp/indexer.rs

@@ -39,6 +39,10 @@ pub enum IndexEntryData {
         name: String,
         arguments: Vec<String>,
     },
+    // Like Function but not used for completions yet
+    Method {
+        name: String,
+    },
     Section {
         level: usize,
         title: String,
@@ -359,11 +363,10 @@ fn index_r6_class(
             let start = convert_point_to_position(contents, mtd_name.start_position());
             let end = convert_point_to_position(contents, mtd_name.end_position());
 
-            // TODO!: Should be Method
             entries.push(IndexEntry {
                 key: name.clone(),
                 range: Range { start, end },
-                data: IndexEntryData::Variable { name },
+                data: IndexEntryData::Method { name },
             });
         }
     }

crates/ark/src/lsp/snapshots/ark__lsp__indexer__tests__index_r6class.snap

@@ -15,7 +15,7 @@ expression: entries
                 character: 18,
             },
         },
-        data: Variable {
+        data: Method {
             name: "initialize",
         },
     },
@@ -31,7 +31,7 @@ expression: entries
                 character: 21,
             },
         },
-        data: Variable {
+        data: Method {
             name: "public_method",
         },
     },
@@ -47,7 +47,7 @@ expression: entries
                 character: 22,
             },
         },
-        data: Variable {
+        data: Method {
             name: "private_method",
         },
     },

crates/ark/src/lsp/snapshots/ark__lsp__indexer__tests__index_r6class_namespaced.snap

@@ -15,7 +15,7 @@ expression: entries
                 character: 18,
             },
         },
-        data: Variable {
+        data: Method {
             name: "initialize",
         },
     },

crates/ark/src/lsp/symbols.rs

@@ -93,6 +93,7 @@ pub fn symbols(params: &WorkspaceSymbolParams) -> anyhow::Result<Vec<SymbolInfor
                     container_name: None,
                 });
             },
+
             IndexEntryData::Variable { name } => {
                 info.push(SymbolInformation {
                     name: name.clone(),
@@ -106,6 +107,20 @@ pub fn symbols(params: &WorkspaceSymbolParams) -> anyhow::Result<Vec<SymbolInfor
                     container_name: None,
                 });
             },
+
+            IndexEntryData::Method { name } => {
+                info.push(SymbolInformation {
+                    name: name.clone(),
+                    kind: SymbolKind::METHOD,
+                    location: Location {
+                        uri: Url::from_file_path(path).unwrap(),
+                        range: entry.range,
+                    },
+                    tags: None,
+                    deprecated: None,
+                    container_name: None,
+                });
+            },
         };
     });