Skip to content

8348736: RichTextArea clamp and getText #1684

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

Conversation

andy-goryachev-oracle
Copy link
Contributor

@andy-goryachev-oracle andy-goryachev-oracle commented Jan 27, 2025

Fixes minor issues uncovered while writing API tests #1677:

  • StyledTextModel::clamp L559 is incorrect at the end of paragraph
  • CodeArea.getText() adds extra newline at the end

This change should be back-ported to jfx24.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (2 reviews required, with at least 1 Reviewer, 1 Author)

Issue

  • JDK-8348736: RichTextArea clamp and getText (Bug - P4)(⚠️ The fixVersion in this issue is [jfx24] but the fixVersion in .jcheck/conf is jfx25, a new backport will be created when this pr is integrated.)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jfx.git pull/1684/head:pull/1684
$ git checkout pull/1684

Update a local copy of the PR:
$ git checkout pull/1684
$ git pull https://git.openjdk.org/jfx.git pull/1684/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1684

View PR using the GUI difftool:
$ git pr show -t 1684

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jfx/pull/1684.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 27, 2025

👋 Welcome back angorya! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Jan 27, 2025

@andy-goryachev-oracle This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8348736: RichTextArea clamp and getText

Reviewed-by: kcr, arapte

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@andy-goryachev-oracle andy-goryachev-oracle marked this pull request as ready for review January 27, 2025 23:56
@openjdk openjdk bot added the rfr Ready for review label Jan 27, 2025
@mlbridge
Copy link

mlbridge bot commented Jan 28, 2025

Webrevs

@kevinrushforth kevinrushforth self-requested a review January 28, 2025 00:36
@kevinrushforth
Copy link
Member

I'll review this. We need one other review, too. I'd rather see a more specific bug title if you can come up with something meaningful.

/reviewers 2

@openjdk
Copy link

openjdk bot commented Jan 28, 2025

@kevinrushforth
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 1 Reviewer, 1 Author).

@andy-goryachev-oracle andy-goryachev-oracle changed the title 8348736: RichTextArea Follow-up 2 8348736: RichTextArea clamp and getText Jan 28, 2025
Copy link
Member

@kevinrushforth kevinrushforth left a comment

Choose a reason for hiding this comment

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

Looks good, including the updated title.

I left a question and suggestion and will reapprove if you make changes.

sb.append(s);
sb.append('\n');
if (m == null) {
return null;
Copy link
Member

Choose a reason for hiding this comment

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

This didn't used to return null before this fix (it would throw NPE on a null model). Perhaps returning the empty string be better? Either way, it would be helpful to document whether or not this method can return null.

return out.toString();
} catch (IOException e) {
// should not happen
throw new RuntimeException(e);
Copy link
Member

Choose a reason for hiding this comment

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

Minor: wrapping it in UncheckedIOException is preferred over raw RuntimeException.

@kevinrushforth
Copy link
Member

@arapte or @lukostyra can one of you be the second reviewer?

Copy link
Member

@arapte arapte left a comment

Choose a reason for hiding this comment

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

LGTM

@openjdk openjdk bot added the ready Ready to be integrated label Jan 29, 2025
@andy-goryachev-oracle
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 29, 2025

Going to push as commit 2b5b113.
Since your change was applied there has been 1 commit pushed to the master branch:

  • f55f5c6: 8348744: Application window not always activated on macOS 15

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jan 29, 2025
@openjdk openjdk bot closed this Jan 29, 2025
@openjdk openjdk bot removed ready Ready to be integrated rfr Ready for review labels Jan 29, 2025
@openjdk
Copy link

openjdk bot commented Jan 29, 2025

@andy-goryachev-oracle Pushed as commit 2b5b113.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@andy-goryachev-oracle andy-goryachev-oracle deleted the 8348736.rta.followup.2 branch January 29, 2025 15:29
@andy-goryachev-oracle
Copy link
Contributor Author

/backport :jfx24

@openjdk
Copy link

openjdk bot commented Jan 29, 2025

@andy-goryachev-oracle the backport was successfully created on the branch backport-andy-goryachev-oracle-2b5b1132-jfx24 in my personal fork of openjdk/jfx. To create a pull request with this backport targeting openjdk/jfx:jfx24, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 2b5b1132 from the openjdk/jfx repository.

The commit being backported was authored by Andy Goryachev on 29 Jan 2025 and was reviewed by Kevin Rushforth and Ambarish Rapte.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jfx:

$ git fetch https://github.com/openjdk-bots/jfx.git backport-andy-goryachev-oracle-2b5b1132-jfx24:backport-andy-goryachev-oracle-2b5b1132-jfx24
$ git checkout backport-andy-goryachev-oracle-2b5b1132-jfx24
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jfx.git backport-andy-goryachev-oracle-2b5b1132-jfx24

⚠️ @andy-goryachev-oracle You are not yet a collaborator in my fork openjdk-bots/jfx. An invite will be sent out and you need to accept it before you can proceed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants