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

Feature/2523 keyscopes in flattened map not handled #3141

Conversation

Projects
2 participants
@simtind
Copy link
Contributor

commented Nov 5, 2018

Migrated to #3194 to allow commiters to modify code.

Fixes test cases reported in issue #2523.
Two issues were identified:

  1. When collecting resolve tasks in KeyRefModule.WalkMap, files referenced through mapref but flattened in map-ref stage are not picked up. They are instead added in collectProcessingTopics. This means they are parsed with root scope instead of their correct scope.
  2. When transforming a flattened map key using the KeyRefPaser module it's assumed that one file only has a single key scope. Scopes added outside topicrefs or maprefs are then ignored.

I refactored the elemName deque to keyRefElemNames to make the distinction between the two deques elemNames and keyRefElemNames more clear.

simtind added some commits Nov 5, 2018

Detect key scopes in keyreparser filter methods
Signed-off-by: Tinderholt, Simen <simtind@gmail.com>
Apply key scope settings to submap processing jobs
Signed-off-by: Tinderholt, Simen <simtind@gmail.com>
@jelovirt

This comment has been minimized.

Copy link
Member

commented Nov 5, 2018

@simtind, thank you for the pull request. Would you be able to add integration or unit tests for these modifications?

simtind added some commits Nov 6, 2018

Test that submaps are collected by walkmap() and assigned correct key…
… scope.

Signed-off-by: Tinderholt, Simen <simtind@gmail.com>
Test that keyrefs are resolved in their parent scope when ditamap con…
…tains key scopes.

Signed-off-by: Tinderholt, Simen <simtind@gmail.com>
@simtind

This comment has been minimized.

Copy link
Contributor Author

commented Nov 6, 2018

No problem, I think this should cover it?

simtind added some commits Nov 6, 2018

Use dita.dost.reader.KeyrefReader in readKeyMap to keep test key pars…
…ing in sync with application key parsing.

Signed-off-by: Tinderholt, Simen <simtind@gmail.com>
Fix error test reference file.
Signed-off-by: Tinderholt, Simen <simtind@gmail.com>

@jelovirt jelovirt added this to In progress in 3.3 via automation Dec 5, 2018

@jelovirt jelovirt moved this from In progress to Needs review in 3.3 Jan 5, 2019

@jelovirt

This comment has been minimized.

Copy link
Member

commented Jan 26, 2019

Migrated to #3194 to allow commiters to modify code. Closing this old PR.

@jelovirt jelovirt closed this Jan 26, 2019

3.3 automation moved this from Needs review to Done Jan 26, 2019

@jelovirt

This comment has been minimized.

Copy link
Member

commented Jan 26, 2019

@simtind This PR was merged in #3194 after some refactoring. Thank you very much for the contribution.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.