Offline, privacy-first grammar checker. Fast, open-source, Rust-powered
Merge remote-tracking branch 'upstream/master' into typst-support
Grant Lemonsfcd965b51d25
diff --cc Cargo.lockindex 715d0a907,6291fc8f9..e7558c601--- a/Cargo.lock+++ b/Cargo.lock@@@ -694,17 -658,6 +694,17 @@@ dependencies ="tree-sitter",]+[[package]]+name = "harper-typst"- version = "0.14.0"++version = "0.15.0"+dependencies = [+ "harper-core",+ "itertools 0.14.0",+ "ordered-float",+ "paste",+ "typst-syntax",+]+[[package]]name = "harper-wasm"version = "0.1.0"diff --cc harper-cli/Cargo.tomlindex 6efcdb7d4,0ce044135..4adb6553d--- a/harper-cli/Cargo.toml+++ b/harper-cli/Cargo.toml@@@ -10,11 -10,6 +10,11 @@@ repository = "https://github.com/automaanyhow = "1.0.95"ariadne = "0.4.1"clap = { version = "4.5.23", features = ["derive"] }- harper-core = { path = "../harper-core", version = "0.14.0" }- harper-comments = { path = "../harper-comments", version = "0.14.0" }- harper-typst = { path = "../harper-typst", version = "0.14.0", optional = true }+ harper-core = { path = "../harper-core", version = "0.15.0" }+ harper-comments = { path = "../harper-comments", version = "0.15.0" }++harper-typst = { path = "../harper-typst", version = "0.15.0", optional = true }serde_json = "1.0.133"++[features]+default = ["typst"]+typst = ["dep:harper-typst"]diff --cc harper-ls/Cargo.tomlindex f6eb3d7c1,bc911420e..b06af9d8d--- a/harper-ls/Cargo.toml+++ b/harper-ls/Cargo.toml@@@ -8,10 -8,9 +8,10 @@@ readme = "README.mdrepository = "https://github.com/automattic/harper"[dependencies]- harper-core = { path = "../harper-core", version = "0.14.0", features = ["concurrent"] }- harper-comments = { path = "../harper-comments", version = "0.14.0" }- harper-typst = { path = "../harper-typst", version = "0.14.0", optional = true }- harper-html = { path = "../harper-html", version = "0.14.0" }+ harper-core = { path = "../harper-core", version = "0.15.0", features = ["concurrent"] }+ harper-comments = { path = "../harper-comments", version = "0.15.0" }++harper-typst = { path = "../harper-typst", version = "0.15.0", optional = true }+ harper-html = { path = "../harper-html", version = "0.15.0" }tower-lsp = "0.20.0"tokio = { version = "1.42.0", features = ["fs", "rt", "rt-multi-thread", "macros", "io-std", "io-util", "net"] }clap = { version = "4.5.23", features = ["derive"] }diff --cc harper-ls/src/backend.rsindex 851fb60ff,2ec899b5a..1f42de435--- a/harper-ls/src/backend.rs+++ b/harper-ls/src/backend.rs@@@ -18,18 -18,17 +18,20 @@@ use tower_lsp::lsp_types::notification:use tower_lsp::lsp_types::{CodeActionOrCommand, CodeActionParams, CodeActionProviderCapability, CodeActionResponse,Command, ConfigurationItem, Diagnostic, DidChangeConfigurationParams,- DidChangeTextDocumentParams, DidCloseTextDocumentParams, DidOpenTextDocumentParams,- DidSaveTextDocumentParams, ExecuteCommandOptions, ExecuteCommandParams, InitializeParams,+ DidChangeTextDocumentParams, DidChangeWatchedFilesParams,+ DidChangeWatchedFilesRegistrationOptions, DidCloseTextDocumentParams,+ DidOpenTextDocumentParams, DidSaveTextDocumentParams, ExecuteCommandOptions,+ ExecuteCommandParams, FileChangeType, FileSystemWatcher, GlobPattern, InitializeParams,InitializeResult, InitializedParams, MessageType, PublishDiagnosticsParams, Range,- ServerCapabilities, TextDocumentSyncCapability, TextDocumentSyncKind, TextDocumentSyncOptions,- TextDocumentSyncSaveOptions, Url,+ Registration, ServerCapabilities, TextDocumentSyncCapability, TextDocumentSyncKind,+ TextDocumentSyncOptions, TextDocumentSyncSaveOptions, Url, WatchKind,};use tower_lsp::{Client, LanguageServer};- use tracing::{error, info};+ use tracing::{error, info, warn};+#[cfg(feature = "typst")]+use harper_typst::Typst;+use crate::config::Config;use crate::diagnostics::{lint_to_code_actions, lints_to_diagnostics};use crate::dictionary_io::{load_dict, save_dict};diff --cc harper-typst/Cargo.tomlindex 38223b2e3,000000000..825f3dedbmode 100644,000000..100644--- a/harper-typst/Cargo.toml+++ b/harper-typst/Cargo.toml@@@ -1,14 -1,0 +1,14 @@@+[package]+name = "harper-typst"- version = "0.14.0"++version = "0.15.0"+edition = "2021"+description = "The language checker for developers."+license = "Apache-2.0"+repository = "https://github.com/automattic/harper"++[dependencies]- harper-core = { path = "../harper-core", version = "0.14.0" }++harper-core = { path = "../harper-core", version = "0.15.0" }+typst-syntax = { version = "0.12.0" }+ordered-float = { version = "4.6.0", features = ["serde"] }+itertools = "0.14.0"+paste = "1.0.14"