Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'helix-core/src/diagnostic.rs')
| -rw-r--r-- | helix-core/src/diagnostic.rs | 47 |
1 files changed, 16 insertions, 31 deletions
diff --git a/helix-core/src/diagnostic.rs b/helix-core/src/diagnostic.rs index b9360b52..4e89361d 100644 --- a/helix-core/src/diagnostic.rs +++ b/helix-core/src/diagnostic.rs @@ -1,7 +1,6 @@ //! LSP diagnostic utility types. -use std::{fmt, sync::Arc}; +use std::fmt; -pub use helix_stdx::range::Range; use serde::{Deserialize, Serialize}; /// Describes the severity level of a [`Diagnostic`]. @@ -20,6 +19,19 @@ impl Default for Severity { } } +/// A range of `char`s within the text. +#[derive(Debug, Clone, Copy, PartialOrd, Ord, PartialEq, Eq)] +pub struct Range { + pub start: usize, + pub end: usize, +} + +impl Range { + pub fn contains(self, pos: usize) -> bool { + (self.start..self.end).contains(&pos) + } +} + #[derive(Debug, Eq, Hash, PartialEq, Clone, Deserialize, Serialize)] pub enum NumberOrString { Number(i32), @@ -50,35 +62,8 @@ pub struct Diagnostic { pub data: Option<serde_json::Value>, } -/// The source of a diagnostic. -/// -/// This type is cheap to clone: all data is either `Copy` or wrapped in an `Arc`. -#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)] -pub enum DiagnosticProvider { - Lsp { - /// The ID of the language server which sent the diagnostic. - server_id: LanguageServerId, - /// An optional identifier under which diagnostics are managed by the client. - /// - /// `identifier` is a field from the LSP "Pull Diagnostics" feature meant to provide an - /// optional "namespace" for diagnostics: a language server can respond to a diagnostics - /// pull request with an identifier and these diagnostics should be treated as separate - /// from push diagnostics. Rust-analyzer uses this feature for example to provide Cargo - /// diagnostics with push and internal diagnostics with pull. The push diagnostics should - /// not clear the pull diagnostics and vice-versa. - identifier: Option<Arc<str>>, - }, - // Future internal features can go here... -} - -impl DiagnosticProvider { - pub fn language_server_id(&self) -> Option<LanguageServerId> { - match self { - Self::Lsp { server_id, .. } => Some(*server_id), - // _ => None, - } - } -} +// TODO turn this into an enum + feature flag when lsp becomes optional +pub type DiagnosticProvider = LanguageServerId; // while I would prefer having this in helix-lsp that necessitates a bunch of // conversions I would rather not add. I think its fine since this just a very |