Skip to content

Conversation

@Sysix
Copy link
Member

@Sysix Sysix commented Oct 5, 2025

Now the comment is aligned with the indent of the line:
whitespace-disable-next-line

@github-actions github-actions bot added A-linter Area - Linter C-bug Category - Bug labels Oct 5, 2025
Copy link
Member Author

Sysix commented Oct 5, 2025


How to use the Graphite Merge Queue

Add either label to this PR to merge it via the merge queue:

  • 0-merge - adds this PR to the back of the merge queue
  • hotfix - for urgent hot fixes, skip the queue and merge this PR next

You must have a Graphite account in order to use the merge queue. Sign up using this link.

An organization admin has enabled the Graphite Merge Queue in this repository.

Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue.

This stack of pull requests is managed by Graphite. Learn more about stacking.

@codspeed-hq
Copy link

codspeed-hq bot commented Oct 5, 2025

CodSpeed Performance Report

Merging #14356 will not alter performance

Comparing 10-05-fix_language_server_add_whitespace_for___oxlint-disable-next-line_fix (80394c2) with main (83e7824)1

Summary

✅ 4 untouched
⏩ 33 skipped2

Footnotes

  1. No successful run was found on main (18616c2) during the generation of this report, so 83e7824 was used instead as the comparison base. There might be some changes unrelated to this pull request in this report.

  2. 33 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports.

@Sysix Sysix force-pushed the 10-05-fix_language_server_add_whitespace_for___oxlint-disable-next-line_fix branch from f5aeecf to c111d93 Compare October 5, 2025 14:57
@github-actions github-actions bot added the A-editor Area - Editor and Language Server label Oct 5, 2025
@Sysix Sysix force-pushed the 10-05-fix_language_server_add_whitespace_for___oxlint-disable-next-line_fix branch 2 times, most recently from b6c4038 to 11bd057 Compare October 5, 2025 16:49
@Sysix Sysix requested a review from Copilot October 6, 2025 19:04
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR fixes the whitespace handling for the // oxlint-disable-next-line fix in the language server. The main improvement is ensuring that disable comments are properly indented to match the existing code indentation.

  • Adds whitespace preservation when inserting // oxlint-disable-next-line comments
  • Refactors the line break detection logic to handle framework files properly
  • Introduces comprehensive test coverage for various indentation scenarios

Reviewed Changes

Copilot reviewed 3 out of 6 changed files in this pull request and generated 2 comments.

File Description
crates/oxc_linter/src/lsp.rs Core implementation for whitespace-aware disable comment insertion with new helper function and extensive tests
crates/oxc_language_server/src/snapshots/[email protected] Updated snapshot showing proper indentation handling for Vue files
crates/oxc_language_server/src/snapshots/[email protected] Updated snapshot showing proper indentation handling for Svelte files

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

@Sysix Sysix force-pushed the 10-05-fix_language_server_add_whitespace_for___oxlint-disable-next-line_fix branch from 11bd057 to 80394c2 Compare October 7, 2025 16:58
@Sysix Sysix marked this pull request as ready for review October 7, 2025 17:20
@Sysix Sysix requested a review from camc314 as a code owner October 7, 2025 17:20
@Sysix Sysix marked this pull request as draft October 8, 2025 00:49
@Sysix
Copy link
Member Author

Sysix commented Oct 8, 2025

waiting for #14428 stack, targeted the wrong branch as the base >.<

@Sysix Sysix force-pushed the 10-05-fix_language_server_add_whitespace_for___oxlint-disable-next-line_fix branch from 80394c2 to a00c684 Compare October 8, 2025 17:18
@Sysix Sysix marked this pull request as ready for review October 8, 2025 17:30
@Sysix Sysix removed the A-linter Area - Linter label Oct 8, 2025
@Sysix Sysix force-pushed the 10-05-fix_language_server_add_whitespace_for___oxlint-disable-next-line_fix branch from a00c684 to 654c8bd Compare October 12, 2025 12:09
@camc314 camc314 self-assigned this Oct 13, 2025
@graphite-app
Copy link
Contributor

graphite-app bot commented Oct 13, 2025

Merge activity

@graphite-app graphite-app bot force-pushed the 10-05-fix_language_server_add_whitespace_for___oxlint-disable-next-line_fix branch from 654c8bd to fb4a20d Compare October 13, 2025 14:45
@graphite-app graphite-app bot merged commit fb4a20d into main Oct 13, 2025
21 checks passed
@graphite-app graphite-app bot deleted the 10-05-fix_language_server_add_whitespace_for___oxlint-disable-next-line_fix branch October 13, 2025 14:49
camc314 added a commit that referenced this pull request Oct 13, 2025
## [1.23.0] - 2025-10-13

