Offline, privacy-first grammar checker. Fast, open-source, Rust-powered
fix: issue #87
Elijah Potterf7ea74eca796
diff --git a/Cargo.lock b/Cargo.lockindex d6fca02cb..b88803c02 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -615,7 +615,6 @@ dependencies = ["tower-lsp","tracing","tracing-subscriber",- "unicode-width",][[package]]diff --git a/harper-comments/tests/language_support.rs b/harper-comments/tests/language_support.rsindex 180a864f6..228d173e8 100644--- a/harper-comments/tests/language_support.rs+++ b/harper-comments/tests/language_support.rs@@ -38,5 +38,5 @@ macro_rules! create_test {create_test!(multiline_comments.cpp, 3);create_test!(multiline_comments.ts, 3);create_test!(clean.rs, 0);-create_test!(jsdoc.ts, 2);+create_test!(jsdoc.ts, 3);create_test!(issue_96.lua, 0);diff --git a/harper-comments/tests/language_support_sources/jsdoc.ts b/harper-comments/tests/language_support_sources/jsdoc.tsindex ccf83da39..c684017bf 100644--- a/harper-comments/tests/language_support_sources/jsdoc.ts+++ b/harper-comments/tests/language_support_sources/jsdoc.ts@@ -2,9 +2,10 @@* Since there are no keywords it _sould_ be checked. */function test(){}-/** @class this sould be unchecked. */+/** This is also a doc comment.+ * @class this sould be unchecked. */class Clazz { }-/** Here is another example: {@link this sould also b unchecked} */+/** Here is another example: {@link this sould also b unchecked}. But this _sould_ be.*//** However, tis should be checked, while {@link tis should not} */diff --git a/harper-ls/Cargo.toml b/harper-ls/Cargo.tomlindex 93ceff6f3..6c9d83152 100644--- a/harper-ls/Cargo.toml+++ b/harper-ls/Cargo.toml@@ -23,5 +23,4 @@ tracing-subscriber = "0.3.18"resolve-path = "0.1.0"open = "5.1.1"futures = "0.3.30"-unicode-width = "0.1.11"serde = { version = "1.0.197", features = ["derive"] }diff --git a/harper-ls/src/backend.rs b/harper-ls/src/backend.rsindex bc16cf53d..509c49233 100644--- a/harper-ls/src/backend.rs+++ b/harper-ls/src/backend.rs@@ -349,7 +349,9 @@ impl Backend {#[tower_lsp::async_trait]impl LanguageServer for Backend {- async fn initialize(&self, _: InitializeParams) -> Result<InitializeResult> {+ async fn initialize(&self, p: InitializeParams) -> Result<InitializeResult> {+ dbg!(p.capabilities);+Ok(InitializeResult {server_info: None,capabilities: ServerCapabilities {diff --git a/harper-ls/src/pos_conv.rs b/harper-ls/src/pos_conv.rsindex ad00a53f0..760eeaaf0 100644--- a/harper-ls/src/pos_conv.rs+++ b/harper-ls/src/pos_conv.rs@@ -1,6 +1,5 @@use harper_core::Span;use tower_lsp::lsp_types::{Position, Range};-use unicode_width::UnicodeWidthChar;/// This module includes various conversions from the index-based [`Span`]s that/// Harper uses, and the Ranges that the LSP uses.@@ -26,7 +25,7 @@ fn index_to_position(source: &[char], index: usize) -> Position {let cols: usize = source[last_newline_idx..index].iter()- .map(|c| c.width().unwrap_or(0))+ .map(|c| c.len_utf16()).sum();Position {@@ -54,7 +53,7 @@ fn position_to_index(source: &[char], position: Position) -> usize {return line_start_idx + traversed_chars;}- traversed_cols += c.width().unwrap_or(0);+ traversed_cols += c.len_utf16();}line_start_idx