Uh oh!
There was an error while loading. Please reload this page.
refactor: Remove ixml refs in CommandCall - #103
Merged
Conversation
abmusse
commented
Feb 11, 2020
MemberAuthor
Test |
abmusse
marked this pull request as ready for review
February 11, 2020 21:36
kadler
requested changes
Feb 13, 2020
Uh oh!
There was an error while loading. Please reload this page.
Comment on lines
+54
to
+57
| if (this.type === 'cmd' && !this.options.exec) { // set default value | ||
| // eslint-disable-next-line no-unused-expressions | ||
| this.command.indexOf('?') > 0 ? this.xml += " exec='rexx'" : this.xml += " exec='cmd'"; | ||
| } | ||
| if (!this.options.error) { // set default value | ||
| this.xml += " error='fast'"; | ||
| } |
Member
There was a problem hiding this comment.
Similar to the other review, I would like to see these a little more DRY.
kadler
requested changes
Feb 19, 2020
| if (this.type === 'cl') { | ||
| const defaultExec = (this.command.indexOf('?') > 0) ? 'rexx' : 'cmd'; | ||
| this.type = 'cmd'; | ||
| this.xml = `<${this.type} exec='${this.options.exec || defaultExec}'`; |
Member
There was a problem hiding this comment.
Suggested change
| this.xml=`<${this.type} exec='${this.options.exec||defaultExec}'`; | |
| this.xml=`<cmd exec='${this.options.exec||defaultExec}'`; |
No reason to change this.type. That would actually cause problems if they re-use it, since it will go through the else code path and not check for rexx execution.
MemberAuthor
There was a problem hiding this comment.
abmusse
commented
Feb 19, 2020
| if (this.options.before) this.xml += ` before='${this.options.before}'`; | ||
| if (this.options.after) this.xml += ` after='${this.options.after}'`; | ||
| this.xml += ` error='${this.options.error || 'fast'}'>${this.command}</${this.type}>`; |
MemberAuthor
There was a problem hiding this comment.
We would also need to up this.type here as well
kadler
reviewed
Feb 20, 2020
| if (this.options.before) this.xml += ` before='${this.options.before}'`; | ||
| if (this.options.after) this.xml += ` after='${this.options.after}'`; | ||
| const type = this.type === 'cl' ? 'cmd' : this.type; |
Member
There was a problem hiding this comment.
Oh, right. I forgot we needed the type for the closing tag. I would suggest setting the local variable above then:
consttype=this.type==='cl' ? 'cmd' : this.type;if(type=='cmd'){
...
}else{
...
}Member
There was a problem hiding this comment.
Could even do:
consttype=this.type==='cl' ? 'cmd' : this.type;this.xml=`<${this.type}`;if(type=='cmd'){constdefaultExec=(this.command.indexOf('?')>0) ? 'rexx' : 'cmd';this.xml+=` exec='${this.options.exec||defaultExec}'`;}markirish
approved these changes
Feb 21, 2020
markirish
left a comment
Contributor
There was a problem hiding this comment.
LGTM
This looks so, so, so much cleaner and better. Especially love the availableCommands.join
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of #96