From ac9fd51f8473a391dadc3f9fd0987d73755d79bb Mon Sep 17 00:00:00 2001
From: Andreas Dangel <adangel@users.sourceforge.net>
Date: Fri, 11 Sep 2015 12:22:49 +0200
Subject: [PATCH] #1392 SimplifyStartsWith false-negative

---
 .../resources/rulesets/java/optimizations.xml    |  2 +-
 .../optimizations/xml/SimplifyStartsWith.xml     | 16 ++++++++++++++++
 src/site/markdown/overview/changelog.md          |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/pmd-java/src/main/resources/rulesets/java/optimizations.xml b/pmd-java/src/main/resources/rulesets/java/optimizations.xml
index f8d52a746d..890ccd6e92 100644
--- a/pmd-java/src/main/resources/rulesets/java/optimizations.xml
+++ b/pmd-java/src/main/resources/rulesets/java/optimizations.xml
@@ -123,7 +123,7 @@ at the expense of some readability.
 <![CDATA[
 //PrimaryExpression
  [PrimaryPrefix/Name
-  [ends-with(@Image, '.startsWith')]]
+  [ends-with(@Image, '.startsWith')] or PrimarySuffix[@Image='startsWith']]
  [PrimarySuffix/Arguments/ArgumentList
   /Expression/PrimaryExpression/PrimaryPrefix
   /Literal
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/SimplifyStartsWith.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/SimplifyStartsWith.xml
index 7b29037377..db5ef6ec87 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/SimplifyStartsWith.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/SimplifyStartsWith.xml
@@ -54,4 +54,20 @@ public class Foo {
      ]]></code>
     </test-code>
 -->
+
+    <test-code>
+        <description>#1392 SimplifyStartsWith false-negative</description>
+        <expected-problems>1</expected-problems>
+        <expected-linenumbers>6</expected-linenumbers>
+        <code><![CDATA[
+public class SimplifyStartsWith {
+    private static boolean isImmediatelyFollowedByText(DetailNode tag) {
+        final DetailNode nextSibling = JavadocUtils.getNextSibling(tag);
+        return nextSibling.getType() == JavadocTokenTypes.NEWLINE
+                || nextSibling.getType() == JavadocTokenTypes.EOF
+                || nextSibling.getText().startsWith(" ");
+    }
+}
+        ]]></code>
+    </test-code>
 </test-data>
diff --git a/src/site/markdown/overview/changelog.md b/src/site/markdown/overview/changelog.md
index 9230a56ce5..6666996e29 100644
--- a/src/site/markdown/overview/changelog.md
+++ b/src/site/markdown/overview/changelog.md
@@ -15,6 +15,7 @@
 *   [#1370](https://sourceforge.net/p/pmd/bugs/1370/): ConsecutiveAppendsShouldReuse not detected properly on StringBuffer
 *   [#1371](https://sourceforge.net/p/pmd/bugs/1371/): InsufficientStringBufferDeclaration not detected properly on StringBuffer
 *   [#1384](https://sourceforge.net/p/pmd/bugs/1384/): NullPointerException in ConsecutiveLiteralAppendsRule
+*   [#1392](https://sourceforge.net/p/pmd/bugs/1392/): SimplifyStartsWith false-negative
 *   [#1394](https://sourceforge.net/p/pmd/bugs/1394/): dogfood.xml - Unable to exclude rules [UncommentedEmptyMethod]
 *   [#1395](https://sourceforge.net/p/pmd/bugs/1395/): UnusedPrivateMethod false positive for array element method call
 *   [#1396](https://sourceforge.net/p/pmd/bugs/1396/): PrematureDeclaration lambda false positive