Skip to content
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.

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

challenge(formatter): remove trailing spaces after shebang #760

Merged
merged 1 commit into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 17 additions & 1 deletion crates/biome_js_formatter/src/utils/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ use biome_js_syntax::{
AnyJsExpression, AnyJsStatement, JsCallExpression, JsInitializerClause, JsLanguage, Modifiers,
};
use biome_rowan::{AstNode, AstNodeList};
use biome_text_size::TextSize;
pub(crate) use conditional::{AnyJsConditional, ConditionalJsxChain};
pub(crate) use object_like::JsObjectLike;
pub(crate) use object_pattern_like::JsObjectPatternLike;
Expand Down Expand Up @@ -127,7 +128,22 @@ impl<'a> FormatInterpreterToken<'a> {
impl Format<JsFormatContext> for FormatInterpreterToken<'_> {
fn fmt(&self, f: &mut JsFormatter) -> FormatResult<()> {
if let Some(interpreter) = self.token {
write!(f, [interpreter.format()])?;
// Trim trailing spaces of the interpreter
let interpreter_text = interpreter.text_trimmed();
let trimmed_interpreter_text = interpreter_text.trim_end();
let diff = (interpreter_text.len() - trimmed_interpreter_text.len()) as u32;
let trimmed_range = interpreter
.text_trimmed_range()
.sub_end(TextSize::from(diff));

// We replace the interpreter token by its trimmed version
write!(
f,
[format_replaced(
interpreter,
&located_token_text(interpreter, trimmed_range)
)]
)?;

match interpreter
.next_token()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/usr/bin/env node
console.log(1)
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
source: crates/biome_formatter_test/src/snapshot_builder.rs
info: js/module/interpreter-with-trailing-spaces.js
---

# Input

```js
#!/usr/bin/env node
console.log(1)

```


=============================

# Outputs

## Output 1

-----
Indent style: Tab
Indent width: 2
Line width: 80
Quote style: Double Quotes
JSX quote style: Double Quotes
Quote properties: As needed
Trailing comma: All
Semicolons: Always
Arrow parentheses: Always
-----

```js
#!/usr/bin/env node
console.log(1);
```


This file was deleted.