chore: code review

rome · Oct 29, 2021 · f71cfc8 · f71cfc8
1 parent 009bd8c
commit f71cfc8
Show file tree

Hide file tree

Showing 24 changed files with 104 additions and 543 deletions.
diff --git a/crates/formatter/src/format_json.rs b/crates/formatter/src/format_json.rs
@@ -47,7 +47,6 @@ fn tokenize_node(node: SyntaxNode) -> FormatElement {
 		SyntaxKind::OBJECT_EXPR => {
 			let object = ObjectExpr::cast(node).unwrap();
 
-			dbg!(&object);
 			let separator = format_elements![token(","), soft_line_break_or_space()];
 
 			let properties_list: Vec<FormatElement> = object

diff --git a/crates/formatter/src/ts/class/class_declarator.rs b/crates/formatter/src/ts/class/class_declarator.rs
@@ -6,7 +6,6 @@ use rslint_parser::ast::{ClassBody, ClassDecl, ClassElement, SuperCall};
 
 impl ToFormatElement for ClassDecl {
 	fn to_format_element(&self, formatter: &Formatter) -> Option<FormatElement> {
-		dbg!(self);
 		let class_token = formatter.format_token(&self.class_token()?)?;
 		let name = formatter.format_node(self.name()?)?;
 		let extends = if let Some(parent) = self.parent() {

diff --git a/crates/formatter/src/ts/class/constructor.rs b/crates/formatter/src/ts/class/constructor.rs
@@ -37,7 +37,6 @@ impl ToFormatElement for ConstructorParameters {
 
 impl ToFormatElement for ConstructorParamOrPat {
 	fn to_format_element(&self, formatter: &Formatter) -> Option<FormatElement> {
-		dbg!(self);
 		match self {
 			ConstructorParamOrPat::TsConstructorParam(_) => todo!(),
 			ConstructorParamOrPat::Pattern(pattern) => pattern.to_format_element(formatter),

diff --git a/crates/formatter/src/ts/expressions/object_expression.rs b/crates/formatter/src/ts/expressions/object_expression.rs
@@ -6,7 +6,6 @@ use rslint_parser::ast::ObjectExpr;
 
 impl ToFormatElement for ObjectExpr {
 	fn to_format_element(&self, formatter: &Formatter) -> Option<FormatElement> {
-		dbg!(self);
 		let separator = format_elements!(token(","), soft_line_break_or_space());
 		let props = formatter.format_children(self.props())?;
 

diff --git a/crates/formatter/src/ts/mod.rs b/crates/formatter/src/ts/mod.rs
@@ -67,7 +67,6 @@ mod test {
 		let src = r#"let a1 = [{}, {}];
 "#;
 		let tree = parse_text(src, 0);
-		dbg!(&tree.syntax());
 		let result = Formatter::default().format_root(&tree.syntax());
 		assert_eq!(
 			result.code(),

diff --git a/crates/formatter/src/ts/props/literal_prop.rs b/crates/formatter/src/ts/props/literal_prop.rs
@@ -4,8 +4,8 @@ use rslint_parser::ast::LiteralProp;
 impl ToFormatElement for LiteralProp {
 	fn to_format_element(&self, formatter: &Formatter) -> Option<FormatElement> {
 		let key = formatter.format_node(self.key()?)?;
-		let value = formatter.format_node(self.value()?)?;
 		let colon = formatter.format_token(&self.colon_token()?)?;
+		let value = formatter.format_node(self.value()?)?;
 		Some(format_elements![key, colon, space_token(), value])
 	}
 }
diff --git a/crates/formatter/src/ts/statements/continue_statement.rs b/crates/formatter/src/ts/statements/continue_statement.rs
@@ -6,7 +6,6 @@ use rslint_parser::ast::ContinueStmt;
 impl ToFormatElement for ContinueStmt {
 	fn to_format_element(&self, formatter: &Formatter) -> Option<FormatElement> {
 		// NOTE: rslint parser (upstream) is currently broken https://github.com/rslint/rslint/issues/126
-		dbg!(self);
 		let ident = if let Some(name_ref) = self.name_ref() {
 			format_elements![space_token(), formatter.format_node(name_ref)?]
 		} else {

diff --git a/crates/formatter/src/ts/statements/expression_statement.rs b/crates/formatter/src/ts/statements/expression_statement.rs
@@ -4,7 +4,6 @@ use crate::{format_elements, token, FormatElement, Formatter, ToFormatElement};
 
 impl ToFormatElement for ExprStmt {
 	fn to_format_element(&self, formatter: &Formatter) -> Option<FormatElement> {
-		dbg!(self);
 		Some(format_elements![
 			formatter.format_node(self.expr()?)?,
 			token(";")

diff --git a/crates/formatter/src/ts/statements/for_stmt.rs b/crates/formatter/src/ts/statements/for_stmt.rs
@@ -7,7 +7,6 @@ use rslint_parser::ast::{ForHead, ForStmt, ForStmtInit, ForStmtTest, ForStmtUpda
 impl ToFormatElement for ForStmt {
 	fn to_format_element(&self, formatter: &Formatter) -> Option<FormatElement> {
 		let inner = if self.init().is_some() || self.test().is_some() || self.update().is_some() {
-			dbg!(self);
 			let mut inner = vec![];
 			if let Some(init) = self.init() {
 				inner.push(formatter.format_node(init)?);

diff --git a/crates/formatter/src/ts/statements/switch_statement.rs b/crates/formatter/src/ts/statements/switch_statement.rs
@@ -7,7 +7,6 @@ use rslint_parser::ast::{CaseClause, DefaultClause, SwitchCase, SwitchStmt};
 
 impl ToFormatElement for SwitchStmt {
 	fn to_format_element(&self, formatter: &Formatter) -> Option<FormatElement> {
-		dbg!(self);
 		let switch = formatter.format_token(&self.switch_token()?)?;
 		let condition = formatter.format_node(self.test()?)?;
 		let l_curly = formatter.format_token(&self.l_curly_token()?)?;

diff --git a/crates/rslint_errors/src/formatters.rs b/crates/rslint_errors/src/formatters.rs
@@ -46,7 +46,6 @@ impl Formatter for ShortFormatter {
 			ids.insert(d.file_id);
 		});
 		for id in ids {
-			dbg!(id);
 			let cur_diags = diagnostics
 				.iter()
 				.filter(|x| x.file_id == id && x.primary.is_some())

diff --git a/crates/rslint_parser/src/ast/expr_ext.rs b/crates/rslint_parser/src/ast/expr_ext.rs
@@ -417,7 +417,6 @@ impl Literal {
 	}
 
 	pub fn kind(&self) -> LiteralKind {
-		dbg!(self.token().kind());
 		match self.token().kind() {
 			T![null] => LiteralKind::Null,
 			NUMBER => match parse_js_num(self.to_string()).unwrap() {
@@ -490,7 +489,6 @@ impl Literal {
 
 impl ArrowExpr {
 	pub fn body(&self) -> Option<ExprOrBlock> {
-		dbg!("here", self.syntax().children().last());
 		ExprOrBlock::cast(self.syntax().children().last()?)
 	}
 }

diff --git a/crates/rslint_parser/src/ast/generated/nodes.rs b/crates/rslint_parser/src/ast/generated/nodes.rs
@@ -468,7 +468,10 @@ pub struct DotExpr {
 	pub(crate) syntax: SyntaxNode,
 }
 impl DotExpr {
+	pub fn super_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![super]) }
+	pub fn object(&self) -> Option<Expr> { support::child(&self.syntax) }
 	pub fn dot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T ! [.]) }
+	pub fn prop(&self) -> Option<Name> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct NewExpr {
@@ -635,9 +638,9 @@ impl FnExpr {
 	pub fn name(&self) -> Option<Name> { support::child(&self.syntax) }
 	pub fn type_params(&self) -> Option<TsTypeParams> { support::child(&self.syntax) }
 	pub fn parameters(&self) -> Option<ArgList> { support::child(&self.syntax) }
-	pub fn body(&self) -> Option<BlockStmt> { support::child(&self.syntax) }
 	pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T ! [:]) }
 	pub fn return_type(&self) -> Option<TsType> { support::child(&self.syntax) }
+	pub fn body(&self) -> Option<BlockStmt> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ClassExpr {

diff --git a/crates/rslint_parser/src/ast/generated/tokens.rs b/crates/rslint_parser/src/ast/generated/tokens.rs
@@ -47,3 +47,45 @@ impl AstToken for Number {
 	}
 	fn syntax(&self) -> &SyntaxToken { &self.syntax }
 }
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Whitespace {
+	pub(crate) syntax: SyntaxToken,
+}
+impl std::fmt::Display for Whitespace {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		std::fmt::Display::fmt(&self.syntax, f)
+	}
+}
+impl AstToken for Whitespace {
+	fn can_cast(kind: SyntaxKind) -> bool { kind == WHITESPACE }
+	fn cast(syntax: SyntaxToken) -> Option<Self> {
+		if Self::can_cast(syntax.kind()) {
+			Some(Self { syntax })
+		} else {
+			None
+		}
+	}
+	fn syntax(&self) -> &SyntaxToken { &self.syntax }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Comment {
+	pub(crate) syntax: SyntaxToken,
+}
+impl std::fmt::Display for Comment {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		std::fmt::Display::fmt(&self.syntax, f)
+	}
+}
+impl AstToken for Comment {
+	fn can_cast(kind: SyntaxKind) -> bool { kind == COMMENT }
+	fn cast(syntax: SyntaxToken) -> Option<Self> {
+		if Self::can_cast(syntax.kind()) {
+			Some(Self { syntax })
+		} else {
+			None
+		}
+	}
+	fn syntax(&self) -> &SyntaxToken { &self.syntax }
+}
diff --git a/crates/rslint_parser/src/lib.rs b/crates/rslint_parser/src/lib.rs
@@ -99,12 +99,6 @@ pub use rslint_syntax::*;
 /// It also includes labels and possibly notes
 pub type ParserError = rslint_errors::Diagnostic;
 
-pub enum SyntaxError {
-	MissingElement,
-}
-
-pub type SyntaxResult<Node> = Result<Node, SyntaxError>;
-
 use std::ops::Range;
 
 /// Abstracted token for `TokenSource`

diff --git a/crates/syntax/examples/log_attrs.rs b/crates/syntax/examples/log_attrs.rs
@@ -14,12 +14,9 @@ fn main() {
 			log_attr(n);
 		}
 	}
-
-	dbg!(tree.to_string());
 }
 
 fn log_attr(n: SyntaxNode) -> Option<()> {
 	let attr = ast::JsxAttribute::cast(n)?;
-	dbg!(attr);
 	None
 }
diff --git a/crates/syntax/src/main.rs b/crates/syntax/src/main.rs
@@ -13,8 +13,7 @@ fn main() -> Result<()> {
 	};
 
 	let src = std::fs::read_to_string(path)?;
-	let tree = syntax::parse(&src, language)?;
+	let _tree = syntax::parse(&src, language)?;
 
-	dbg!(tree);
 	Ok(())
 }