commit | 3a54b94ef59973d5db097916c638a41f9e51afd8 | [log] [tgz] |
---|---|---|
author | Louis Pullen-Freilich <lpf@google.com> | Thu May 07 13:23:03 2020 +0100 |
committer | Louis Pullen-Freilich <lpf@google.com> | Thu May 07 22:04:51 2020 +0100 |
tree | 9b222b3ec14e608041b43982817eca284d5abff2 | |
parent | bcdf68ae9d2338124075fea4691b9fb76b4cc7d2 [diff] |
Removes no longer needed parentheses in @Composable() annotations -Enables the NonParenthesizedAnnotationsOnFunctionalTypes flag to disable the IDE warning -Temporarily disables the 'paren-spacing' lint in ktlint, due to: https://github.com/pinterest/ktlint/issues/737 -Turns unnecessary parentheses into a 'warning', and stops ignoring this IDE inspection in the UI project Bug: b/155391691 Test: ./gradlew bOS, Studio Change-Id: Ib4af53591b82a0d56ae0733ff2561196c2d49635
diff --git a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/DraggableTest.kt b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/DraggableTest.kt index db92c21..e324658 100644 --- a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/DraggableTest.kt +++ b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/DraggableTest.kt
@@ -423,7 +423,7 @@ } } - private fun setDraggableContent(draggableFactory: @Composable() () -> Modifier) { + private fun setDraggableContent(draggableFactory: @Composable () -> Modifier) { composeTestRule.setContent { Stack { val draggable = draggableFactory()
diff --git a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/ScrollableTest.kt b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/ScrollableTest.kt index 91ef177..27dfc12 100644 --- a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/ScrollableTest.kt +++ b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/ScrollableTest.kt
@@ -572,7 +572,7 @@ } } - private fun setScrollableContent(scrollableModifierFactory: @Composable() () -> Modifier) { + private fun setScrollableContent(scrollableModifierFactory: @Composable () -> Modifier) { composeTestRule.setContent { Stack { val scrollable = scrollableModifierFactory()