Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: 💡 rename use semantic api #17

Merged
merged 2 commits into from
Nov 18, 2024
Merged

refactor: 💡 rename use semantic api #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45dd137
refactor: 💡 rename use semantic api
IWANABETHATGUY Nov 18, 2024
63dbfc0
chore: 🤖 update
IWANABETHATGUY Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions src/chumsky.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ pub enum Token {
Else,
}

pub type Ast = HashMap<String, Func>;
pub type Ast = Vec<Spanned<Func>>;

impl fmt::Display for Token {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
Expand Down Expand Up @@ -404,7 +404,7 @@ fn expr_parser() -> impl Parser<Token, Spanned<Expr>, Error = Simple<Token>> + C
})
}

pub fn funcs_parser() -> impl Parser<Token, HashMap<String, Func>, Error = Simple<Token>> + Clone {
pub fn funcs_parser() -> impl Parser<Token, Vec<Spanned<Func>>, Error = Simple<Token>> + Clone {
let ident = filter_map(|span, tok| match tok {
Token::Ident(ident) => Ok(ident),
_ => Err(Simple::expected_input_found(span, Vec::new(), Some(tok))),
Expand Down Expand Up @@ -454,16 +454,10 @@ pub fn funcs_parser() -> impl Parser<Token, HashMap<String, Func>, Error = Simpl

func.repeated()
.try_map(|fs, _| {
let mut funcs = HashMap::new();
for ((name, name_span), f) in fs {
if funcs.insert(name.clone(), f).is_some() {
return Err(Simple::custom(
name_span,
format!("Function '{}' already exists", name),
));
}
}
Ok(funcs)
Ok(fs
.into_iter()
.map(|item| (item.1, item.0 .1))
.collect::<Vec<_>>())
})
.then_ignore(end())
}
Expand Down Expand Up @@ -500,7 +494,7 @@ pub fn type_inference(expr: &Spanned<Expr>, symbol_type_table: &mut HashMap<Span

#[derive(Debug)]
pub struct ParserResult {
pub ast: Option<HashMap<String, Func>>,
pub ast: Option<Vec<Spanned<Func>>>,
pub parse_errors: Vec<Simple<String>>,
pub semantic_tokens: Vec<ImCompleteSemanticToken>,
}
Expand Down
24 changes: 14 additions & 10 deletions src/completion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,37 @@ pub enum ImCompleteCompletionItem {
}
/// return (need_to_continue_search, founded reference)
pub fn completion(
ast: &HashMap<String, Func>,
ast: &[Spanned<Func>],
ident_offset: usize,
) -> HashMap<String, ImCompleteCompletionItem> {
let mut map = HashMap::new();
for (_, v) in ast.iter() {
if v.name.1.end < ident_offset {
for (func, _) in ast.iter() {
if func.name.1.end < ident_offset {
map.insert(
v.name.0.clone(),
func.name.0.clone(),
ImCompleteCompletionItem::Function(
v.name.0.clone(),
v.args.clone().into_iter().map(|(name, _)| name).collect(),
func.name.0.clone(),
func.args
.clone()
.into_iter()
.map(|(name, _)| name)
.collect(),
),
);
}
}

// collect params variable
for (_, v) in ast.iter() {
if v.span.end > ident_offset && v.span.start < ident_offset {
for (func, _) in ast.iter() {
if func.span.end > ident_offset && func.span.start < ident_offset {
// log::debug!("this is completion from body {}", name);
v.args.iter().for_each(|(item, _)| {
func.args.iter().for_each(|(item, _)| {
map.insert(
item.clone(),
ImCompleteCompletionItem::Variable(item.clone()),
);
});
get_completion_of(&v.body, &mut map, ident_offset);
get_completion_of(&func.body, &mut map, ident_offset);
}
}
map
Expand Down
2 changes: 0 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
pub mod chumsky;
pub mod completion;
pub mod jump_definition;
pub mod reference;
pub mod semantic_analyze;
pub mod semantic_token;
pub mod span;
Expand Down
142 changes: 79 additions & 63 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ use nrs_language_server::chumsky::{
parse, type_inference, Ast, ImCompleteSemanticToken, ParserResult,
};
use nrs_language_server::completion::completion;
use nrs_language_server::reference::get_reference;
use nrs_language_server::semantic_analyze::{analyze_program, IdentType, Semantic};
use nrs_language_server::semantic_token::{semantic_token_from_ast, LEGEND_TYPE};
use nrs_language_server::semantic_token::LEGEND_TYPE;
use nrs_language_server::span::Span;
use ropey::Rope;
use serde::{Deserialize, Serialize};
Expand All @@ -34,8 +33,15 @@ impl LanguageServer for Backend {
offset_encoding: None,
capabilities: ServerCapabilities {
inlay_hint_provider: Some(OneOf::Left(true)),
text_document_sync: Some(TextDocumentSyncCapability::Kind(
TextDocumentSyncKind::FULL,
text_document_sync: Some(TextDocumentSyncCapability::Options(
TextDocumentSyncOptions {
open_close: Some(true),
change: Some(TextDocumentSyncKind::FULL),
save: Some(TextDocumentSyncSaveOptions::SaveOptions(SaveOptions {
include_text: Some(true),
})),
..Default::default()
},
)),
completion_provider: Some(CompletionOptions {
resolve_provider: Some(false),
Expand Down Expand Up @@ -102,7 +108,7 @@ impl LanguageServer for Backend {
self.on_change(TextDocumentItem {
uri: params.text_document.uri,
text: &params.text_document.text,
version: params.text_document.version,
version: Some(params.text_document.version),
})
.await
}
Expand All @@ -111,12 +117,22 @@ impl LanguageServer for Backend {
self.on_change(TextDocumentItem {
text: &params.content_changes[0].text,
uri: params.text_document.uri,
version: params.text_document.version,
version: Some(params.text_document.version),
})
.await
}

async fn did_save(&self, _: DidSaveTextDocumentParams) {
async fn did_save(&self, params: DidSaveTextDocumentParams) {
dbg!(&params.text);
if let Some(text) = params.text {
let item = TextDocumentItem {
uri: params.text_document.uri,
text: &text,
version: None,
};
self.on_change(item).await;
_ = self.client.semantic_tokens_refresh().await;
}
debug!("file saved!");
}
async fn did_close(&self, _: DidCloseTextDocumentParams) {
Expand All @@ -127,7 +143,7 @@ impl LanguageServer for Backend {
&self,
params: GotoDefinitionParams,
) -> Result<Option<GotoDefinitionResponse>> {
let definition = async {
let definition = || -> Option<GotoDefinitionResponse> {
let uri = params.text_document_position_params.text_document.uri;
let semantic = self.semantic_map.get(uri.as_str())?;
let rope = self.document_map.get(uri.as_str())?;
Expand Down Expand Up @@ -157,35 +173,19 @@ impl LanguageServer for Backend {
Range::new(start_position, end_position),
)))
})
}
.await;
}();
Ok(definition)
}

async fn references(&self, params: ReferenceParams) -> Result<Option<Vec<Location>>> {
let reference_list = || -> Option<Vec<Location>> {
let uri = params.text_document_position.text_document.uri;
let semantic = self.semantic_map.get(uri.as_str())?;
let rope = self.document_map.get(uri.as_str())?;
let position = params.text_document_position.position;
let offset = position_to_offset(position, &rope)?;
let reference_span_list = get_references(&semantic, offset, offset + 1, false)?;

let interval = semantic.ident_range.find(offset, offset + 1).next()?;
let interval_val = interval.val;
let reference_span_list = match interval_val {
IdentType::Binding(symbol_id) => {
let references = semantic.table.symbol_id_to_references.get(&symbol_id)?;
let reference_span_list: Vec<Span> = references
.iter()
.map(|reference_id| {
semantic.table.reference_id_to_reference[*reference_id]
.span
.clone()
})
.collect();
Some(reference_span_list)
}
IdentType::Reference(_) => None,
}?;
let ret = reference_span_list
.into_iter()
.filter_map(|range| {
Expand All @@ -211,9 +211,6 @@ impl LanguageServer for Backend {
let semantic_tokens = || -> Option<Vec<SemanticToken>> {
let mut im_complete_tokens = self.semantic_token_map.get_mut(&uri)?;
let rope = self.document_map.get(&uri)?;
let ast = self.ast_map.get(&uri)?;
let extends_tokens = semantic_token_from_ast(&ast);
im_complete_tokens.extend(extends_tokens);
im_complete_tokens.sort_by(|a, b| a.start.cmp(&b.start));
let mut pre_line = 0;
let mut pre_start = 0;
Expand Down Expand Up @@ -302,8 +299,8 @@ impl LanguageServer for Backend {
let uri = &params.text_document.uri;
let mut hashmap = HashMap::new();
if let Some(ast) = self.ast_map.get(uri.as_str()) {
ast.iter().for_each(|(_, v)| {
type_inference(&v.body, &mut hashmap);
ast.iter().for_each(|(func, _)| {
type_inference(&func.body, &mut hashmap);
});
}

Expand Down Expand Up @@ -408,18 +405,17 @@ impl LanguageServer for Backend {
async fn rename(&self, params: RenameParams) -> Result<Option<WorkspaceEdit>> {
let workspace_edit = || -> Option<WorkspaceEdit> {
let uri = params.text_document_position.text_document.uri;
let ast = self.ast_map.get(&uri.to_string())?;
let rope = self.document_map.get(&uri.to_string())?;

let semantic = self.semantic_map.get(uri.as_str())?;
let rope = self.document_map.get(uri.as_str())?;
let position = params.text_document_position.position;
let char = rope.try_line_to_char(position.line as usize).ok()?;
let offset = char + position.character as usize;
let reference_list = get_reference(&ast, offset, true);
let offset = position_to_offset(position, &rope)?;
let reference_list = get_references(&semantic, offset, offset + 1, true)?;

let new_name = params.new_name;
if !reference_list.is_empty() {
(!reference_list.is_empty()).then_some(()).map(|_| {
let edit_list = reference_list
.into_iter()
.filter_map(|(_, range)| {
.filter_map(|range| {
let start_position = offset_to_position(range.start, &rope)?;
let end_position = offset_to_position(range.end, &rope)?;
Some(TextEdit::new(
Expand All @@ -430,11 +426,8 @@ impl LanguageServer for Backend {
.collect::<Vec<_>>();
let mut map = HashMap::new();
map.insert(uri, edit_list);
let workspace_edit = WorkspaceEdit::new(map);
Some(workspace_edit)
} else {
None
}
WorkspaceEdit::new(map)
})
}();
Ok(workspace_edit)
}
Expand Down Expand Up @@ -477,11 +470,12 @@ impl Notification for CustomNotification {
struct TextDocumentItem<'a> {
uri: Url,
text: &'a str,
version: i32,
version: Option<i32>,
}

impl Backend {
async fn on_change<'a>(&self, params: TextDocumentItem<'a>) {
dbg!(&params.version);
let rope = ropey::Rope::from_str(params.text);
self.document_map
.insert(params.uri.to_string(), rope.clone());
Expand All @@ -490,7 +484,7 @@ impl Backend {
parse_errors,
semantic_tokens,
} = parse(params.text);
let diagnostics = parse_errors
let mut diagnostics = parse_errors
.into_iter()
.filter_map(|item| {
let (message, span) = match item.reason() {
Expand Down Expand Up @@ -531,13 +525,11 @@ impl Backend {
})
.collect::<Vec<_>>();

self.client
.publish_diagnostics(params.uri.clone(), diagnostics, Some(params.version))
.await;

if let Some(ast) = ast {
let semantic = match analyze_program(&ast) {
Ok(semantic) => semantic,
match analyze_program(&ast) {
Ok(semantic) => {
self.semantic_map.insert(params.uri.to_string(), semantic);
}
Err(err) => {
let span = err.span();
let start_position = offset_to_position(span.start, &rope);
Expand All @@ -548,20 +540,16 @@ impl Backend {
Diagnostic::new_simple(Range::new(start, end), format!("{:?}", err))
});
if let Some(diag) = diag {
self.client
.publish_diagnostics(
params.uri.clone(),
vec![diag],
Some(params.version),
)
.await;
diagnostics.push(diag);
}
return;
}
};
self.semantic_map.insert(params.uri.to_string(), semantic);
self.ast_map.insert(params.uri.to_string(), ast);
}

self.client
.publish_diagnostics(params.uri.clone(), diagnostics, params.version)
.await;
self.semantic_token_map
.insert(params.uri.to_string(), semantic_tokens);
}
Expand All @@ -583,7 +571,6 @@ async fn main() {
})
.finish();

serde_json::json!({"test": 20});
Server::new(stdin, stdout, socket).serve(service).await;
}

Expand All @@ -599,3 +586,32 @@ fn position_to_offset(position: Position, rope: &Rope) -> Option<usize> {
let slice = rope.slice(0..line_char_offset + position.character as usize);
Some(slice.len_bytes())
}

fn get_references(
semantic: &Semantic,
start: usize,
end: usize,
include_definition: bool,
) -> Option<Vec<Span>> {
let interval = semantic.ident_range.find(start, end).next()?;
let interval_val = interval.val;
match interval_val {
IdentType::Binding(symbol_id) => {
let references = semantic.table.symbol_id_to_references.get(&symbol_id)?;
let mut reference_span_list: Vec<Span> = references
.iter()
.map(|reference_id| {
semantic.table.reference_id_to_reference[*reference_id]
.span
.clone()
})
.collect();
if include_definition {
let symbol_range = semantic.table.symbol_id_to_span.get(symbol_id)?;
reference_span_list.push(symbol_range.clone());
}
Some(reference_span_list)
}
IdentType::Reference(_) => None,
}
}
Loading