fix php variable on string

lib/config.py

@@ -0,0 +1,27 @@
+from re import compile
+from .place import Place
+
+
+class Config:
+    config_patterns = [
+        compile(r"""Config::[^'"]*(['"])([^'"]*)\1"""),
+        compile(r"""config\([^'"]*(['"])([^'"]*)\1"""),
+    ]
+
+    find_pattern = """(['"]{1})%s\\1\\s*=>"""
+
+    def get_place(self, path, line, lines=''):
+
+        for pattern in self.config_patterns:
+            matched = pattern.search(line) or pattern.search(lines)
+            if matched is None:
+                continue
+
+            split = path.split('.')
+            path = 'config/' + split[0] + '.php'
+            location = None
+            if (2 <= len(split)):
+                location = self.find_pattern % (split[1])
+            return Place(path, location)
+
+        return False

lib/finder.py

@@ -6,12 +6,10 @@
 from .router import Router
 from .language import Language
 from .blade import Blade
+from .config import Config
 from .setting import Setting
 
 
-find_pattern = """(['"]{1})%s\\1\\s*=>"""
-
-
 def get_place(selection):
     line = selection.get_line()
     lines = selection.get_lines_after_delimiter()
@@ -93,21 +91,9 @@ def controller_place(path, line, lines, selected):
 
 
 def config_place(path, line, lines, selected):
-    config_patterns = [
-        compile(r"""Config::[^'"]*(['"])([^'"]*)\1"""),
-        compile(r"""config\([^'"]*(['"])([^'"]*)\1"""),
-    ]
-    for pattern in config_patterns:
-        matched = pattern.search(line) or pattern.search(lines)
-        if (matched and path == matched.group(2)):
-            split = path.split('.')
-            path = 'config/' + split[0] + '.php'
-            location = None
-            if (2 <= len(split)):
-                location = find_pattern % (split[1])
-            return Place(path, location)
-
-    return False
+    config = Config()
+    place = config.get_place(path, line, lines)
+    return place
 
 
 def filesystem_place(path, line, lines, selected):

lib/selection.py

@@ -1,4 +1,5 @@
 import sublime
+from re import sub
 
 
 class Selection(sublime.Region):
@@ -73,4 +74,12 @@ def get_lines_after_delimiter(self, delimiter='('):
         return ''
 
     def get_path(self):
-        return self.substr().strip(self.delimiters + ' ')
+        path = self.substr().strip(self.delimiters + ' ')
+        # remove the rest of string after {
+        path = sub('{.*', '', path)
+        # remove the rest of string after $
+        path = sub('\\$.*', '', path)
+        # remove dot at the end
+        path = path.rstrip('.')
+
+        return path

tests/fixtures/sample.php

@@ -37,6 +37,10 @@
 
 config('app.timezone');
 
+config("app.{$var}.timezone");
+
+config("app.$var.timezone");
+
 config(     ['app.timezone' => 'UTC']);
 
 env(   'APP_DEBUG', false);

tests/test_config.py

@@ -0,0 +1,60 @@
+from . import unittest
+from LaravelGoto.lib.config import Config
+
+
+class TestConfig(unittest.ViewTestCase):
+    config = Config()
+
+    def test_php_var(self):
+        place = self.config.get_place(
+            'app',
+            """Config::get('app.{$var}');"""
+            )
+        self.assertEqual('config/app.php', place.path)
+
+    def test_facade_config_get(self):
+        place = self.config.get_place(
+            'app.timezone',
+            """Config::get('app.timezone');"""
+            )
+        self.assertEqual('config/app.php', place.path)
+        self.assertEqual('([\'"]{1})timezone\\1\\s*=>', place.location)
+
+    def test_facade_config_set(self):
+        place = self.config.get_place(
+            'app',
+            """Config::set(   'app', 'UTC');"""
+            )
+        self.assertEqual('config/app.php', place.path)
+
+    def test_config_get_only_file(self):
+        place = self.config.get_place(
+            'app',
+            """config('app');"""
+            )
+        self.assertEqual('config/app.php', place.path)
+
+    def test_config_get_helper(self):
+        place = self.config.get_place(
+            'app.timezone',
+            """config('app.timezone');"""
+            )
+        self.assertEqual('config/app.php', place.path)
+        self.assertEqual('([\'"]{1})timezone\\1\\s*=>', place.location)
+
+    def test_config_set_helper(self):
+        place = self.config.get_place(
+            'app',
+            """config(     ['app' => 'UTC']);"""
+            )
+        self.assertEqual('config/app.php', place.path)
+
+    def test_multiline(self):
+        place = self.config.get_place(
+            'app.timezone',
+            "'app.timezone' => 'UTC']",
+            """config(     [
+                'app.timezone' => 'UTC']
+            );"""
+        )
+        self.assertEqual('config/app.php', place.path)

tests/test_selection.py

@@ -3,6 +3,29 @@
 
 
 class TestSelection(unittest.ViewTestCase):
+    def test_var(self):
+        self.fixture("""
+            'ap|p.{$var}.timezone'
+            """)
+
+        selection = Selection(self.view)
+        self.assertEqual('app', selection.get_path())
+
+        self.fixture("""
+            "ap|p.$var.timezone"
+            """)
+
+        # cursor on a php $var
+        selection = Selection(self.view)
+        self.assertEqual('app', selection.get_path())
+
+        self.fixture("""
+            "app.$v|ar.timezone"
+            """)
+
+        selection = Selection(self.view)
+        self.assertEqual('', selection.get_path())
+
     def test_hello_world(self):
         self.fixture("""
             'hello_|world'