Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'helix-view/src/document.rs')
-rw-r--r--helix-view/src/document.rs440
1 files changed, 156 insertions, 284 deletions
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index e52dbe0f..1b3a77b6 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -5,18 +5,14 @@ use futures_util::future::BoxFuture;
use futures_util::FutureExt;
use helix_core::auto_pairs::AutoPairs;
use helix_core::chars::char_is_word;
-use helix_core::command_line::Token;
-use helix_core::diagnostic::DiagnosticProvider;
use helix_core::doc_formatter::TextFormat;
use helix_core::encoding::Encoding;
use helix_core::snippets::{ActiveSnippet, SnippetRenderCtx};
-use helix_core::syntax::config::LanguageServerFeature;
+use helix_core::syntax::{Highlight, LanguageServerFeature};
use helix_core::text_annotations::{InlineAnnotation, Overlay};
-use helix_event::TaskController;
use helix_lsp::util::lsp_pos_to_pos;
use helix_stdx::faccess::{copy_metadata, readonly};
use helix_vcs::{DiffHandle, DiffProviderRegistry};
-use once_cell::sync::OnceCell;
use thiserror;
use ::parking_lot::Mutex;
@@ -34,19 +30,17 @@ use std::sync::{Arc, Weak};
use std::time::SystemTime;
use helix_core::{
- editor_config::EditorConfig,
encoding,
history::{History, State, UndoKind},
indent::{auto_detect_indent_style, IndentStyle},
line_ending::auto_detect_line_ending,
- syntax::{self, config::LanguageConfiguration},
+ syntax::{self, LanguageConfiguration},
ChangeSet, Diagnostic, LineEnding, Range, Rope, RopeBuilder, Selection, Syntax, Transaction,
};
use crate::{
editor::Config,
events::{DocumentDidChange, SelectionDidChange},
- expansion,
view::ViewPosition,
DocumentId, Editor, Theme, View, ViewId,
};
@@ -55,7 +49,6 @@ use crate::{
const BUF_SIZE: usize = 8192;
const DEFAULT_INDENT: IndentStyle = IndentStyle::Tabs;
-const DEFAULT_TAB_WIDTH: usize = 4;
pub const DEFAULT_LANGUAGE_NAME: &str = "text";
@@ -132,7 +125,7 @@ pub struct SavePoint {
#[derive(Debug, thiserror::Error)]
pub enum DocumentOpenError {
- #[error("path must be a regular file, symlink, or directory")]
+ #[error("path must be a regular file, simlink, or directory")]
IrregularFile,
#[error(transparent)]
IoError(#[from] io::Error),
@@ -155,7 +148,6 @@ pub struct Document {
pub inlay_hints_oudated: bool,
path: Option<PathBuf>,
- relative_path: OnceCell<Option<PathBuf>>,
encoding: &'static encoding::Encoding,
has_bom: bool,
@@ -163,7 +155,6 @@ pub struct Document {
/// Current indent style.
pub indent_style: IndentStyle,
- editor_config: EditorConfig,
/// The document's default line ending.
pub line_ending: LineEnding,
@@ -203,27 +194,6 @@ pub struct Document {
pub focused_at: std::time::Instant,
pub readonly: bool,
-
- pub previous_diagnostic_id: Option<String>,
-
- /// Annotations for LSP document color swatches
- pub color_swatches: Option<DocumentColorSwatches>,
- // NOTE: ideally this would live on the handler for color swatches. This is blocked on a
- // large refactor that would make `&mut Editor` available on the `DocumentDidChange` event.
- pub color_swatch_controller: TaskController,
- pub pull_diagnostic_controller: TaskController,
-
- // NOTE: this field should eventually go away - we should use the Editor's syn_loader instead
- // of storing a copy on every doc. Then we can remove the surrounding `Arc` and use the
- // `ArcSwap` directly.
- syn_loader: Arc<ArcSwap<syntax::Loader>>,
-}
-
-#[derive(Debug, Clone, Default)]
-pub struct DocumentColorSwatches {
- pub color_swatches: Vec<InlineAnnotation>,
- pub colors: Vec<syntax::Highlight>,
- pub color_swatches_padding: Vec<InlineAnnotation>,
}
/// Inlay hints for a single `(Document, View)` combo.
@@ -330,14 +300,6 @@ impl fmt::Debug for DocumentInlayHintsId {
}
}
-impl Editor {
- pub(crate) fn clear_doc_relative_paths(&mut self) {
- for doc in self.documents_mut() {
- doc.relative_path.take();
- }
- }
-}
-
enum Encoder {
Utf16Be,
Utf16Le,
@@ -687,7 +649,6 @@ impl Document {
text: Rope,
encoding_with_bom_info: Option<(&'static Encoding, bool)>,
config: Arc<dyn DynAccess<Config>>,
- syn_loader: Arc<ArcSwap<syntax::Loader>>,
) -> Self {
let (encoding, has_bom) = encoding_with_bom_info.unwrap_or((encoding::UTF_8, false));
let line_ending = config.load().default_line_ending.into();
@@ -698,7 +659,6 @@ impl Document {
id: DocumentId::default(),
active_snippet: None,
path: None,
- relative_path: OnceCell::new(),
encoding,
has_bom,
text,
@@ -707,7 +667,6 @@ impl Document {
inlay_hints_oudated: false,
view_data: Default::default(),
indent_style: DEFAULT_INDENT,
- editor_config: EditorConfig::default(),
line_ending,
restore_cursor: false,
syntax: None,
@@ -728,21 +687,13 @@ impl Document {
focused_at: std::time::Instant::now(),
readonly: false,
jump_labels: HashMap::new(),
- color_swatches: None,
- color_swatch_controller: TaskController::new(),
- syn_loader,
- previous_diagnostic_id: None,
- pull_diagnostic_controller: TaskController::new(),
}
}
- pub fn default(
- config: Arc<dyn DynAccess<Config>>,
- syn_loader: Arc<ArcSwap<syntax::Loader>>,
- ) -> Self {
+ pub fn default(config: Arc<dyn DynAccess<Config>>) -> Self {
let line_ending: LineEnding = config.load().default_line_ending.into();
let text = Rope::from(line_ending.as_str());
- Self::from(text, None, config, syn_loader)
+ Self::from(text, None, config)
}
// TODO: async fn?
@@ -750,45 +701,36 @@ impl Document {
/// overwritten with the `encoding` parameter.
pub fn open(
path: &Path,
- mut encoding: Option<&'static Encoding>,
- detect_language: bool,
+ encoding: Option<&'static Encoding>,
+ config_loader: Option<Arc<ArcSwap<syntax::Loader>>>,
config: Arc<dyn DynAccess<Config>>,
- syn_loader: Arc<ArcSwap<syntax::Loader>>,
) -> Result<Self, DocumentOpenError> {
// If the path is not a regular file (e.g.: /dev/random) it should not be opened.
- if path.metadata().is_ok_and(|metadata| !metadata.is_file()) {
+ if path
+ .metadata()
+ .map_or(false, |metadata| !metadata.is_file())
+ {
return Err(DocumentOpenError::IrregularFile);
}
- let editor_config = if config.load().editor_config {
- EditorConfig::find(path)
- } else {
- EditorConfig::default()
- };
- encoding = encoding.or(editor_config.encoding);
-
// Open the file if it exists, otherwise assume it is a new file (and thus empty).
let (rope, encoding, has_bom) = if path.exists() {
let mut file = std::fs::File::open(path)?;
from_reader(&mut file, encoding)?
} else {
- let line_ending = editor_config
- .line_ending
- .unwrap_or_else(|| config.load().default_line_ending.into());
+ let line_ending: LineEnding = config.load().default_line_ending.into();
let encoding = encoding.unwrap_or(encoding::UTF_8);
(Rope::from(line_ending.as_str()), encoding, false)
};
- let loader = syn_loader.load();
- let mut doc = Self::from(rope, Some((encoding, has_bom)), config, syn_loader);
+ let mut doc = Self::from(rope, Some((encoding, has_bom)), config);
// set the path and try detecting the language
doc.set_path(Some(path));
- if detect_language {
- doc.detect_language(&loader);
+ if let Some(loader) = config_loader {
+ doc.detect_language(loader);
}
- doc.editor_config = editor_config;
doc.detect_indent_and_line_ending();
Ok(doc)
@@ -796,12 +738,9 @@ impl Document {
/// The same as [`format`], but only returns formatting changes if auto-formatting
/// is configured.
- pub fn auto_format(
- &self,
- editor: &Editor,
- ) -> Option<BoxFuture<'static, Result<Transaction, FormatterError>>> {
+ pub fn auto_format(&self) -> Option<BoxFuture<'static, Result<Transaction, FormatterError>>> {
if self.language_config()?.auto_format {
- self.format(editor)
+ self.format()
} else {
None
}
@@ -811,10 +750,7 @@ impl Document {
/// to format it nicely.
// We can't use anyhow::Result here since the output of the future has to be
// clonable to be used as shared future. So use a custom error type.
- pub fn format(
- &self,
- editor: &Editor,
- ) -> Option<BoxFuture<'static, Result<Transaction, FormatterError>>> {
+ pub fn format(&self) -> Option<BoxFuture<'static, Result<Transaction, FormatterError>>> {
if let Some((fmt_cmd, fmt_args)) = self
.language_config()
.and_then(|c| c.formatter.as_ref())
@@ -825,34 +761,11 @@ impl Document {
))
})
{
- log::debug!(
- "formatting '{}' with command '{}', args {fmt_args:?}",
- self.display_name(),
- fmt_cmd.display(),
- );
use std::process::Stdio;
let text = self.text().clone();
-
let mut process = tokio::process::Command::new(&fmt_cmd);
-
- if let Some(doc_dir) = self.path.as_ref().and_then(|path| path.parent()) {
- process.current_dir(doc_dir);
- }
-
- let args = match fmt_args
- .iter()
- .map(|content| expansion::expand(editor, Token::expand(content)))
- .collect::<Result<Vec<_>, _>>()
- {
- Ok(args) => args,
- Err(err) => {
- log::error!("Failed to expand formatter arguments: {err}");
- return None;
- }
- };
-
process
- .args(args.iter().map(AsRef::as_ref))
+ .args(fmt_args)
.stdin(Stdio::piped())
.stdout(Stdio::piped())
.stderr(Stdio::piped());
@@ -864,21 +777,17 @@ impl Document {
command: fmt_cmd.to_string_lossy().into(),
error: e.kind(),
})?;
+ {
+ let mut stdin = process.stdin.take().ok_or(FormatterError::BrokenStdin)?;
+ to_writer(&mut stdin, (encoding::UTF_8, false), &text)
+ .await
+ .map_err(|_| FormatterError::BrokenStdin)?;
+ }
- let mut stdin = process.stdin.take().ok_or(FormatterError::BrokenStdin)?;
- let input_text = text.clone();
- let input_task = tokio::spawn(async move {
- to_writer(&mut stdin, (encoding::UTF_8, false), &input_text).await
- // Note that `stdin` is dropped here, causing the pipe to close. This can
- // avoid a deadlock with `wait_with_output` below if the process is waiting on
- // stdin to close before exiting.
- });
- let (input_result, output_result) = tokio::join! {
- input_task,
- process.wait_with_output(),
- };
- let _ = input_result.map_err(|_| FormatterError::BrokenStdin)?;
- let output = output_result.map_err(|_| FormatterError::WaitForOutputFailed)?;
+ let output = process
+ .wait_with_output()
+ .await
+ .map_err(|_| FormatterError::WaitForOutputFailed)?;
if !output.status.success() {
if !output.stderr.is_empty() {
@@ -891,7 +800,7 @@ impl Document {
} else if !output.stderr.is_empty() {
log::debug!(
"Formatter printed to stderr: {}",
- String::from_utf8_lossy(&output.stderr)
+ String::from_utf8_lossy(&output.stderr).to_string()
);
}
@@ -920,13 +829,10 @@ impl Document {
)?;
let fut = async move {
- let edits = request
- .await
- .unwrap_or_else(|e| {
- log::warn!("LSP formatting failed: {}", e);
- Default::default()
- })
- .unwrap_or_default();
+ let edits = request.await.unwrap_or_else(|e| {
+ log::warn!("LSP formatting failed: {}", e);
+ Default::default()
+ });
Ok(helix_lsp::util::generate_transaction_from_edits(
&text,
edits,
@@ -980,12 +886,11 @@ impl Document {
};
let identifier = self.path().map(|_| self.identifier());
- let language_servers: Vec<_> = self.language_servers.values().cloned().collect();
+ let language_servers = self.language_servers.clone();
// mark changes up to now as saved
let current_rev = self.get_current_revision();
let doc_id = self.id();
- let atomic_save = self.config.load().atomic_save;
let encoding_with_bom_info = (self.encoding, self.has_bom);
let last_saved_time = self.last_saved_time;
@@ -1035,7 +940,7 @@ impl Document {
// Assume it is a hardlink to prevent data loss if the metadata cant be read (e.g. on certain Windows configurations)
let is_hardlink = helix_stdx::faccess::hardlink_count(&write_path).unwrap_or(2) > 1;
- let backup = if path.exists() && atomic_save {
+ let backup = if path.exists() {
let path_ = write_path.clone();
// hacks: we use tempfile to handle the complex task of creating
// non clobbered temporary path for us we don't want
@@ -1124,12 +1029,17 @@ impl Document {
text: text.clone(),
};
- for language_server in language_servers {
+ for (_, language_server) in language_servers {
if !language_server.is_initialized() {
continue;
}
- if let Some(id) = identifier.clone() {
- language_server.text_document_did_save(id, &text);
+ if let Some(notification) = identifier
+ .clone()
+ .and_then(|id| language_server.text_document_did_save(id, &text))
+ {
+ if let Err(err) = notification.await {
+ log::error!("Failed to send textDocument/didSave: {err}");
+ }
}
}
@@ -1140,52 +1050,38 @@ impl Document {
}
/// Detect the programming language based on the file type.
- pub fn detect_language(&mut self, loader: &syntax::Loader) {
- self.set_language(self.detect_language_config(loader), loader);
+ pub fn detect_language(&mut self, config_loader: Arc<ArcSwap<syntax::Loader>>) {
+ let loader = config_loader.load();
+ self.set_language(
+ self.detect_language_config(&loader),
+ Some(Arc::clone(&config_loader)),
+ );
}
/// Detect the programming language based on the file type.
pub fn detect_language_config(
&self,
- loader: &syntax::Loader,
- ) -> Option<Arc<syntax::config::LanguageConfiguration>> {
- let language = loader
- .language_for_filename(self.path.as_ref()?)
- .or_else(|| loader.language_for_shebang(self.text().slice(..)))?;
-
- Some(loader.language(language).config().clone())
+ config_loader: &syntax::Loader,
+ ) -> Option<Arc<helix_core::syntax::LanguageConfiguration>> {
+ config_loader
+ .language_config_for_file_name(self.path.as_ref()?)
+ .or_else(|| config_loader.language_config_for_shebang(self.text().slice(..)))
}
/// Detect the indentation used in the file, or otherwise defaults to the language indentation
/// configured in `languages.toml`, with a fallback to tabs if it isn't specified. Line ending
/// is likewise auto-detected, and will remain unchanged if no line endings were detected.
pub fn detect_indent_and_line_ending(&mut self) {
- self.indent_style = if let Some(indent_style) = self.editor_config.indent_style {
- indent_style
- } else {
- auto_detect_indent_style(&self.text).unwrap_or_else(|| {
- self.language_config()
- .and_then(|config| config.indent.as_ref())
- .map_or(DEFAULT_INDENT, |config| IndentStyle::from_str(&config.unit))
- })
- };
- if let Some(line_ending) = self
- .editor_config
- .line_ending
- .or_else(|| auto_detect_line_ending(&self.text))
- {
+ self.indent_style = auto_detect_indent_style(&self.text).unwrap_or_else(|| {
+ self.language_config()
+ .and_then(|config| config.indent.as_ref())
+ .map_or(DEFAULT_INDENT, |config| IndentStyle::from_str(&config.unit))
+ });
+ if let Some(line_ending) = auto_detect_line_ending(&self.text) {
self.line_ending = line_ending;
}
}
- pub fn detect_editor_config(&mut self) {
- if self.config.load().editor_config {
- if let Some(path) = self.path.as_ref() {
- self.editor_config = EditorConfig::find(path);
- }
- }
- }
-
pub fn pickup_last_saved_time(&mut self) {
self.last_saved_time = match self.path() {
Some(path) => match path.metadata() {
@@ -1276,10 +1172,6 @@ impl Document {
pub fn set_path(&mut self, path: Option<&Path>) {
let path = path.map(helix_stdx::path::canonicalize);
- // `take` to remove any prior relative path that may have existed.
- // This will get set in `relative_path()`.
- self.relative_path.take();
-
// if parent doesn't exist we still want to open the document
// and error out when document is saved
self.path = path;
@@ -1292,36 +1184,35 @@ impl Document {
/// if it exists.
pub fn set_language(
&mut self,
- language_config: Option<Arc<syntax::config::LanguageConfiguration>>,
- loader: &syntax::Loader,
+ language_config: Option<Arc<helix_core::syntax::LanguageConfiguration>>,
+ loader: Option<Arc<ArcSwap<helix_core::syntax::Loader>>>,
) {
- self.language = language_config;
- self.syntax = self.language.as_ref().and_then(|config| {
- Syntax::new(self.text.slice(..), config.language(), loader)
- .map_err(|err| {
- // `NoRootConfig` means that there was an issue loading the language/syntax
- // config for the root language of the document. An error must have already
- // been logged by `LanguageData::syntax_config`.
- if err != syntax::HighlighterError::NoRootConfig {
- log::warn!("Error building syntax for '{}': {err}", self.display_name());
- }
- })
- .ok()
- });
+ if let (Some(language_config), Some(loader)) = (language_config, loader) {
+ if let Some(highlight_config) =
+ language_config.highlight_config(&(*loader).load().scopes())
+ {
+ self.syntax = Syntax::new(self.text.slice(..), highlight_config, loader);
+ }
+
+ self.language = Some(language_config);
+ } else {
+ self.syntax = None;
+ self.language = None;
+ };
}
/// Set the programming language for the file if you know the language but don't have the
- /// [`syntax::config::LanguageConfiguration`] for it.
+ /// [`syntax::LanguageConfiguration`] for it.
pub fn set_language_by_language_id(
&mut self,
language_id: &str,
- loader: &syntax::Loader,
+ config_loader: Arc<ArcSwap<syntax::Loader>>,
) -> anyhow::Result<()> {
- let language = loader
- .language_for_name(language_id)
+ let language_config = (*config_loader)
+ .load()
+ .language_config_for_language_id(language_id)
.ok_or_else(|| anyhow!("invalid language id: {}", language_id))?;
- let config = loader.language(language).config().clone();
- self.set_language(Some(config), loader);
+ self.set_language(Some(language_config), Some(config_loader));
Ok(())
}
@@ -1440,14 +1331,14 @@ impl Document {
// update tree-sitter syntax tree
if let Some(syntax) = &mut self.syntax {
- let loader = self.syn_loader.load();
- if let Err(err) = syntax.update(
+ // TODO: no unwrap
+ let res = syntax.update(
old_doc.slice(..),
self.text.slice(..),
transaction.changes(),
- &loader,
- ) {
- log::error!("TS parser failed, disabling TS for the current buffer: {err}");
+ );
+ if res.is_err() {
+ log::error!("TS parser failed, disabling TS for the current buffer: {res:?}");
self.syntax = None;
}
}
@@ -1490,13 +1381,8 @@ impl Document {
true
});
- self.diagnostics.sort_by_key(|diagnostic| {
- (
- diagnostic.range,
- diagnostic.severity,
- diagnostic.provider.clone(),
- )
- });
+ self.diagnostics
+ .sort_by_key(|diagnostic| (diagnostic.range, diagnostic.severity, diagnostic.provider));
// Update the inlay hint annotations' positions, helping ensure they are displayed in the proper place
let apply_inlay_hint_changes = |annotations: &mut Vec<InlineAnnotation>| {
@@ -1545,6 +1431,19 @@ impl Document {
});
}
+ if emit_lsp_notification {
+ // TODO: move to hook
+ // emit lsp notification
+ for language_server in self.language_servers() {
+ let _ = language_server.text_document_did_change(
+ self.versioned_identifier(),
+ &old_doc,
+ self.text(),
+ changes,
+ );
+ }
+ }
+
true
}
@@ -1660,7 +1559,7 @@ impl Document {
let savepoint_idx = self
.savepoints
.iter()
- .position(|savepoint_ref| std::ptr::eq(savepoint_ref.as_ptr(), savepoint))
+ .position(|savepoint_ref| savepoint_ref.as_ptr() == savepoint as *const _)
.expect("Savepoint must belong to this document");
let savepoint_ref = self.savepoints.remove(savepoint_idx);
@@ -1815,12 +1714,6 @@ impl Document {
self.version
}
- pub fn word_completion_enabled(&self) -> bool {
- self.language_config()
- .and_then(|lang_config| lang_config.word_completion.and_then(|c| c.enable))
- .unwrap_or_else(|| self.config.load().word_completion.enable)
- }
-
pub fn path_completion_enabled(&self) -> bool {
self.language_config()
.and_then(|lang_config| lang_config.path_completion)
@@ -1864,6 +1757,25 @@ impl Document {
})
}
+ pub fn language_servers_with_feature_owned(
+ &self,
+ feature: LanguageServerFeature,
+ ) -> impl Iterator<Item = Arc<helix_lsp::Client>> + '_ {
+ self.language_config().into_iter().flat_map(move |config| {
+ config.language_servers.iter().filter_map(move |features| {
+ let ls = self.language_servers.get(&features.name)?.clone();
+ if ls.is_initialized()
+ && ls.supports_feature(feature)
+ && features.has_feature(feature)
+ {
+ Some(ls)
+ } else {
+ None
+ }
+ })
+ })
+ }
+
pub fn supports_language_server(&self, id: LanguageServerId) -> bool {
self.language_servers().any(|l| l.id() == id)
}
@@ -1904,14 +1816,9 @@ impl Document {
/// The width that the tab character is rendered at
pub fn tab_width(&self) -> usize {
- self.editor_config
- .tab_width
- .map(|n| n.get() as usize)
- .unwrap_or_else(|| {
- self.language_config()
- .and_then(|config| config.indent.as_ref())
- .map_or(DEFAULT_TAB_WIDTH, |config| config.tab_width)
- })
+ self.language_config()
+ .and_then(|config| config.indent.as_ref())
+ .map_or(4, |config| config.tab_width) // fallback to 4 columns
}
// The width (in spaces) of a level of indentation.
@@ -1919,20 +1826,6 @@ impl Document {
self.indent_style.indent_width(self.tab_width())
}
- /// Whether the document should have a trailing line ending appended on save.
- pub fn insert_final_newline(&self) -> bool {
- self.editor_config
- .insert_final_newline
- .unwrap_or_else(|| self.config.load().insert_final_newline)
- }
-
- /// Whether the document should trim whitespace preceding line endings on save.
- pub fn trim_trailing_whitespace(&self) -> bool {
- self.editor_config
- .trim_trailing_whitespace
- .unwrap_or_else(|| self.config.load().trim_trailing_whitespace)
- }
-
pub fn changes(&self) -> &ChangeSet {
&self.changes
}
@@ -1989,19 +1882,16 @@ impl Document {
self.view_data_mut(view_id).view_position = new_offset;
}
- pub fn relative_path(&self) -> Option<&Path> {
- self.relative_path
- .get_or_init(|| {
- self.path
- .as_ref()
- .map(|path| helix_stdx::path::get_relative_path(path).to_path_buf())
- })
+ pub fn relative_path(&self) -> Option<Cow<Path>> {
+ self.path
.as_deref()
+ .map(helix_stdx::path::get_relative_path)
}
- pub fn display_name(&self) -> Cow<'_, str> {
+ pub fn display_name(&self) -> Cow<'static, str> {
self.relative_path()
- .map_or_else(|| SCRATCH_BUFFER_NAME.into(), |path| path.to_string_lossy())
+ .map(|path| path.to_string_lossy().to_string().into())
+ .unwrap_or_else(|| SCRATCH_BUFFER_NAME.into())
}
// transact(Fn) ?
@@ -2035,7 +1925,7 @@ impl Document {
text: &Rope,
language_config: Option<&LanguageConfiguration>,
diagnostic: &helix_lsp::lsp::Diagnostic,
- provider: DiagnosticProvider,
+ language_server_id: LanguageServerId,
offset_encoding: helix_lsp::OffsetEncoding,
) -> Option<Diagnostic> {
use helix_core::diagnostic::{Range, Severity::*};
@@ -2100,8 +1990,8 @@ impl Document {
};
let ends_at_word =
- start != end && end != 0 && text.get_char(end - 1).is_some_and(char_is_word);
- let starts_at_word = start != end && text.get_char(start).is_some_and(char_is_word);
+ start != end && end != 0 && text.get_char(end - 1).map_or(false, char_is_word);
+ let starts_at_word = start != end && text.get_char(start).map_or(false, char_is_word);
Some(Diagnostic {
range: Range { start, end },
@@ -2115,7 +2005,7 @@ impl Document {
tags,
source: diagnostic.source.clone(),
data: diagnostic.data.clone(),
- provider,
+ provider: language_server_id,
})
}
@@ -2128,18 +2018,13 @@ impl Document {
&mut self,
diagnostics: impl IntoIterator<Item = Diagnostic>,
unchanged_sources: &[String],
- provider: Option<&DiagnosticProvider>,
+ language_server_id: Option<LanguageServerId>,
) {
if unchanged_sources.is_empty() {
- if let Some(provider) = provider {
- self.diagnostics
- .retain(|diagnostic| &diagnostic.provider != provider);
- } else {
- self.diagnostics.clear();
- }
+ self.clear_diagnostics(language_server_id);
} else {
self.diagnostics.retain(|d| {
- if provider.is_some_and(|provider| provider != &d.provider) {
+ if language_server_id.map_or(false, |id| id != d.provider) {
return true;
}
@@ -2151,19 +2036,17 @@ impl Document {
});
}
self.diagnostics.extend(diagnostics);
- self.diagnostics.sort_by_key(|diagnostic| {
- (
- diagnostic.range,
- diagnostic.severity,
- diagnostic.provider.clone(),
- )
- });
+ self.diagnostics
+ .sort_by_key(|diagnostic| (diagnostic.range, diagnostic.severity, diagnostic.provider));
}
/// clears diagnostics for a given language server id if set, otherwise all diagnostics are cleared
- pub fn clear_diagnostics_for_language_server(&mut self, id: LanguageServerId) {
- self.diagnostics
- .retain(|d| d.provider.language_server_id() != Some(id));
+ pub fn clear_diagnostics(&mut self, language_server_id: Option<LanguageServerId>) {
+ if let Some(id) = language_server_id {
+ self.diagnostics.retain(|d| d.provider != id);
+ } else {
+ self.diagnostics.clear();
+ }
}
/// Get the document's auto pairs. If the document has a recognized
@@ -2198,17 +2081,12 @@ impl Document {
}
}
- pub fn text_width(&self) -> usize {
- self.editor_config
- .max_line_length
- .map(|n| n.get() as usize)
- .or_else(|| self.language_config().and_then(|config| config.text_width))
- .unwrap_or_else(|| self.config.load().text_width)
- }
-
pub fn text_format(&self, mut viewport_width: u16, theme: Option<&Theme>) -> TextFormat {
let config = self.config.load();
- let text_width = self.text_width();
+ let text_width = self
+ .language_config()
+ .and_then(|config| config.text_width)
+ .unwrap_or(config.text_width);
let mut soft_wrap_at_text_width = self
.language_config()
.and_then(|config| {
@@ -2261,7 +2139,8 @@ impl Document {
viewport_width,
wrap_indicator: wrap_indicator.into_boxed_str(),
wrap_indicator_highlight: theme
- .and_then(|theme| theme.find_highlight("ui.virtual.wrap")),
+ .and_then(|theme| theme.find_scope_index("ui.virtual.wrap"))
+ .map(Highlight),
soft_wrap_at_text_width,
}
}
@@ -2289,10 +2168,6 @@ impl Document {
pub fn reset_all_inlay_hints(&mut self) {
self.inlay_hints = Default::default();
}
-
- pub fn has_language_server_with_feature(&self, feature: LanguageServerFeature) -> bool {
- self.language_servers_with_feature(feature).next().is_some()
- }
}
#[derive(Debug, Default)]
@@ -2309,6 +2184,7 @@ pub enum FormatterError {
BrokenStdin,
WaitForOutputFailed,
InvalidUtf8Output,
+ DiskReloadError(String),
NonZeroExitStatus(Option<String>),
}
@@ -2323,6 +2199,7 @@ impl Display for FormatterError {
Self::BrokenStdin => write!(f, "Could not write to formatter stdin"),
Self::WaitForOutputFailed => write!(f, "Waiting for formatter output failed"),
Self::InvalidUtf8Output => write!(f, "Invalid UTF-8 formatter output"),
+ Self::DiskReloadError(error) => write!(f, "Error reloading file from disk: {}", error),
Self::NonZeroExitStatus(Some(output)) => write!(f, "Formatter error: {}", output),
Self::NonZeroExitStatus(None) => {
write!(f, "Formatter exited with non zero exit status")
@@ -2345,7 +2222,6 @@ mod test {
text,
None,
Arc::new(ArcSwap::new(Arc::new(Config::default()))),
- Arc::new(ArcSwap::from_pointee(syntax::Loader::default())),
);
let view = ViewId::default();
doc.set_selection(view, Selection::single(0, 0));
@@ -2384,7 +2260,6 @@ mod test {
text,
None,
Arc::new(ArcSwap::new(Arc::new(Config::default()))),
- Arc::new(ArcSwap::from_pointee(syntax::Loader::default())),
);
let view = ViewId::default();
doc.set_selection(view, Selection::single(5, 5));
@@ -2498,12 +2373,9 @@ mod test {
#[test]
fn test_line_ending() {
assert_eq!(
- Document::default(
- Arc::new(ArcSwap::new(Arc::new(Config::default()))),
- Arc::new(ArcSwap::from_pointee(syntax::Loader::default()))
- )
- .text()
- .to_string(),
+ Document::default(Arc::new(ArcSwap::new(Arc::new(Config::default()))))
+ .text()
+ .to_string(),
helix_core::NATIVE_LINE_ENDING.as_str()
);
}