🚀

Author: codingyu

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.2.5
+- Optimize regular expressions
+
+## 1.2.3
+- Fixed bug
+
 ## 1.2.2
 - Added support for [nwidart/laravel-modules](https://packagist.org/packages/nwidart/laravel-modules)
 

laravel-goto-view-1.2.5.vsix

@@ -2,7 +2,7 @@
     "name": "laravel-goto-view",
     "displayName": "Laravel goto view",
     "description": "Quick jump to view",
-    "version": "1.2.3",
+    "version": "1.2.5",
     "publisher": "codingyu",
     "engines": {
         "vscode": "^1.19.0"
@@ -82,4 +82,4 @@
         "@types/node": "^6.0.40",
         "@types/mocha": "^2.2.32"
     }
-}
+}

package-lock.json

@@ -1,6 +1,6 @@
 'use strict';
 
-import { workspace, languages, ExtensionContext} from 'vscode';
+import { workspace, languages, ExtensionContext } from 'vscode';
 import { LinkProvider } from './providers/linkProvider';
 import { HoverProvider } from './providers/hoverProvider';
 

package.json

@@ -5,14 +5,14 @@ import * as util from '../util';
 
 export class HoverProvider implements vscode.HoverProvider {
     provideHover(doc: vscode.TextDocument, pos: vscode.Position, token: vscode.CancellationToken): vscode.ProviderResult<vscode.Hover> {
-        let reg = /(?<=view\(["']|@include\(["']).*(?=["'])/;
+        let reg = /(?<=view\(|@include\(|@extends\(|@component\()(['"])[^'"]*\1/;
         let config = vscode.workspace.getConfiguration('laravel_goto_view');
-		let linkRange = doc.getWordRangeAtPosition(pos, reg);
-        if(linkRange){
+        let linkRange = doc.getWordRangeAtPosition(pos, reg);
+        if (linkRange) {
             let filePaths = util.getFilePaths(doc.getText(linkRange), doc);
             let workspaceFolder = vscode.workspace.getWorkspaceFolder(doc.uri);
-            if(filePaths.length > 0){
-                let text:string = "";
+            if (filePaths.length > 0) {
+                let text: string = "";
                 for (let i in filePaths) {
                     text += config.folderTip ? `\`${filePaths[i].name}\`` : '';
                     text += ` [${workspaceFolder.name + filePaths[i].showPath}](${filePaths[i].fileUri})  \r`;
@@ -21,5 +21,5 @@ export class HoverProvider implements vscode.HoverProvider {
             }
         }
         return;
-	}
+    }
 }

src/extension.ts

@@ -8,15 +8,15 @@ export class LinkProvider implements vscode.DocumentLinkProvider {
         let documentLinks = [];
         let config = vscode.workspace.getConfiguration('laravel_goto_view');
         let index = 0;
-        let reg = /(?<=view\(["']|@include\(["']).*(?=["'])/g;
+        let reg = /(?<=view\(|@include\(|@extends\(|@component\()(['"])[^'"]*\1/g;
         if (config.quickJump) {
             while (index < doc.lineCount) {
                 let line = doc.lineAt(index);
                 let result = line.text.match(reg);
                 if (result != null) {
                     for (let item of result) {
                         let file = util.getFilePath(item, doc);
-                        if(file != null){
+                        if (file != null) {
                             let start = new vscode.Position(line.lineNumber, line.text.indexOf(item));
                             let end = start.translate(0, item.length);
                             let documentlink = new vscode.DocumentLink(new vscode.Range(start, end), file.fileUri);

src/providers/hoverProvider.ts

@@ -13,6 +13,7 @@ export function getFilePaths(text: string, document: TextDocument) {
     let paths = scanViewPaths(document);
     let config = workspace.getConfiguration('laravel_goto_view');
     let workspaceFolder = workspace.getWorkspaceFolder(document.uri).uri.fsPath;
+    text = text.replace(/\"|\'/g, '');
     let result = [];
     if (text.indexOf("::") != -1) {
         let info = text.split('::');
@@ -52,7 +53,7 @@ export function scanViewPaths(document: TextDocument) {
     Object.assign(folders, configFolders);
     let workspaceFolder = workspace.getWorkspaceFolder(document.uri).uri.fsPath;
     let modulePath = path.join(workspaceFolder, 'Modules');
-    if (fs.existsSync(modulePath)){
+    if (fs.existsSync(modulePath)) {
         fs.readdirSync(modulePath).forEach(element => {
             let file = path.join(modulePath, element);
             if (fs.statSync(file).isDirectory()) {