Skip to content

Remove reference diagnostics from documents #698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vinistock wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove reference diagnostics from documents #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions rust/rubydex/src/model/document.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use line_index::LineIndex;
use url::Url;

use crate::diagnostic::Diagnostic;
use crate::model::identity_maps::IdentityHashMap;
use crate::model::ids::{DefinitionId, ReferenceId};

// Represents a document currently loaded into memory. Identified by its unique URI, it holds the edges to all
Expand All @@ -17,8 +16,6 @@ pub struct Document {
method_reference_ids: Vec<ReferenceId>,
constant_reference_ids: Vec<ReferenceId>,
diagnostics: Vec<Diagnostic>,
definition_diagnostics: IdentityHashMap<DefinitionId, Vec<Diagnostic>>,
reference_diagnostics: IdentityHashMap<ReferenceId, Vec<Diagnostic>>,
}

impl Document {
Expand All @@ -31,8 +28,6 @@ impl Document {
method_reference_ids: Vec::new(),
constant_reference_ids: Vec::new(),
diagnostics: Vec::new(),
definition_diagnostics: IdentityHashMap::default(),
reference_diagnostics: IdentityHashMap::default(),
}
}

Expand Down Expand Up @@ -87,31 +82,6 @@ impl Document {
self.diagnostics.push(diagnostic);
}

#[must_use]
pub fn diagnostics_for_definition(&self, id: DefinitionId) -> &[Diagnostic] {
self.definition_diagnostics.get(&id).map_or(&[], Vec::as_slice)
}

pub fn add_diagnostic_for_definition(&mut self, id: DefinitionId, diagnostic: Diagnostic) {
self.definition_diagnostics.entry(id).or_default().push(diagnostic);
}

#[must_use]
pub fn diagnostics_for_reference(&self, id: ReferenceId) -> &[Diagnostic] {
self.reference_diagnostics.get(&id).map_or(&[], Vec::as_slice)
}

pub fn add_diagnostic_for_reference(&mut self, id: ReferenceId, diagnostic: Diagnostic) {
self.reference_diagnostics.entry(id).or_default().push(diagnostic);
}

pub fn all_diagnostics(&self) -> impl Iterator<Item = &Diagnostic> {
self.diagnostics
.iter()
.chain(self.definition_diagnostics.values().flatten())
.chain(self.reference_diagnostics.values().flatten())
}

/// Computes the require path for this document given load paths.
///
/// Returns `None` if:
Expand Down
2 changes: 1 addition & 1 deletion rust/rubydex/src/model/graph.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ impl Graph {

#[must_use]
pub fn all_diagnostics(&self) -> Vec<&Diagnostic> {
let document_diagnostics = self.documents.values().flat_map(Document::all_diagnostics);
let document_diagnostics = self.documents.values().flat_map(Document::diagnostics);
let declaration_diagnostics = self.declarations.values().flat_map(Declaration::diagnostics);

document_diagnostics.chain(declaration_diagnostics).collect()
Expand Down
Loading