Skip to content

Conversation

NicolaIsotta
Copy link
Contributor

@NicolaIsotta NicolaIsotta commented Jun 18, 2025

Before:
image
After:
image

This also makes the "Open source in editor button" work and fixes the loading of bundle files from the default package / root folder.


^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)

@mbien mbien added Editor enterprise [ci] enable enterprise job ci:dev-build [ci] produce a dev-build zip artifact (7 days expiration, see link on workflow summary page) labels Jun 18, 2025
@mbien mbien added this to the NB27 milestone Jun 18, 2025
@NicolaIsotta NicolaIsotta marked this pull request as draft June 18, 2025 10:57
@NicolaIsotta NicolaIsotta marked this pull request as draft June 18, 2025 10:57
@NicolaIsotta
Copy link
Contributor Author

Marking this as draft as there's another fix I'd like to make about bundle resolution

@mbien
Copy link
Member

mbien commented Jun 19, 2025

nice! I like those quality of life improvements.

Fix "Open source in editor button"
Fix loading of bundle files from default package
@
@NicolaIsotta NicolaIsotta marked this pull request as ready for review June 19, 2025 12:54
Copy link
Member

@mbien mbien 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, thanks for the improvements!

I put NB27 milestone on it and will wait a bit in case other reviewers would like to take a look too. Dev builds for manual testing are available on the workflow runs, e.g last (scroll down for artifacts).

Copy link
Contributor

@matthiasblaesing matthiasblaesing left a comment

Choose a reason for hiding this comment

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

Looks sane to me. I thought, that the "Open source in editor" should jump to the right line. But that would require a parser for "text/x-properties" to be present, which is not the case. If that is added in the future, it should be possible to change the ElResourceBundleKeyCompletionItem constructor to take a org.netbeans.modules.web.el.ResourceBundles.Location instead of a FileObject and then use the offset coded in that location report that as "OffsetRange".

So at this point in time I think this is good to go and indeed a nice improvement.

@mbien do you want to merge?

@mbien
Copy link
Member

mbien commented Jun 22, 2025

lets merge, @NicolaIsotta thanks again!

@mbien mbien merged commit 2c07bda into apache:master Jun 22, 2025
31 checks passed
@NicolaIsotta NicolaIsotta deleted the el-bundle-preview branch June 22, 2025 16:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci:dev-build [ci] produce a dev-build zip artifact (7 days expiration, see link on workflow summary page) Editor enterprise [ci] enable enterprise job
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants