From f72be8efae211bfeccb796f97f7e277c6f1caf1d Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Fri, 7 Jul 2017 16:44:22 +0200
Subject: [PATCH] IDEA-175486 (AssertionError in
 PackageNamingConventionInspection)

---
 .../ig/naming/PackageNamingConventionInspection.java     | 9 +++------
 .../ig/naming/PackageNamingConventionInspectionTest.java | 5 +++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/PackageNamingConventionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/PackageNamingConventionInspection.java
index 7bad29330828..ce8e67f88f4f 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/PackageNamingConventionInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/PackageNamingConventionInspection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ import com.intellij.codeInspection.ui.ConventionOptionsPanel;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.psi.PsiJavaCodeReferenceElement;
 import com.intellij.psi.PsiPackageStatement;
-import com.siyeh.HardcodedMethodConstants;
 import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseGlobalInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
@@ -120,13 +119,11 @@ public class PackageNamingConventionInspection extends BaseGlobalInspection {
     if (m_maxLength > 0 && length > m_maxLength) {
       return false;
     }
-    if (HardcodedMethodConstants.SERIAL_VERSION_UID.equals(name)) {
-      return true;
-    }
     final Matcher matcher = m_regexPattern.matcher(name);
     return matcher.matches();
   }
 
+  @Override
   @Nullable
   public LocalInspectionTool getSharedLocalInspectionTool() {
     return new LocalPackageNamingConventionInspection(this);
@@ -176,7 +173,7 @@ public class PackageNamingConventionInspection extends BaseGlobalInspection {
             index = text.indexOf('.', start);
           }
           final String lastName = text.substring(start);
-          if (!mySettingsDelegate.isValid(lastName)) {
+          if (!lastName.isEmpty() && !mySettingsDelegate.isValid(lastName)) {
             registerErrorAtOffset(reference, start, lastName.length(), lastName);
           }
         }
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/naming/PackageNamingConventionInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/naming/PackageNamingConventionInspectionTest.java
index 266d5f9dd116..b5d2848d707c 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/naming/PackageNamingConventionInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/naming/PackageNamingConventionInspectionTest.java
@@ -28,6 +28,11 @@ public class PackageNamingConventionInspectionTest extends LightInspectionTestCa
            "class X {}");
   }
 
+  public void testNoAssertion() {
+    doTest("package /*Package name 'a' is too short*/a/**/./*!Identifier expected*/;/*!*/" +
+           "class X {}");
+  }
+
   @Override
   protected InspectionProfileEntry getInspection() {
     return new PackageNamingConventionInspection();