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

Jump to bottom

Fix support for HTML files in declaration-empty-line-before #5689

Merged
merged 1 commit into from Nov 16, 2021
Merged

Fix support for HTML files in declaration-empty-line-before #5689

merged 1 commit into from Nov 16, 2021

Conversation

wolfgangwalther
Copy link
Contributor

This is taken out of #5657 to be able to merge the agreed-on parts ahead of other stuff.

The first 3 commits are from that yet unmerged PR right now, the change is only in the 4th commit. After re-enabling those tests by replacing the syntax: 'html' with customSyntax, those two tests would still fail and were left skipped in #5657.

The fix seems simple enough, but needs some improvement regarding typescript typing.

@wolfgangwalther wolfgangwalther mentioned this pull request Nov 2, 2021
Merged
@jeddy3 jeddy3 changed the title Unskip declaration empty line before tests Fix TypeError for baseIndentLevel: 1 option and vue file in indentation Nov 8, 2021
jeddy3
jeddy3 approved these changes Nov 8, 2021
View reviewed changes
Copy link
Member

@jeddy3 jeddy3 left a comment

Choose a reason for hiding this comment

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

@wolfgangwalther Thanks for pulling this out and apologies for the delay looping back to it.

LGTM

(I've renamed the title as it closes #5677.)

@wolfgangwalther
Copy link
Contributor Author

LGTM

(I've renamed the title as it closes #5677.)

No, this is the wrong PR. It just has some of the same commits as the other one, because it's based on the same branch.

This one is just about the last commit. It's expected to fail right now and was left here for further discussion.

@wolfgangwalther wolfgangwalther changed the title Fix TypeError for baseIndentLevel: 1 option and vue file in indentation Unskip declaration empty line before tests Nov 8, 2021
@wolfgangwalther wolfgangwalther marked this pull request as draft November 8, 2021 18:00
@jeddy3
Copy link
Member

jeddy3 commented Nov 8, 2021

My bad! I just realised it was the wrong one too (too many tabs open 😅 !)

jeddy3
jeddy3 requested changes Nov 8, 2021
View reviewed changes
Copy link
Member

@jeddy3 jeddy3 left a comment

Choose a reason for hiding this comment

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

TypeScript error needs investigating...

@wolfgangwalther
Copy link
Contributor Author

TypeScript error needs investigating...

Yes, this is where I need help, as I don't really know TypeScript well, yet.

@jeddy3 jeddy3 mentioned this pull request Nov 8, 2021
Closed
6 tasks
@ybiquitous
Copy link
Member

It seems good that blockString() should allow also a Root node to resolve the type error. I'll create a PR to fix it! 💪🏼

stylelint/lib/utils/blockString.js

Line 15 in 76f6fe0

* @param {Rule | AtRule} statement - postcss rule or at-rule node

@ybiquitous ybiquitous mentioned this pull request Nov 9, 2021
Merged
@ybiquitous
Copy link
Member

I've created PR #5708. Maybe, it should resolve the type error in this PR.

@wolfgangwalther
Copy link
Contributor Author

I've created PR #5708. Maybe, it should resolve the type error in this PR.

I can confirm it does. I cherry-picked it locally and ran the linter - no errors reported. I didn't rebase on it, because this branch is still rebased on #5657.

@wolfgangwalther wolfgangwalther marked this pull request as ready for review November 9, 2021 08:04
@wolfgangwalther
Copy link
Contributor Author

(just a rebase on latest main)

@wolfgangwalther
Copy link
Contributor Author

Another rebase, this time after #5708 was merged. This should pass CI now.

ybiquitous
ybiquitous approved these changes Nov 11, 2021
View reviewed changes
Copy link
Member

@ybiquitous ybiquitous left a comment

Choose a reason for hiding this comment

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

Thanks, LGTM!
I've left a question, but I think this is ready to merge. 👍🏼

package.json Outdated Show resolved Hide resolved
@jeddy3
Copy link
Member

jeddy3 commented Nov 15, 2021

@wolfgangwalther Can you rebase, please?

@wolfgangwalther
Copy link
Contributor Author

@wolfgangwalther Can you rebase, please?

Done!

@jeddy3 jeddy3 changed the title Unskip declaration empty line before tests Fix support for HTML files in declaration-empty-line-before Nov 15, 2021
jeddy3
jeddy3 approved these changes Nov 15, 2021
View reviewed changes
Copy link
Member

@jeddy3 jeddy3 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@jeddy3 jeddy3 merged commit 0eb6386 into stylelint:main Nov 16, 2021
@jeddy3
Copy link
Member

jeddy3 commented Nov 16, 2021

  • Fixed: declaration-empty-line-before support for HTML files (#5689).

@sync-by-unito sync-by-unito bot mentioned this pull request Jan 1, 2022
Closed
@sync-by-unito sync-by-unito bot mentioned this pull request Jan 27, 2022
Closed
@sync-by-unito sync-by-unito bot mentioned this pull request Mar 1, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ybiquitous ybiquitous ybiquitous approved these changes

@jeddy3 jeddy3 jeddy3 approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@wolfgangwalther @jeddy3 @ybiquitous