Skip to content

JIRA-70: The Jira macro inserts a paragraph when used in inline mode #51

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

JIRA-70: The Jira macro inserts a paragraph when used in inline mode #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...platform/src/main/java/org/xwiki/contrib/jira/config/internal/JIRABlockAsyncRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ protected Block execute(boolean async, boolean cached)
this.asyncContext.useEntity(this.sourceReference);
}
try {
this.context.setInline(this.inline);
Copy link
Member

Choose a reason for hiding this comment

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

I feel this would need some explanation as I'm not sure I understand the need for this line since at

jira/jira-macro/jira-macro-platform/src/main/java/org/xwiki/contrib/jira/config/internal/JIRABlockAsyncRenderer.java

Line 95 in be19585

this.inline = context.isInline();
it's already set.

It feels more like the context is modified somehow somewhere and maybe might need some cloning, but idk, I haven't analysed the problem.

Copy link
Member

Choose a reason for hiding this comment

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

See also https://jira.xwiki.org/browse/JIRA-70?focusedId=119331&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-119331

Copy link

Choose a reason for hiding this comment

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

This seems wrong to me. This is updating the context that is shared with other macros that are currently executed in the main thread and would thus influence the inline state of other currently executed macros.

resultBlocks = this.macro.executeCodeMacro(this.parameters, this.content, this.context);
} catch (MacroExecutionException e) {
// Display the error in the result
Expand Down