### 🚀 Features

- 452d128 linter: Node/no_process_env (#14536) (Kenneth Skovhus)
- a9e1261 linter: Implement react-refresh/only-export-components
(#14122) (Rintaro Itokawa)
- a8d542b linter/no-duplicate-imports: Support
`allowSeparateTypeImports` option (#14527) (camc314)
- 75a529c linter: Add run info about what functions rules implement
(#13839) (camchenry)
- 4fbdef2 language_server: Support `fmt.configPath` configuration
(#14502) (Sysix)
- 4d3ce2e language_server: Autodetect root `.oxfmtrc.json` (#14466)
(Sysix)

### 🐛 Bug Fixes

- fb4a20d language_server: Add whitespace for `//
oxlint-disable-next-line` fix (#14356) (Sysix)
- 6fce7f4 oxlint/changelog: Remove duplicate changelog entries (#14528)
(camc314)
- 74e52f3 linter/plugins: Resolve JS plugins with ESM condition names
(#14541) (magic-akari)
- 9965676 linter/exhaustive-deps: Ignore empty strings passed to
`additionalHooks` option (#14464) (Redas)
- d0a8e3e linter: `vue/no_required_prop_with_default` called
`Option::unwrap()` on a `None` value (#14491) (Sysix)
- 1192ea2 linter: Correct `nextjs/no-typos` path handling (#14480)
(shulaoda)
- 2796b16 tsgolint: Pipe tsgolints stderr (#14477) (camc314)

### 🚜 Refactor

- 6440cde linter: Remove lifetime of `Message` (#14481) (Sysix)
- f599bef language_server: Move `Message` to `DiagnosticReport`
transformation to one place (#14447) (Sysix)
- 4f301de napi/parser, linter/plugins: Improve formatting of generated
code (#14554) (overlookmotel)
- 68c0252 napi/parser, linter/plugins: Shorten generated raw transfer
deserializer code (#14553) (overlookmotel)
- 20e884e linter: Store `LintService` in `LintRunner` (#14471) (Sysix)
- 9e9c5ba linter: Simplify built-in lint plugin checks (#14518)
(camchenry)
- 1986e0f linter/no-ex-assign: Use let-else chain (#14526) (camc314)
- ce9bcf0 linter/no-func-assign: Use let-else chain (#14525) (camc314)
- a9cea7c language_server: Use `FxHashSet` for
`ServerLinter::extended_paths` (#14517) (Sysix)
- ea5838e linter/no-import-assign: Use let-else chain (#14524) (camc314)
- f977700 language_server: Pass `LintOptions` to
`Worker::refresh_server_linter` (#14510) (Sysix)
- 54b001f linter/no-new-require: Improve diagnostic message clarity
(#14511) (shulaoda)
- 650ea68 linter: Improve nextjs/no-typos rule (#14476) (shulaoda)

### 📚 Documentation

- 198f2e9 linter: Fix code example for `branches-sharing-code` (#14514)
(camc314)
- d776a17 linter: Improve `nextjs/no-typos` rule documentation (#14470)
(shulaoda)

### ⚡ Performance

- b44a30e language_server: Transform `Message` to `DiagnosticReport`
with one call (#14448) (Sysix)
- 31766fd linter/plugins: Provide `loc` via prototype (#14552)
(overlookmotel)
- aec0c08 linter: Allow analyzing node types in match blocks with guards
(#14459) (camchenry)
- 9044187 linter: Skip running node-specific rule if file contains no
relevant nodes (#14457) (camchenry)
- 422f54e linter: Only run rule run functions if implemented (#14454)
(camchenry)
- 2c228ae liner: Use top-level match for `no_obj_calls` (#14523)
(camchenry)
- c49d891 linter: Use match for `no_negated_condition` (#14522)
(camchenry)
- e222fc2 linter: Use match for `no_multi_assign` (#14521) (camchenry)
- 4440516 linter: Refactor rules to take advantage of node type skipping
(#14519) (camchenry)
- 78261d6 linter: Refactor `no-invalid-fetch-options` to be more easily
analyzed (#14458) (camchenry)

### 🧪 Testing

- 8d8881d linter/plugins: Expand tests for module resolution of plugins
(#14559) (overlookmotel)
- 33b6cde language_server: Add basic tests for
`WorkspaceWorker::did_change_configuration` (#14531) (Sysix)
- bfe1ecd language_server: Add tests for
`WorkspaceWorker::init_watchers` (#14516) (Sysix)

Co-authored-by: camc314 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-editor Area - Editor and Language Server C-bug Category - Bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants