Skip to content
This repository has been archived by the owner on Aug 31, 2023. It is now read-only.

Commit

Permalink
refactor(rome_js_syntax,rome_json_syntax): Rename Unknown nodes to …
Browse files Browse the repository at this point in the history
…`Bogus` (#3881)
  • Loading branch information
MichaReiser committed Nov 28, 2022
1 parent 145c38b commit 12ce753
Show file tree
Hide file tree
Showing 422 changed files with 3,490 additions and 3,442 deletions.
4 changes: 2 additions & 2 deletions crates/rome_css_factory/src/generated/node_factory.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

91 changes: 44 additions & 47 deletions crates/rome_css_factory/src/generated/syntax_factory.rs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion crates/rome_css_syntax/src/generated/kind.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions crates/rome_css_syntax/src/generated/macros.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions crates/rome_css_syntax/src/generated/nodes.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions crates/rome_css_syntax/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ impl rome_rowan::SyntaxKind for CssSyntaxKind {
const TOMBSTONE: Self = CssSyntaxKind::TOMBSTONE;
const EOF: Self = EOF;

fn is_unknown(&self) -> bool {
matches!(self, CSS_UNKNOWN)
fn is_bogus(&self) -> bool {
matches!(self, CSS_BOGUS)
}

fn to_unknown(&self) -> Self {
fn to_bogus(&self) -> Self {
todo!()
}

Expand Down
6 changes: 3 additions & 3 deletions crates/rome_formatter/src/format_element/tag.rs
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ impl LabelId {

#[derive(Clone, Copy, Eq, PartialEq, Debug)]
pub enum VerbatimKind {
Unknown,
Bogus,
Suppressed,
Verbatim {
/// the length of the formatted node
Expand All @@ -281,7 +281,7 @@ pub enum VerbatimKind {
}

impl VerbatimKind {
pub const fn is_unknown(&self) -> bool {
matches!(self, VerbatimKind::Unknown)
pub const fn is_bogus(&self) -> bool {
matches!(self, VerbatimKind::Bogus)
}
}
2 changes: 1 addition & 1 deletion crates/rome_formatter/src/prelude.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pub use crate::trivia::{
format_replaced, format_trailing_comments, format_trimmed_token,
};

pub use crate::verbatim::{format_suppressed_node, format_unknown_node, format_verbatim_node};
pub use crate::verbatim::{format_bogus_node, format_suppressed_node, format_verbatim_node};

pub use crate::format_element::document::Document;
pub use crate::format_element::tag::{LabelId, Tag, TagKind};
Expand Down
20 changes: 10 additions & 10 deletions crates/rome_formatter/src/source_map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -623,39 +623,39 @@ mod tests {
let mut cst_builder = RawSyntaxTreeBuilder::new();
cst_builder.start_node(RawLanguageKind::ROOT);

cst_builder.start_node(RawLanguageKind::UNKNOWN);
cst_builder.start_node(RawLanguageKind::BOGUS);
cst_builder.token(RawLanguageKind::STRING_TOKEN, "(");

cst_builder.start_node(RawLanguageKind::UNKNOWN);
cst_builder.token(RawLanguageKind::UNKNOWN, "(");
cst_builder.start_node(RawLanguageKind::BOGUS);
cst_builder.token(RawLanguageKind::BOGUS, "(");

cst_builder.start_node(RawLanguageKind::LITERAL_EXPRESSION);
cst_builder.token(RawLanguageKind::STRING_TOKEN, "a");
cst_builder.finish_node();

cst_builder.token(RawLanguageKind::UNKNOWN, ")");
cst_builder.token(RawLanguageKind::BOGUS, ")");
cst_builder.finish_node();

cst_builder.token(RawLanguageKind::UNKNOWN, ")");
cst_builder.token(RawLanguageKind::BOGUS, ")");
cst_builder.finish_node();

cst_builder.token(RawLanguageKind::UNKNOWN, ";");
cst_builder.token(RawLanguageKind::BOGUS, ";");

cst_builder.finish_node();

let root = cst_builder.finish();

assert_eq!(&root.text(), "((a));");

let mut unknowns = root
let mut bogus = root
.descendants()
.filter(|node| node.kind() == RawLanguageKind::UNKNOWN);
.filter(|node| node.kind() == RawLanguageKind::BOGUS);

// `((a))`
let outer = unknowns.next().unwrap();
let outer = bogus.next().unwrap();

// `(a)`
let inner = unknowns.next().unwrap();
let inner = bogus.next().unwrap();

// `a`
let expression = root
Expand Down
6 changes: 3 additions & 3 deletions crates/rome_formatter/src/verbatim.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,12 @@ impl<L: Language> FormatVerbatimNode<'_, L> {
}
}

/// Formats unknown nodes. The difference between this method and `format_verbatim` is that this method
/// Formats bogus nodes. The difference between this method and `format_verbatim` is that this method
/// doesn't track nodes/tokens as [VerbatimKind::Verbatim]. They are just printed as they are.
pub fn format_unknown_node<L: Language>(node: &SyntaxNode<L>) -> FormatVerbatimNode<L> {
pub fn format_bogus_node<L: Language>(node: &SyntaxNode<L>) -> FormatVerbatimNode<L> {
FormatVerbatimNode {
node,
kind: VerbatimKind::Unknown,
kind: VerbatimKind::Bogus,
format_comments: true,
}
}
Expand Down
4 changes: 2 additions & 2 deletions crates/rome_js_analyze/src/analyzers/nursery/no_dupe_keys.rs
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ impl Display for MemberDefinition {
}
enum MemberDefinitionError {
NotASinglePropertyMember,
UnknownMemberType,
BogusMemberType,
}
impl TryFrom<JsAnyObjectMember> for MemberDefinition {
type Error = MemberDefinitionError;
Expand All @@ -149,7 +149,7 @@ impl TryFrom<JsAnyObjectMember> for MemberDefinition {
Ok(MemberDefinition::ShorthandProperty(member))
}
JsAnyObjectMember::JsSpread(_) => Err(MemberDefinitionError::NotASinglePropertyMember),
JsAnyObjectMember::JsUnknownMember(_) => Err(MemberDefinitionError::UnknownMemberType),
JsAnyObjectMember::JsBogusMember(_) => Err(MemberDefinitionError::BogusMemberType),
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ impl Rule for InlineVariable {
JsAnyBindingPattern::JsAnyBinding(JsAnyBinding::JsIdentifierBinding(binding)) => {
binding
}
JsAnyBindingPattern::JsAnyBinding(JsAnyBinding::JsUnknownBinding(_))
JsAnyBindingPattern::JsAnyBinding(JsAnyBinding::JsBogusBinding(_))
| JsAnyBindingPattern::JsArrayBindingPattern(_)
| JsAnyBindingPattern::JsObjectBindingPattern(_) => return None,
};
Expand Down
2 changes: 1 addition & 1 deletion crates/rome_js_analyze/src/react.rs
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ fn is_named_react_export(binding: Binding, lib: ReactLibrary, name: &str) -> Opt
named_import.name().ok()?.value().ok()?
}
JsAnyNamedImportSpecifier::JsShorthandNamedImportSpecifier(_) => ident.name_token().ok()?,
JsAnyNamedImportSpecifier::JsUnknownNamedImportSpecifier(_) => {
JsAnyNamedImportSpecifier::JsBogusNamedImportSpecifier(_) => {
return Some(false);
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ fn traverse_parameter(
JsAnyFormalParameter::JsFormalParameter(parameter) => {
traverse_binding(parameter.binding().ok()?, tracked_bindings)
}
JsAnyFormalParameter::JsUnknownParameter(_) => None,
JsAnyFormalParameter::JsBogusParameter(_) => None,
},
JsAnyParameter::JsRestParameter(rest_parameter) => {
traverse_binding(rest_parameter.binding().ok()?, tracked_bindings)
Expand All @@ -115,7 +115,7 @@ fn traverse_binding(
return Some(id_binding);
}
}
JsAnyBinding::JsUnknownBinding(_) => {}
JsAnyBinding::JsBogusBinding(_) => {}
},
JsAnyBindingPattern::JsArrayBindingPattern(inner_binding) => {
return inner_binding.elements().into_iter().find_map(|element| {
Expand Down Expand Up @@ -155,7 +155,7 @@ fn traverse_binding(
JsAnyBinding::JsIdentifierBinding(binding) => {
track_binding(&binding, tracked_bindings).then_some(binding)
}
JsAnyBinding::JsUnknownBinding(_) => None,
JsAnyBinding::JsBogusBinding(_) => None,
}
}
JsAnyObjectBindingPatternMember::JsObjectBindingPatternShorthandProperty(
Expand All @@ -164,9 +164,9 @@ fn traverse_binding(
JsAnyBinding::JsIdentifierBinding(id_binding) => {
track_binding(&id_binding, tracked_bindings).then_some(id_binding)
}
JsAnyBinding::JsUnknownBinding(_) => None,
JsAnyBinding::JsBogusBinding(_) => None,
},
JsAnyObjectBindingPatternMember::JsUnknownBinding(_) => None,
JsAnyObjectBindingPatternMember::JsBogusBinding(_) => None,
}
})
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ fn with_object_binding_pat_identifiers(
P::JsObjectBindingPatternShorthandProperty(p) => p
.identifier()
.map_or(false, |it| with_binding_identifier(it, f)),
P::JsUnknownBinding(_) => false,
P::JsBogusBinding(_) => false,
}
})
}
Expand Down Expand Up @@ -320,7 +320,7 @@ fn with_binding_identifier(
) -> bool {
match binding {
JsAnyBinding::JsIdentifierBinding(id) => f(id),
JsAnyBinding::JsUnknownBinding(_) => false,
JsAnyBinding::JsBogusBinding(_) => false,
}
}

Expand Down Expand Up @@ -401,9 +401,7 @@ fn has_member_expr_in_object_assign_pat(pat: JsObjectAssignmentPattern) -> bool
P::JsObjectAssignmentPatternRest(p) => {
p.target().map_or(false, is_member_expr_assignment)
}
P::JsObjectAssignmentPatternShorthandProperty(_) | P::JsUnknownAssignment(_) => {
false
}
P::JsObjectAssignmentPatternShorthandProperty(_) | P::JsBogusAssignment(_) => false,
}
})
}
Expand Down Expand Up @@ -455,7 +453,7 @@ fn has_outer_variables_in_array_assign_pat(pat: JsObjectAssignmentPattern, scope
P::JsObjectAssignmentPatternShorthandProperty(p) => p
.identifier()
.map_or(false, |it| is_outer_ident_in_assignment(it, scope)),
P::JsUnknownAssignment(_) => false,
P::JsBogusAssignment(_) => false,
}
})
}
Expand Down
6 changes: 3 additions & 3 deletions crates/rome_js_analyze/tests/spec_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use rome_diagnostics::termcolor::NoColor;
use rome_diagnostics::{DiagnosticExt, Error, PrintDiagnostic, Severity};
use rome_js_parser::{
parse,
test_utils::{assert_errors_are_absent, has_unknown_nodes_or_empty_slots},
test_utils::{assert_errors_are_absent, has_bogus_nodes_or_empty_slots},
};
use rome_js_syntax::{JsLanguage, SourceType};
use similar::TextDiff;
Expand Down Expand Up @@ -194,8 +194,8 @@ fn check_code_action(
// returns the same code as printing the modified syntax tree
assert_eq!(new_tree.to_string(), output);

if has_unknown_nodes_or_empty_slots(&new_tree) {
panic!("modified tree has unknown nodes or empty slots:\n{new_tree:#?}")
if has_bogus_nodes_or_empty_slots(&new_tree) {
panic!("modified tree has bogus nodes or empty slots:\n{new_tree:#?}")
}

// Checks the returned tree contains no missing children node
Expand Down

0 comments on commit 12ce753

Please sign in to comment.