Merge pull request #45 from benholmen/bmh/add-blade-livewire-support

Add support for Blade and Livewire components
bowphp · Dec 8, 2021 · afeb78e · afeb78e
2 parents ba89988 + 45d098c
commit afeb78e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
                 },
                 "laravel_goto_view.regex": {
                     "type": "string",
-                    "default": "(?<=view\\(|@include\\(|@extends\\(|@component\\(|Inertia::render\\()(['\"])[^'\"]*\\1",
+                    "default": "(?<=view\\(['\"]|@include\\(['\"]|@extends\\(['\"]|@component\\(['\"]|Inertia::render\\(['\"]|\\<)(\\<x-|\\<livewire:|[^'\" \\/>]+)",
                     "description": "Custom regex for matching strings"
                 },
                 "laravel_goto_view.folders": {

diff --git a/src/util.ts b/src/util.ts
@@ -13,7 +13,7 @@ export function getFilePaths(text: string, document: TextDocument) {
     let workspaceFolder = workspace.getWorkspaceFolder(document.uri).uri.fsPath;
     let config = workspace.getConfiguration('laravel_goto_view');
     let paths = scanViewPaths(workspaceFolder, config);
-    let file = text.replace(/\"|\'/g, '').replace(/\./g, '/').split('::');
+    let file = text.replace(/\"|\'/g, '').replace('x-', 'components.').replace('livewire:', 'livewire.').replace(/\./g, '/').split('::');
     let result = [];
 
     for (let item in paths) {