464: fixed reference navigation for classes under directories with underscores

Author: Vitaliy Boyko

src/com/magento/idea/magento2plugin/util/RegExUtil.java

@@ -75,8 +75,11 @@ public class PhpRegex {
         public static final String CLASS_NAME
                 = "[A-Z][a-zA-Z0-9_\\x7f-\\xff]*";
 
+        public static final String DIR_NAME
+                = "[a-zA-Z0-9_\\x7f-\\xff]*";
+
         public static final String FQN
-                = CLASS_NAME + "(\\\\" + CLASS_NAME + ")*";
+                = CLASS_NAME + "(\\\\" + DIR_NAME + ")*" + CLASS_NAME;
     }
 
     public static class XmlRegex {

testData/project/magento2/vendor/magento/module-catalog/test_event/TestObserver.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\test_event;
+
+use Magento\Framework\Event\ObserverInterface;
+
+class TestObserver implements ObserverInterface
+{
+    public function execute()
+    {
+    }
+}

testData/reference/xml/ObserverReferenceRegistrar/observerInstanceDirectorySnakeCaseMustHaveReference/events.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="test_event">
+        <observer name="test_observer" instance="Magento\Catalog\test_event\TestObserver<caret>" />
+    </event>
+</config>

tests/com/magento/idea/magento2plugin/reference/xml/ObserverReferenceRegistrarTest.java

@@ -18,6 +18,15 @@ public void testObserverInstanceMustHaveReference() {
         assertHasReferencePhpClass("Magento\\Catalog\\Observer\\TestObserver");
     }
 
+    /**
+     * Tests for observer instance with snake case reference in events.xml.
+     */
+    public void testObserverInstanceDirectorySnakeCaseMustHaveReference() {
+        myFixture.configureByFile(this.getFixturePath(ModuleEventsXml.FILE_NAME));
+
+        assertHasReferencePhpClass("Magento\\Catalog\\test_event\\TestObserver");
+    }
+
     /**
      * Tests for event name reference in events.xml.
      */