Skip to content

Fixing yield handling in CasualDiff. - #8857

Merged
lahodaj merged 1 commit into
apache:masterfrom
lahodaj:diff-yield
Sep 23, 2025
Merged

lahodaj merged 1 commit into
apache:masterfrom
lahodaj:diff-yield

Conversation

@lahodaj

@lahodaj lahodaj commented Sep 23, 2025

Copy link
Copy Markdown
Contributor

Consider code like this:

public class X {
    private void tt() {
        int i = switch (0) {
            default:
                yield 0;
        };
    }
}

Select the 0 in yield 0;, and try to introduce variable for it. This will crash with:

SEVERE [org.openide.util.RequestProcessor]: Error in RequestProcessor org.netbeans.modules.editor.hints.HintsUI$1
java.lang.AssertionError: Diff not implemented: YIELD com.sun.tools.javac.tree.JCTree$JCYield
        at org.netbeans.modules.java.source.save.CasualDiff.diffTreeImpl0(CasualDiff.java:5898)
        at org.netbeans.modules.java.source.save.CasualDiff.diffTreeImpl(CasualDiff.java:5570)
...

I.e. the CasualDiff is not handling yield. This PR adds handling of yield based on return (except, unlike return, yield always has a value).


^Add meaningful description above

Click to collapse/expand PR instructions

By opening a pull request you confirm that, unless explicitly stated otherwise, the changes -

  • are all your own work, and you have the right to contribute them.
  • are contributed solely under the terms and conditions of the Apache License 2.0 (see section 5 of the license for more information).

Please make sure (eg. git log) that all commits have a valid name and email address for you in the Author field.

If you're a first time contributor, see the Contributing guidelines for more information.

If you're a committer, please label the PR before pressing "Create pull request" so that the right test jobs can run.

PR approval and merge checklist:

  1. Was this PR correctly labeled, did the right tests run? When did they run?
  2. Is this PR squashed?
  3. Are author name / email address correct? Are co-authors correctly listed? Do the commit messages need updates?
  4. Does the PR title and description still fit after the Nth iteration? Is the description sufficient to appear in the release notes?

If this PR targets the delivery branch: don't merge. (full wiki article)

@lahodaj lahodaj added this to the NB28 milestone Sep 23, 2025
@lahodaj lahodaj added the Java [ci] enable extra Java tests (java.completion, java.source.base, java.hints, refactoring.java, form) label Sep 23, 2025

@mbien mbien left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

looks good!

@lahodaj
lahodaj merged commit 7f7de7e into apache:master Sep 23, 2025
103 of 105 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Java [ci] enable extra Java tests (java.completion, java.source.base, java.hints, refactoring.java, form)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants