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

Adjust tab width char handling #45

Closed
wants to merge 2 commits into from
Closed

Conversation

adangel
Copy link
Member

@adangel adangel commented Aug 20, 2020

With pmd/pmd#2656 tab characters are now handled with column
with of 1. That means, the position that PMD's parser reports
uses this with. The display of the tab character might be different
in the code are of the designer (and in any other text editor).

With pmd/pmd#2656 tab characters are now handled with column
with of 1. That means, the position that PMD's parser reports
uses this with. The display of the tab character might be different
in the code are of the designer (and in any other text editor).
@adangel adangel added this to the 6.27.0 milestone Aug 20, 2020
@oowekyala oowekyala self-assigned this Aug 20, 2020
@adangel
Copy link
Member Author

adangel commented Aug 22, 2020

@oowekyala
I know, we discussed to release PMD first with the old designer, then release pmd-designer 6.27.0, and then replace the binary distribution of PMD 6.27.0 with an updated designer.

But I've checked the changed in the pmd-designer, and I think, there is another way:

  • I've created the branch 6.27-dev here. It contains the change (cherry-picked) regarding the tab size from this PR
  • It additionally fixes jcommander usage (since we use on PMD now an older version of that dependency) - that's also on master already
  • It keeps the pmd-core dependency at 6.23.0. It only documents, that at least PMD 6.27.0 should be used due to the tab size change.

I'm proposing to do the 6.27.0 release of the designer off of this branch "6.27-dev" and merge that branch then afterwards into master for the next designer release, where we can use directly pmd-core 6.27.0 (instead of snapshot).

That way, we would have the "normal" release order: pmd-designer -> pmd.

What do you think?

@oowekyala
Copy link
Member

This sounds simpler, I'm all for it. So this release of the designer will be versioned 6.27.0, correct? And then the development version will be bumped to depend on pmd-core 6.27.0, and be versioned 6.28.0-snapshot?

@adangel
Copy link
Member Author

adangel commented Aug 22, 2020

Yes, exactly

@oowekyala
Copy link
Member

oowekyala commented Aug 22, 2020

I'm not sure why we need to merge it on a separate branch though. Is it because of CI? If it's simpler for you then do as you please. I'm just trying to understand

BTW whether you intend to merge or close this PR it's probably better if you do it. I'm removing my assignment

@oowekyala oowekyala removed their assignment Aug 22, 2020
@adangel
Copy link
Member Author

adangel commented Aug 22, 2020

I've created the branch 6.27-dev before your commit e0f23e1 . the branch can be considered as a pull request not against master but against 3290177 - the problem is, that the development for the next version is already ongoing on master in pmd-designer....

Once the branch 6.27-dev is merged back into master, we can close this PR as done - no need to merge it, as the code changes are then already included.

@adangel
Copy link
Member Author

adangel commented Aug 23, 2020

The changes of this PR have been cherry-picked for 6.27.0.
The cherry-picked commits are:

@adangel adangel closed this Aug 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants