Update sorting out of starlark flags to also identify external repo starlark flags #11510
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
juliexxia
changed the title
jin
reviewed
May 28, 2020
| @@ -314,4 +319,16 @@ public void testOptionsAreParsedWithBuildTestsOnly() throws Exception { | |||
|
|
|||
| assertThat(result.getStarlarkOptions().get("//test:my_int_setting")).isEqualTo(15); | |||
| } | |||
|
|
|||
| @Test | |||
| public void testRemoveStarlarkOptionsWorks() throws Exception { | |||
There was a problem hiding this comment.
Could you also add a test for the --@//external/starlark/option main repo case please?
katre
reviewed
May 28, 2020
| @@ -228,7 +228,7 @@ private Target loadBuildSetting( | |||
| ImmutableList.Builder<String> keep = ImmutableList.builder(); | |||
| ImmutableList.Builder<String> remove = ImmutableList.builder(); | |||
| for (String name : list) { | |||
| ((name.startsWith("--//") || name.startsWith("--no//")) ? remove : keep).add(name); | |||
| (name.matches("--(no)?(@.*)?//.*") ? remove : keep).add(name); | |||
There was a problem hiding this comment.
Regex-based parsing is going to fall into difficulties. Can this just strip off the -- and the no (if present), and call LabelValidator.validateAbsoluteLabel, and check for exceptions being thrown?
There was a problem hiding this comment.
So much better. Done.
katre
requested changes
May 28, 2020
| @@ -228,7 +230,21 @@ private Target loadBuildSetting( | |||
| ImmutableList.Builder<String> keep = ImmutableList.builder(); | |||
| ImmutableList.Builder<String> remove = ImmutableList.builder(); | |||
| for (String name : list) { | |||
| ((name.startsWith("--//") || name.startsWith("--no//")) ? remove : keep).add(name); | |||
| if (!name.startsWith("--")) { | |||
There was a problem hiding this comment.
This logic is great, but needs comments. More comments.
There was a problem hiding this comment.
Done! added a description to the javadoc as well
katre
approved these changes
May 28, 2020
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.
Fixes #11506