Lsp progress

src/elements/section.rs

@@ -328,26 +328,21 @@ impl RegexRule for SectionRule {
 			}),
 		);
 
-		//if let Some(sems) = state.shared.semantics.and_then(|sems| {
-		//	RefMut::filter_map(sems.borrow_mut(), |sems| sems.get_mut(&token.source())).ok()
-		//})
-		/*if let Some(sems) = state.shared.semantics
-			.as_ref()
-			.and_then(
-				|sems| sems
-					.borrow_mut()
-					.get_mut(&token.source())
-					.map(|v| v)
-				)
-		{
-		}*/
 		if let Some(mut sems) = state.shared.semantics.as_ref().map(|sems| {
 			RefMut::filter_map(sems.borrow_mut(), |sems| sems.get_mut(&token.source()))
 				.ok()
 				.unwrap()
 		}) {
-			// Do something with mutable value_for_key
+			sems.add(token.source(), matches.get(1).unwrap().range(), 0, 0);
-			sems.add(matches.get(1).unwrap().range(), 0, 0);
+			if let Some(reference) = matches.get(2)
+			{
+				sems.add(token.source(), reference.start()-1..reference.end()+1, 1, 0);
+			}
+			if let Some(kind) = matches.get(3)
+			{
+				sems.add(token.source(), kind.range(), 3, 0);
+			}
+			//sems.add(token.source(), matches.get(5).unwrap().range(), 2, 0);
 		}
 
 		result
@@ -561,12 +556,7 @@ nml.section.push("6", 6, "", "refname")
 		let source = Rc::new(SourceFile::with_content(
 			"".to_string(),
 			r#"
-# 1
+#{か} test
-##+ 2
-###* 3
-####+* 4
-#####*+ 5
-######{refname} 6
 		"#
 			.to_string(),
 			None,

src/parser/semantics.rs

@@ -13,7 +13,7 @@ pub struct Semantics
 	cursor: LineCursor,
 
 	/// Semantic tokens
-	tokens: Vec<SemanticToken>,
+	pub tokens: Vec<SemanticToken>,
 }
 
 impl Semantics
@@ -26,23 +26,40 @@ impl Semantics
 		}
 	}
 
-	pub fn add(&mut self, range: Range<usize>, token_type: u32, token_modifier: u32)
+	pub fn add(&mut self, source: Rc<dyn Source>, range: Range<usize>, token_type: u32, token_modifier: u32)
 	{
-		let current = self.cursor.clone();
+		let mut current = self.cursor.clone();
 		self.cursor.move_to(range.start);
 
-		let delta_line = self.cursor.line - current.line;
+		while self.cursor.pos != range.end
-		let delta_start = if delta_line == 0
 		{
-			self.cursor.line_pos - current.line_pos
+			let end = source.content()[self.cursor.pos..].find('\n')
-		} else { self.cursor.line_pos };
+				.unwrap_or(source.content().len() - self.cursor.pos);
+			let len = usize::min(range.end - self.cursor.pos, end);
 
-		self.tokens.push(SemanticToken{
+			let delta_line = self.cursor.line - current.line;
-			delta_line: delta_line as u32,
+			let delta_start = if delta_line == 0
-			delta_start: delta_start as u32,
+			{
-			length: 10,
+				if let Some(last) = self.tokens.last()
-			token_type,
+				{
-			token_modifiers_bitset: token_modifier,
+					self.cursor.line_pos - current.line_pos + last.length as usize
-		});
+				}
+				else
+				{
+					self.cursor.line_pos - current.line_pos
+				}
+			} else { self.cursor.line_pos };
+
+			eprintln!("CURRENT={:#?}, CURS={:#?}", current, self.cursor);
+			self.tokens.push(SemanticToken{
+				delta_line: delta_line as u32,
+				delta_start: delta_start as u32,
+				length: len as u32,
+				token_type,
+				token_modifiers_bitset: token_modifier,
+			});
+			current = self.cursor.clone();
+			self.cursor.move_to(self.cursor.pos + len);
+		}
 	}
 }

