refactor: 💡 refactor tiny lang (#19)

IWANABETHATGUY · Nov 18, 2024 · 4e7834f · 4e7834f
1 parent 9dae19c
commit 4e7834f
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 141 deletions.
diff --git a/examples/index.rs b/examples/index.rs
@@ -1,6 +1,6 @@
 use anyhow::Ok;
 use nrs_language_server::{
-    chumsky::{parse, ParserResult},
+    nrs_lang::{parse, ParserResult},
     semantic_analyze,
 };
 

diff --git a/src/completion.rs b/src/completion.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use crate::chumsky::{Expr, Func, Spanned};
+use crate::nrs_lang::{Expr, Func, Spanned};
 pub enum ImCompleteCompletionItem {
     Variable(String),
     Function(String, Vec<String>),

diff --git a/src/jump_definition.rs b/src/jump_definition.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,5 +1,5 @@
-pub mod chumsky;
 pub mod completion;
+pub mod nrs_lang;
 pub mod semantic_analyze;
 pub mod semantic_token;
 pub mod span;

diff --git a/src/main.rs b/src/main.rs
@@ -2,10 +2,10 @@ use std::collections::HashMap;
 
 use dashmap::DashMap;
 use log::debug;
-use nrs_language_server::chumsky::{
+use nrs_language_server::completion::completion;
+use nrs_language_server::nrs_lang::{
     parse, type_inference, Ast, ImCompleteSemanticToken, ParserResult,
 };
-use nrs_language_server::completion::completion;
 use nrs_language_server::semantic_analyze::{analyze_program, IdentType, Semantic};
 use nrs_language_server::semantic_token::LEGEND_TYPE;
 use nrs_language_server::span::Span;
@@ -315,10 +315,10 @@ impl LanguageServer for Backend {
                     k.start,
                     k.end,
                     match v {
-                        nrs_language_server::chumsky::Value::Null => "null".to_string(),
-                        nrs_language_server::chumsky::Value::Bool(_) => "bool".to_string(),
-                        nrs_language_server::chumsky::Value::Num(_) => "number".to_string(),
-                        nrs_language_server::chumsky::Value::Str(_) => "string".to_string(),
+                        nrs_language_server::nrs_lang::Value::Null => "null".to_string(),
+                        nrs_language_server::nrs_lang::Value::Bool(_) => "bool".to_string(),
+                        nrs_language_server::nrs_lang::Value::Num(_) => "number".to_string(),
+                        nrs_language_server::nrs_lang::Value::Str(_) => "string".to_string(),
                     },
                 )
             })

diff --git a/src/chumsky.rs → src/nrs_lang.rs b/src/chumsky.rs → src/nrs_lang.rs
diff --git a/src/semantic_analyze.rs b/src/semantic_analyze.rs
@@ -2,7 +2,7 @@ use rust_lapper::{Interval, Lapper};
 use std::fmt::Display;
 
 use crate::{
-    chumsky::{Ast, Expr, Func},
+    nrs_lang::{Ast, Expr, Func},
     span::Span,
     symbol_table::{ReferenceId, SymbolId, SymbolTable},
 };

diff --git a/src/semantic_token.rs b/src/semantic_token.rs
@@ -1,8 +1,8 @@
 use std::collections::HashMap;
 
-use tower_lsp::lsp_types::{SemanticTokenType};
+use tower_lsp::lsp_types::SemanticTokenType;
 
-use crate::chumsky::{Expr, Func, ImCompleteSemanticToken, Spanned};
+use crate::nrs_lang::{Expr, Func, ImCompleteSemanticToken, Spanned};
 
 pub const LEGEND_TYPE: &[SemanticTokenType] = &[
     SemanticTokenType::FUNCTION,