Skip to content

Commit 786df17

Browse files
committed
Revert "insert space" setting for type parameters
Change `insert_space_after_closing_angle_bracket_in_type_parameters` back to `insert` to ensure generics are always formatted correctly. This commit reverts commit b11499d as which we no longer need thanks to eclipse-jdt/eclipse.jdt.core#443 Fixes gh-363
1 parent 8e9ac6e commit 786df17

File tree

4 files changed

+17
-5
lines changed

4 files changed

+17
-5
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package simple;
2+
3+
/**
4+
* gh-363.
5+
*/
6+
public class UnresolvedGenericProperties<B extends Number, C> extends AbstractGenericProperties<String, B, C> {
7+
8+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package simple;
2+
3+
/**
4+
* gh-363.
5+
*/
6+
public class UnresolvedGenericProperties<B extends Number, C> extends AbstractGenericProperties<String, B, C> {
7+
8+
}

spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/eclipse/Options.java

-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.Properties;
2525

2626
import io.spring.javaformat.config.IndentationStyle;
27-
import io.spring.javaformat.config.JavaBaseline;
2827
import io.spring.javaformat.config.JavaFormatConfig;
2928

3029
/**
@@ -68,9 +67,6 @@ private void applyConfig(Map<String, String> properties, JavaFormatConfig javaFo
6867
if (javaFormatConfig.getIndentationStyle() == IndentationStyle.SPACES) {
6968
properties.put(coreFormatter + "tabulation.char", "space");
7069
}
71-
if (javaFormatConfig.getJavaBaseline() == JavaBaseline.V8) {
72-
properties.put(coreFormatter + "insert_space_after_closing_angle_bracket_in_type_parameters", "insert");
73-
}
7470
}
7571

7672
}

spring-javaformat/spring-javaformat-formatter/src/main/resources/io/spring/javaformat/formatter/eclipse/formatter.prefs

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ core.formatter.insert_space_after_at_in_annotation_type_declaration=do not inser
134134
core.formatter.insert_space_after_binary_operator=insert
135135
core.formatter.insert_space_after_bitwise_operator=insert
136136
core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert
137-
core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=do not insert
137+
core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
138138
core.formatter.insert_space_after_closing_brace_in_block=insert
139139
core.formatter.insert_space_after_closing_paren_in_cast=insert
140140
core.formatter.insert_space_after_colon_in_assert=insert

0 commit comments

Comments
 (0)