src/parser/source.rs

@@ -5,6 +5,7 @@ use std::rc::Rc;
 
 use downcast_rs::impl_downcast;
 use downcast_rs::Downcast;
+use unicode_width::UnicodeWidthChar;
 
 /// Trait for source content
 pub trait Source: Downcast {
@@ -175,18 +176,18 @@ impl LineCursor {
 	/// # Error
 	/// This function will panic if [`pos`] is not utf8 aligned
 	pub fn move_to(&mut self, pos: usize) {
-		if pos > self.pos {
+		if self.pos < pos {
 			let start = self.pos;
-			eprintln!("slice{{{}}}, want={pos}", &self.source.content().as_str()[start..pos]);
+			//eprintln!("slice{{{}}}, want={pos}", &self.source.content().as_str()[start..pos]);
 			let mut it = self.source.content().as_str()[start..] // pos+1
 				.chars()
 				.peekable();
 
-			let mut prev = self.source.content().as_str()[..start + 1]
+			let mut prev = self.source.content().as_str()[..start]
 				.chars()
 				.rev()
 				.next();
-			eprintln!("prev={prev:#?}");
+			//eprintln!("prev={prev:#?}");
 			while self.pos < pos {
 				let c = it.next().unwrap();
 				let len = c.len_utf8();
@@ -194,35 +195,19 @@ impl LineCursor {
 				if self.pos != 0 && prev == Some('\n') {
 					self.line += 1;
 					self.line_pos = 0;
-				} else {
+				}	
-					self.line_pos += len;
+				self.line_pos += c.width().unwrap_or(1);
-				}
 				self.pos += len;
 
-				eprintln!("({}, {c:#?}, {} {}, {prev:#?})", self.pos, self.line, self.line_pos);
+				eprintln!("({}, {c:#?}, {} {}, {})", self.pos, self.line, self.line_pos, prev.unwrap_or(' '));
 				prev = Some(c);
 			}
 			if self.pos != 0 && prev == Some('\n') {
 				self.line += 1;
 				self.line_pos = 0;
 			}
-		} else if pos < self.pos {
+		} else if self.pos > pos {
-			todo!("Going back is not supported");
+			panic!("Going back is not supported");
-			self.source.content().as_str()[pos..self.pos]
-				.char_indices()
-				.rev()
-				.for_each(|(len, c)| {
-					self.pos -= len;
-					if c == '\n' {
-						self.line -= 1;
-					}
-				});
-			self.line_pos = self.source.content().as_str()[..self.pos]
-				.char_indices()
-				.rev()
-				.find(|(_, c)| *c == '\n')
-				.map(|(line_start, _)| self.pos - line_start)
-				.unwrap_or(0);
 		}
 
 		// May fail if pos is not utf8-aligned

src/server.rs

@@ -17,6 +17,7 @@ use lsp::semantic::semantic_token_from_document;
 use parser::langparser::LangParser;
 use parser::parser::Parser;
 use parser::parser::ParserState;
+use parser::semantics::Semantics;
 use parser::source::SourceFile;
 use tower_lsp::jsonrpc::Result;
 use tower_lsp::lsp_types::*;
@@ -51,9 +52,14 @@ impl Backend {
 		let parser = LangParser::default();
 		let (doc, state) = parser.parse(ParserState::new_with_semantics(&parser, None), source.clone(), None);
 
-		self.semantic_token_map
+		if let Some(sems) = state.shared.semantics.as_ref().map(|sems| {
-			.insert(params.uri.to_string(),
+			std::cell::RefMut::filter_map(sems.borrow_mut(), |sems| sems.get_mut(&(source as Rc<dyn parser::source::Source>)))
-			state.shared.semantics.);
+				.ok()
+				.unwrap()
+		}) {
+			self.semantic_token_map
+				.insert(params.uri.to_string(), sems.tokens.to_owned());
+		};
 	}
 }