Merge pull request #25 from absszero/feature/backslash-class-name

support backslash class name

lib/classname.py

@@ -3,11 +3,15 @@
 
 
 class ClassName:
-    pattern = compile(r"""([A-Z][\w]+[\\])+[A-Z][\w]+""")
+    patterns = [
+        compile(r"""([A-Z][\w]+[/\\])+[A-Z][\w]+""")
+    ]
 
     def get_place(self, path, line, lines=''):
-        matched = self.pattern.search(line)
-        if not matched:
-            return False
+        for pattern in self.patterns:
 
-        return Place(path + '.php')
+            matched = pattern.search(line) or pattern.search(lines)
+            if matched:
+                return Place(path + '.php')
+
+        return False

lib/finder.py

@@ -9,6 +9,7 @@
 from .attribute import Attribute
 from .config import Config
 from .inertia import Inertia
+from .livewire import Livewire
 from .classname import ClassName
 from .setting import Setting
 
@@ -123,23 +124,9 @@ def inertia_place(path, line, lines, selected):
 
 
 def livewire_place(path, line, lines, selected):
-    livewire_patterns = [
-        compile(r"""livewire:([^\s"'>]+)"""),
-        compile(r"""@livewire\s*\(\s*['"]([^'"]+)"""),
-    ]
-    for pattern in livewire_patterns:
-        matched = pattern.search(line) or pattern.search(lines)
-        if matched:
-            path = camel_case(matched.group(1))
-            path = path.replace('.', '/') + '.php'
-            return Place(path)
-
-    return False
-
-
-def camel_case(snake_str):
-    components = snake_str.split('-')
-    return components[0].title() + ''.join(x.title() for x in components[1:])
+    livewire = Livewire()
+    place = livewire.get_place(path, line, lines)
+    return place
 
 
 def lang_place(path, line, lines, selected):
@@ -215,6 +202,11 @@ def component_place(path, line, lines, selected):
     return place
 
 
+def camel_case(snake_str):
+    components = snake_str.split('-')
+    return components[0].title() + ''.join(x.title() for x in components[1:])
+
+
 def attribute_place(path, line, lines, selected):
     attribute = Attribute()
     place = attribute.get_place(path, line, lines)

lib/livewire.py

@@ -0,0 +1,26 @@
+from re import compile
+from .place import Place
+
+
+class Livewire:
+
+    patterns = [
+        compile(r"""livewire:([^\s"'>]+)"""),
+        compile(r"""@livewire\s*\(\s*['"]([^'"]+)"""),
+
+    ]
+
+    def get_place(self, path, line, lines=''):
+
+        for pattern in self.patterns:
+            matched = pattern.search(line) or pattern.search(lines)
+            if matched:
+                path = self.camel_case(matched.group(1))
+                path = path.replace('.', '/') + '.php'
+                return Place(path)
+
+        return False
+
+    def camel_case(self, snake_str):
+        components = snake_str.split('-')
+        return components[0].title() + ''.join(x.title() for x in components[1:])

tests/fixtures/sample.php

@@ -125,7 +125,9 @@
 
 layout('layouts.app');
 
-'{{-- resources/views/components/layout --}}'
+'{{-- resources/views/components/layout --}}';
+
+'{{-- "Livewire/Admin/Elevator/Elevator" --}}';
 
 view: 'emails.test',
 

tests/test_classname.py

@@ -11,3 +11,10 @@ def test_php_var(self):
             """return $this->hasMany('App\\Mod|els\\Score');"""
             )
         self.assertEqual('App\\Models\\Score.php', place.path)
+
+    def test_backslash(self):
+        place = self.classname.get_place(
+            'Livewire/Admin/Elevator/Elevator',
+            """Livewire/Admin/Elevator/Elevator"""
+            )
+        self.assertEqual('Livewire/Admin/Elevator/Elevator.php', place.path)

tests/test_finder.py

@@ -220,10 +220,6 @@ def test_livewire_tag(self):
         self.fixture("""<livewire:nav.sho|w-post />""")
         self.assertPath("Nav/ShowPost.php")
 
-    def test_livewire_blade_directive(self):
-        self.fixture("""@livewire("nav.show|-post")""")
-        self.assertPath("Nav/ShowPost.php")
-
     def test_multiline(self):
         examples = {
             'layouts/app.blade.php':

tests/test_livewire.py

@@ -0,0 +1,18 @@
+from . import unittest
+from LaravelGoto.lib.livewire import Livewire
+
+
+class testLivewire(unittest.ViewTestCase):
+    livewire = Livewire()
+
+    def test_blade_tag(self):
+        place = self.livewire.get_place(
+            'nav.show-post',
+            """<livewire:nav.show-post>""")
+        self.assertEqual("Nav/ShowPost.php", place.path)
+
+    def test_directive(self):
+        place = self.livewire.get_place(
+            'nav.show-post',
+            """@livewire("nav.show-post")""")
+        self.assertEqual("Nav/ShowPost.php", place.path)