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

#640: fix xml merger if merge:id is omitted for repated element #643

Merged
merged 6 commits into from
Sep 23, 2024

Conversation

hohwille
Copy link
Member

fixes #640

@hohwille hohwille added configuration should be configurable or configuration change bugfix workspace labels Sep 20, 2024
@hohwille hohwille added this to the release:2024.09.002 milestone Sep 20, 2024
@coveralls
Copy link
Collaborator

coveralls commented Sep 20, 2024

Pull Request Test Coverage Report for Build 10964479083

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 41 unchanged lines in 6 files lost coverage.
  • Overall coverage decreased (-0.1%) to 65.767%

Files with Coverage Reduction New Missed Lines %
com/devonfw/tools/ide/merge/xmlmerger/model/MergeAttribute.java 1 62.5%
com/devonfw/tools/ide/merge/xmlmerger/matcher/ElementMatcher.java 2 80.95%
com/devonfw/tools/ide/merge/xmlmerger/MergeStrategy.java 3 80.47%
com/devonfw/tools/ide/merge/xmlmerger/matcher/IdComputer.java 6 75.36%
com/devonfw/tools/ide/merge/xmlmerger/model/MergeElement.java 13 68.42%
com/devonfw/tools/ide/merge/xmlmerger/XmlMerger.java 16 73.05%
Totals Coverage Status
Change from base Build 10963169378: -0.1%
Covered Lines: 6040
Relevant Lines: 8838

💛 - Coveralls

this is O(n^2) and also current code removes merge:* attributes in updateAndRemoveNsAttributes so the parent could be modified and merge:strategy been removed
@hohwille hohwille self-assigned this Sep 22, 2024
@hohwille hohwille merged commit a5d7bd3 into devonfw:main Sep 23, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix configuration should be configurable or configuration change workspace
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

ide-settings broken for IntelliJ or bug in XML merger
2 participants