wip

Author: joetannenbaum

src/completion/Validation.ts

@@ -136,7 +136,7 @@ export default class Validation implements CompletionProvider {
         token: vscode.CancellationToken,
         context: vscode.CompletionContext,
     ): vscode.CompletionItem[] {
-        if (result.isFuncs(["validate", "make"])) {
+        if (result.isFunc(["validate", "make"])) {
             return this.handleValidateMethod(document, position, result);
         }
 
@@ -174,9 +174,10 @@ export default class Validation implements CompletionProvider {
         position: vscode.Position,
         result: AutocompleteResult,
     ): vscode.CompletionItem[] | undefined {
-        if (result.isFacade("Validator") || result.isContracts([
-            "Validation\\Factory", "Validation\\Validator"
-        ])) {
+        if (
+            result.isFacade("Validator") ||
+            result.isContract(["Validation\\Factory", "Validation\\Validator"])
+        ) {
             return this.getRules(document, position);
         }
     }

src/features/config.ts

@@ -4,7 +4,7 @@ import { getConfigs } from "@src/repositories/configs";
 import { config } from "@src/support/config";
 import { findHoverMatchesInDoc } from "@src/support/doc";
 import { detectedRange, detectInDoc } from "@src/support/parser";
-import { controllerActionRegex, wordMatchRegex } from "@src/support/patterns";
+import { wordMatchRegex } from "@src/support/patterns";
 import { projectPath } from "@src/support/project";
 import { contract, facade } from "@src/support/util";
 import { AutocompleteParsingResult } from "@src/types";

src/features/route.ts

@@ -14,19 +14,19 @@ import { FeatureTag, HoverProvider, LinkProvider } from "..";
 
 const toFind: FeatureTag = [
     { method: ["route", "signedRoute", "to_route"] },
+    {
+        class: [...facade("Redirect"), ...facade("URL"), "redirect", "url"],
+        method: ["route", "signedRoute", "temporarySignedRoute"],
+    },
     {
         class: [contract("Routing\\UrlGenerator")],
         method: ["route", "signedRoute", "temporarySignedRoute"],
         argumentIndex: 0,
     },
     {
-        class: [contract("Routing\\ResponseFactory")],
+        class: [contract("Routing\\ResponseFactory"), ...facade("Response")],
         method: "redirectToRoute",
-        argumentIndex: 0,        
-    },
-    {
-        class: [...facade("Redirect"), ...facade("URL"), "redirect", "url"],
-        method: ["route", "signedRoute", "temporarySignedRoute"],
+        argumentIndex: 0,
     },
     {
         class: ["Livewire\\Volt\\Volt"],

src/parser/AutocompleteResult.ts

@@ -57,12 +57,12 @@ export default class AutocompleteResult {
         return this.isClass(facade(className));
     }
 
-    public isContracts(classNames: string[]) {
-        return classNames.some((className: string) => this.isContract(className));
-    }
+    public isContract(classNames: string | string[]) {
+        classNames = Array.isArray(classNames) ? classNames : [classNames];
 
-    public isContract(className: string) {
-        return this.isClass(contract(className));
+        return classNames.some((className: string) =>
+            this.isClass(contract(className)),
+        );
     }
 
     public func() {
@@ -91,12 +91,10 @@ export default class AutocompleteResult {
         }
     }
 
-    public isFuncs(funcs: string[]) {
-        return funcs.some((func: string) => this.isFunc(func));
-    }
+    public isFunc(funcs: string | string[]) {
+        funcs = Array.isArray(funcs) ? funcs : [funcs];
 
-    public isFunc(func: string) {
-        return this.func() === func;
+        return funcs.some((func: string) => this.func() === func);
     }
 
     public param(index?: number) {