andrey/helix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lsp: Refactor code that could use document_by_path_mut

Browse Source
This commit is contained in:
Blaž Hrastnik 2021-09-02 11:28:40 +09:00
parent 63e191ea3b
commit dc7799b980
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
helix-term/src/application.rs
View File

@ -276,15 +276,10 @@ pub async fn handle_language_server_message(
match notification {
Notification::PublishDiagnostics(params) => {
let path = Some(params.uri.to_file_path().unwrap());
let path = params.uri.to_file_path().unwrap();
let doc = self.editor.document_by_path_mut(&path);
let doc = self
.editor
.documents
.iter_mut()
.find(|(_, doc)| doc.path() == path.as_ref());
if let Some((_, doc)) = doc {
if let Some(doc) = doc {
let text = doc.text();
let diagnostics = params

5
helix-view/src/editor.rs
View File

@ -340,6 +340,11 @@ pub fn document_by_path<P: AsRef<Path>>(&self, path: P) -> Option<&Document> {
.find(|doc| doc.path().map(|p| p == path.as_ref()).unwrap_or(false))
}
pub fn document_by_path_mut<P: AsRef<Path>>(&mut self, path: P) -> Option<&mut Document> {
self.documents_mut()
.find(|doc| doc.path().map(|p| p == path.as_ref()).unwrap_or(false))
}
pub fn cursor(&self) -> (Option<Position>, CursorKind) {
let view = view!(self);
let doc = &self.documents[view.doc];