Merge branch '__rultor'

yegor256 · Jan 30, 2019 · 7dc06ee · 7dc06ee · 0pdd · Jan 30, 2019
2 parents 1a29ccd + aae514e
commit 7dc06ee
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/qulice-checkstyle/src/main/resources/com/qulice/checkstyle/checks.xml b/qulice-checkstyle/src/main/resources/com/qulice/checkstyle/checks.xml
@@ -171,7 +171,7 @@
         <property name="message" value="Use 'java.nio.charset.StandardCharsets' instead"/>
     </module>
     <module name="RegexpSingleline">
-        <property name="format" value="^(?! *(/\*\*|\*|/\*|//)).*[\.\-\+%/\*&lt;&gt;] *$"/>
+        <property name="format" value="^(?! *(/\*\*|\*|/\*|//)).*[\.\-\+%/\*&lt;&gt;](?&lt;!(-&gt;)|&lt;*[A-Za-z]&gt;) *$"/>
         <property name="fileExtensions" value="java"/>
         <property name="message" value="Line cannot end with this symbol, move it to the next line"/>
     </module>

diff --git a/qulice-checkstyle/src/test/java/com/qulice/checkstyle/CheckstyleValidatorTest.java b/qulice-checkstyle/src/test/java/com/qulice/checkstyle/CheckstyleValidatorTest.java
@@ -684,10 +684,6 @@ public void allowsUppercaseAbbreviationExceptions() throws Exception {
      * to have uppercase abbreviations.
      *
      * @throws Exception In case of error
-     * @todo #897:30min Allow lambdas and generics to be places at end of line.
-     *  RegexpSingleline is too strict and not allow generics and lambdas
-     *  being placed at end of lines. Correct this behavior and uncomment test
-     *  below.
      */
     @Disabled
     @Test

diff --git a/...heckstyle/src/test/resources/com/qulice/checkstyle/ValidLambdaAndGenericsAtEndOfLine.java b/...heckstyle/src/test/resources/com/qulice/checkstyle/ValidLambdaAndGenericsAtEndOfLine.java
@@ -7,7 +7,7 @@
  * Simple.
  * @since 1.0
  */
-public final class ValidLambda {
+public final class ValidLambdaAndGenericsAtEndOfLine {
 
     /**
      * Final.