Add support for matrix blocks #19
Open
Conversation
This file contains 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
mplough
commented
Jan 30, 2021
| syn keyword jenkinsfileCoreStep scm | ||
| syn keyword jenkinsfileCoreStep sh |
There was a problem hiding this comment.
The sh step is already a jenkinsfilePipelineStep below. It's better suited there so this conflicting definition is removed.
Comment on lines
-15
to
+16
| syn keyword jenkinsfileCoreStep docker dockerfile skipwhite nextgroup=jenkinsFileDockerConfigBlock | ||
| syn keyword jenkinsfileCoreStep docker dockerfile skipwhite nextgroup=jenkinsfileDockerConfigBlock |
There was a problem hiding this comment.
In several places I've made the case consistent, changing jenkinsFile to jenkinsfile.
Comment on lines
-28
to
+36
| syn region jenkinsFileDockerConfigBlock contained start='{' end='}' contains=groovyString,jenkinsfileDockerKeyword transparent | ||
| syn keyword jenkinsFileDockerKeyword contained image args additionalBuildArgs label registryUrl registryCredentialsId alwaysPull filename dir | ||
| syn region jenkinsfileAxisConfigBlock contained start='{' end='}' contains=groovyString,groovyComment,groovyLineComment,jenkinsfileAxisKeyword transparent | ||
| syn keyword jenkinsfileAxisKeyword contained name notValues values | ||
|
|
||
| syn region jenkinsfileDockerConfigBlock contained start='{' end='}' contains=groovyString,groovyComment,groovyLineComment,jenkinsfileDockerKeyword transparent | ||
| syn keyword jenkinsfileDockerKeyword contained image args additionalBuildArgs label registryUrl registryCredentialsId reuseNode alwaysPull filename dir | ||
|
|
||
| syn region jenkinsfileParametersConfigBlock contained start='{' end='}' contains=groovyString,groovyComment,groovyLineComment,jenkinsfileParametersKeyword transparent | ||
| syn keyword jenkinsfileParametersKeyword contained string text booleanParam choice password |
There was a problem hiding this comment.
All of these config blocks can now contain both line and block comments.
Comment on lines
-79
to
+86
| syn keyword jenkinsfilePipelineStep nexusArtifactUploader nexusPolicyEvaluation nexusPublisher node nodejs nodesByLabel | ||
| syn keyword jenkinsfilePipelineStep nexusArtifactUploader nexusPolicyEvaluation nexusPublisher nodejs nodesByLabel |
There was a problem hiding this comment.
This is a judgment call. Jenkins pipeline documentation seems to give special treatment to the node step, so it stays a jenkinsfileCoreStep above.
Comment on lines
-101
to
+109
| syn keyword jenkinsfilePipelineStep splitTests springBoot sscm sseBuild sseBuildAndPublish sshPublisher sshagent stage | ||
| syn keyword jenkinsfilePipelineStep startET startSandbox startSession startTS stash step stepcounter stopET stopSandbox | ||
| syn keyword jenkinsfilePipelineStep splitTests springBoot sscm sseBuild sseBuildAndPublish sshPublisher sshagent | ||
| syn keyword jenkinsfilePipelineStep startET startSandbox startSession startTS stash stepcounter stopET stopSandbox |
There was a problem hiding this comment.
Similar to node, stage and step also stay only as jenkinsfileCoreSteps, above.
Comment on lines
-106
to
+113
| syn keyword jenkinsfilePipelineStep timeout timestamps tm tool touch triggerInputStep triggerJob typetalkSend uftScenarioLoad | ||
| syn keyword jenkinsfilePipelineStep timeout timestamps tm touch triggerInputStep triggerJob typetalkSend uftScenarioLoad |
There was a problem hiding this comment.
tool is also a jenkinsfileDirective. This conflicting definition is removed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR adds support for
matrixblocks, including the optionalexcludessection. It also adds highlighting for built-in parameter types and makes several tweaks, as explained in inline PR comments.