Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1247,10 +1247,10 @@ protected void visitLambdaExpression(LambdaExpressionTree node, boolean statemen
token(",");
builder.breakOp(" ");
}
visitVariables(
ImmutableList.of(parameter),
DeclarationKind.NONE,
inlineAnnotationDirection(parameter.getModifiers()));
// A lambda parameter is a parameter: its annotations stay on its line, as a method parameter's do. The
// vertical direction, a forced break after an annotation with arguments, is for local variable
// declarations.
visitVariables(ImmutableList.of(parameter), DeclarationKind.NONE, Direction.HORIZONTAL);
first = false;
}
if (parens) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Function;

class AnnotatedLambdaParameters {
BiFunction<Integer, Integer, Integer> withArgs =
(final var x,
@SuppressWarnings("unused")
var y) -> x + y;

Function<String, Integer> typed = ( @SuppressWarnings( "unused" ) String s )->s.length();

BiFunction<Integer, Integer, Integer> two = (@Deprecated @SuppressWarnings("unused")
var x, var y) -> x + y;

BiFunction<Integer, Integer, Integer> marker = (@Deprecated var x,
@Deprecated final var y) -> x + y;

Consumer<String> block = (@SuppressWarnings({"unused", "rawtypes"})
String s) -> { System.out.println(s); };

BiFunction<Integer, Integer, Integer> tooLongForOneLine = (@SuppressWarnings("unused") Integer first, @SuppressWarnings("unused") Integer second) -> first + second;

BiFunction<Integer, Integer, Integer> parametersDoNotFitOnOneLine = (@SuppressWarnings("unused") Integer firstParameterWithAVeryLongName, @SuppressWarnings("unused") Integer secondParameterWithAVeryLongName) -> firstParameterWithAVeryLongName + secondParameterWithAVeryLongName;

void method(@SuppressWarnings("unused") int y, @Deprecated int z) {
@SuppressWarnings("unchecked") Function<Object, String> local = o -> (String) o;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Function;

class AnnotatedLambdaParameters {
BiFunction<Integer, Integer, Integer> withArgs = (final var x, @SuppressWarnings("unused") var y) -> x + y;

Function<String, Integer> typed = (@SuppressWarnings("unused") String s) -> s.length();

BiFunction<Integer, Integer, Integer> two = (@Deprecated @SuppressWarnings("unused") var x, var y) -> x + y;

BiFunction<Integer, Integer, Integer> marker = (@Deprecated var x, @Deprecated final var y) -> x + y;

Consumer<String> block = (@SuppressWarnings({"unused", "rawtypes"}) String s) -> {
System.out.println(s);
};

BiFunction<Integer, Integer, Integer> tooLongForOneLine =
(@SuppressWarnings("unused") Integer first, @SuppressWarnings("unused") Integer second) -> first + second;

BiFunction<Integer, Integer, Integer> parametersDoNotFitOnOneLine =
(@SuppressWarnings("unused") Integer firstParameterWithAVeryLongName,
@SuppressWarnings("unused") Integer secondParameterWithAVeryLongName) ->
firstParameterWithAVeryLongName + secondParameterWithAVeryLongName;

void method(@SuppressWarnings("unused") int y, @Deprecated int z) {
@SuppressWarnings("unchecked")
Function<Object, String> local = o -> (String) o;
}
}
Loading