Rename and refactor docs item name function.

amber-lang · Sep 15, 2024 · 460c612 · 460c612
1 parent 768abf6
commit 460c612
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/src/modules/block.rs b/src/modules/block.rs
@@ -86,7 +86,7 @@ impl DocumentationModule for Block {
  fn document(&self, meta: &ParserMetadata) -> String {
  let indices = self.statements.iter()
  .enumerate()
- .map(|(index, statement)| (index, statement.name()))
+ .map(|(index, statement)| (index, statement.get_docs_item_name()))
  .filter_map(|(index, name)| name.map(|n| (n, index)))
  .sorted()
  .collect::<Vec<_>>();

diff --git a/src/modules/statement/stmt.rs b/src/modules/statement/stmt.rs
@@ -71,15 +71,6 @@ pub enum StatementType {
  CommentDoc(CommentDoc)
 }
 
-impl StatementType {
- pub fn name(&self) -> Option<String> {
- match self {
- StatementType::FunctionDeclaration(inner) => Some(inner.name.clone()),
- _ => None,
- }
- }
-}
-
 #[derive(Debug, Clone)]
 pub struct Statement {
  pub value: Option<StatementType>
@@ -124,11 +115,10 @@ impl Statement {
  }
  }
 
- pub fn name(&self) -> Option<String> {
- if let Some(value) = &self.value {
- value.name()
- } else {
- None
+ pub fn get_docs_item_name(&self) -> Option<String> {
+ match &self.value {
+ Some(StatementType::FunctionDeclaration(inner)) => Some(inner.name.clone()),
+ _ => None,
  }
  }
 }