Merge pull request #449 from laravel/pint-for-plain-php-projects

Pint for plain PHP projects

Author: joetannenbaum

src/extension.ts

@@ -49,6 +49,21 @@ function shouldActivate(): boolean {
 export async function activate(context: vscode.ExtensionContext) {
     info("Activating Laravel Extension...");
 
+    initPhp();
+
+    context.subscriptions.push(
+        vscode.commands.registerCommand("laravel.open", openFileCommand),
+        vscode.commands.registerCommand("laravel.runPint", runPint),
+        vscode.commands.registerCommand(
+            "laravel.runPintOnCurrentFile",
+            runPintOnCurrentFile,
+        ),
+        vscode.commands.registerCommand(
+            "laravel.runPintOnDirtyFiles",
+            runPintOnDirtyFiles,
+        ),
+    );
+
     if (!shouldActivate()) {
         info(
             'Not activating Laravel Extension because "shouldActivate" returned false',
@@ -95,7 +110,6 @@ export async function activate(context: vscode.ExtensionContext) {
 
     const LANGUAGES = [{ scheme: "file", language: "php" }, ...BLADE_LANGUAGES];
 
-    initPhp();
     initVendorWatchers();
     watchForComposerChanges();
     setParserBinaryPath(context);
@@ -104,8 +118,6 @@ export async function activate(context: vscode.ExtensionContext) {
 
     updateDiagnostics(vscode.window.activeTextEditor);
 
-    context.subscriptions.push();
-
     const delegatedRegistry = new Registry(
         ...completionProviders,
         new EloquentCompletion(),
@@ -194,16 +206,6 @@ export async function activate(context: vscode.ExtensionContext) {
                 providedCodeActionKinds: [vscode.CodeActionKind.QuickFix],
             },
         ),
-        vscode.commands.registerCommand("laravel.open", openFileCommand),
-        vscode.commands.registerCommand("laravel.runPint", runPint),
-        vscode.commands.registerCommand(
-            "laravel.runPintOnCurrentFile",
-            runPintOnCurrentFile,
-        ),
-        vscode.commands.registerCommand(
-            "laravel.runPintOnDirtyFiles",
-            runPintOnDirtyFiles,
-        ),
     );
 
     collectDebugInfo();

src/support/project.ts

@@ -53,6 +53,10 @@ export const projectPath = (srcPath = ""): string => {
         ) {
             return path.join(workspaceFolder.uri.fsPath, srcPath);
         }
+
+        if (fs.existsSync(path.join(workspaceFolder.uri.fsPath, srcPath))) {
+            return path.join(workspaceFolder.uri.fsPath, srcPath);
+        }
     }
 
     return "";

src/support/statusBar.ts

@@ -5,7 +5,7 @@ export const statusBarWorking = (
     dismissAfter: number = 2000,
 ) => {
     vscode.window.setStatusBarMessage(
-        `$(loading~spin) ${message}...`,
+        `$(loading~spin) ${message}`,
         dismissAfter,
     );
 };
@@ -14,12 +14,12 @@ export const statusBarSuccess = (
     message: string,
     dismissAfter: number = 3000,
 ) => {
-    vscode.window.setStatusBarMessage(`$(check) ${message}...`, dismissAfter);
+    vscode.window.setStatusBarMessage(`$(check) ${message}`, dismissAfter);
 };
 
 export const statusBarError = (
     message: string,
     dismissAfter: number = 3000,
 ) => {
-    vscode.window.setStatusBarMessage(`$(error) ${message}...`, dismissAfter);
+    vscode.window.setStatusBarMessage(`$(error) ${message}`, dismissAfter);
 };