Merge pull request #404 from laravel/improve-startup-time

Improve startup time

Author: joetannenbaum

src/completion/Blade.ts

@@ -5,7 +5,7 @@ import { getCustomBladeDirectives } from "../repositories/customBladeDirectives"
 import { wordMatchRegex } from "./../support/patterns";
 import { indent } from "./../support/util";
 
-export default class Blade implements vscode.CompletionItemProvider {
+export class Blade implements vscode.CompletionItemProvider {
     provideCompletionItems(
         document: vscode.TextDocument,
         position: vscode.Position,
@@ -130,7 +130,11 @@ export default class Blade implements vscode.CompletionItemProvider {
             "@stack(...)": "@stack(${1})",
             "@push(...)": ["@push(${1})", indent("${2}"), "@endpush"],
             "@pushIf(...)": ["@pushIf(${1})", indent("${2}"), "@endPushIf"],
-            "@pushOnce(...)": ["@pushOnce(${1})", indent("${2}"), "@endPushOnce"],
+            "@pushOnce(...)": [
+                "@pushOnce(${1})",
+                indent("${2}"),
+                "@endPushOnce",
+            ],
             "@prepend(...)": ["@prepend(${1})", indent("${2}"), "@endprepend"],
             "@php": ["@php", indent("${1}"), "@endphp"],
             "@component(...)": ["@component(${1})", "${2}", "@endcomponent"],

src/completion/Eloquent.ts

@@ -6,7 +6,7 @@ import AutocompleteResult from "../parser/AutocompleteResult";
 import { getModels } from "./../repositories/models";
 import { wordMatchRegex } from "./../support/patterns";
 
-export default class Eloquent implements CompletionProvider {
+export class Eloquent implements CompletionProvider {
     private relationMethods = [
         "doesntHave",
         "doesntHaveMorph",

src/completion/Registry.ts

@@ -6,7 +6,7 @@ import { toArray } from "@src/support/util";
 import * as vscode from "vscode";
 import { CompletionProvider, FeatureTagParam } from "..";
 
-export default class Registry implements vscode.CompletionItemProvider {
+export class Registry implements vscode.CompletionItemProvider {
     private providers: CompletionProvider[] = [];
 
     constructor(...providers: CompletionProvider[]) {

src/completion/Validation.ts

@@ -6,7 +6,7 @@ import { CompletionProvider } from "..";
 import AutocompleteResult from "../parser/AutocompleteResult";
 import { wordMatchRegex } from "./../support/patterns";
 
-export default class Validation implements CompletionProvider {
+export class Validation implements CompletionProvider {
     private rules = {
         accepted: "accepted",
         active_url: "active_url",

src/extension.ts

@@ -6,19 +6,7 @@ import os from "os";
 import { LanguageClient } from "vscode-languageclient/node";
 import { bladeSpacer } from "./blade/bladeSpacer";
 import { initClient } from "./blade/client";
-import { CodeActionProvider } from "./codeAction/codeActionProvider";
 import { openFileCommand } from "./commands";
-import BladeCompletion from "./completion/Blade";
-import { completionProviders } from "./completion/CompletionProvider";
-import EloquentCompletion from "./completion/Eloquent";
-import Registry from "./completion/Registry";
-import ValidationCompletion from "./completion/Validation";
-import { updateDiagnostics } from "./diagnostic/diagnostic";
-import { completionProvider as bladeComponentCompletion } from "./features/bladeComponent";
-import { viteEnvCodeActionProvider } from "./features/env";
-import { completionProvider as livewireComponentCompletion } from "./features/livewireComponent";
-import { hoverProviders } from "./hover/HoverProvider";
-import { linkProviders } from "./link/LinkProvider";
 import { configAffected } from "./support/config";
 import { collectDebugInfo } from "./support/debug";
 import {
@@ -30,6 +18,7 @@ import { clearParserCaches, setParserBinaryPath } from "./support/parser";
 import {
     clearDefaultPhpCommand,
     clearPhpFileCache,
+    initPhp,
     initVendorWatchers,
 } from "./support/php";
 import { hasWorkspace, projectPathExists } from "./support/project";
@@ -51,7 +40,7 @@ function shouldActivate(): boolean {
     return true;
 }
 
-export function activate(context: vscode.ExtensionContext) {
+export async function activate(context: vscode.ExtensionContext) {
     info("Activating Laravel Extension...");
 
     if (!shouldActivate()) {
@@ -63,6 +52,34 @@ export function activate(context: vscode.ExtensionContext) {
 
     info("Started");
 
+    const [
+        { Registry },
+        { completionProviders },
+        { Eloquent: EloquentCompletion },
+        { Validation: ValidationCompletion },
+        { Blade: BladeCompletion },
+        { completionProvider: bladeComponentCompletion },
+        { completionProvider: livewireComponentCompletion },
+        { CodeActionProvider },
+        { updateDiagnostics },
+        { viteEnvCodeActionProvider },
+        { hoverProviders },
+        { linkProviders },
+    ] = await Promise.all([
+        import("./completion/Registry.js"),
+        import("./completion/CompletionProvider.js"),
+        import("./completion/Eloquent.js"),
+        import("./completion/Validation.js"),
+        import("./completion/Blade.js"),
+        import("./features/bladeComponent.js"),
+        import("./features/livewireComponent.js"),
+        import("./codeAction/codeActionProvider.js"),
+        import("./diagnostic/diagnostic.js"),
+        import("./features/env.js"),
+        import("./hover/HoverProvider.js"),
+        import("./link/LinkProvider.js"),
+    ]);
+
     console.log("Laravel VS Code Started...");
 
     const BLADE_LANGUAGES = [
@@ -72,6 +89,7 @@ export function activate(context: vscode.ExtensionContext) {
 
     const LANGUAGES = [{ scheme: "file", language: "php" }, ...BLADE_LANGUAGES];
 
+    initPhp();
     initVendorWatchers();
     watchForComposerChanges();
     setParserBinaryPath(context);

src/support/php.ts

@@ -27,8 +27,13 @@ let defaultPhpCommand: string | null = null;
 
 const discoverFiles = new BoundedFileCache(50);
 
-let hasVendor = projectPathExists("vendor/autoload.php");
-const hasBootstrap = projectPathExists("bootstrap/app.php");
+let hasVendor: boolean | null = null;
+let hasBootstrap: boolean | null = null;
+
+export const initPhp = () => {
+    hasVendor = projectPathExists("vendor/autoload.php");
+    hasBootstrap = projectPathExists("bootstrap/app.php");
+};
 
 let phpEnvKey: PhpEnvironment | null = null;
 const phpEnvsThatUseRelativePaths: PhpEnvironment[] = ["sail", "lando"];

src/syntax/DocumentHighlight.ts

@@ -2,14 +2,16 @@ import * as vscode from "vscode";
 import * as html from "vscode-html-languageservice";
 import * as lsTextDocument from "vscode-languageserver-textdocument";
 
-const service = html.getLanguageService();
+let service: html.LanguageService | null = null;
 
 class DocumentHighlight implements vscode.DocumentHighlightProvider {
     provideDocumentHighlights(
         document: vscode.TextDocument,
         position: vscode.Position,
         token: vscode.CancellationToken,
     ): vscode.DocumentHighlight[] | Thenable<vscode.DocumentHighlight[]> {
+        service ??= html.getLanguageService();
+
         const doc = lsTextDocument.TextDocument.create(
             document.uri.fsPath,
             "html",