051

Author: ctf0

CHANGELOG.md

@@ -102,3 +102,7 @@ All notable changes to the "php-namespace-resolver" extension will be documented
 
 - fixes for `importAll`
 - we now also check for type hints & return types for classes to import
+
+## 0.5.1
+
+- show output panel when phpcommand fails

package.json

@@ -2,7 +2,7 @@
     "name": "php-namespace-resolver",
     "displayName": "PHP Namespace Resolver",
     "description": "Import and expand php namespaces",
-    "version": "0.5.0",
+    "version": "0.5.1",
     "publisher": "ctf0",
     "author": "ctf0",
     "repository": "https://github.com/ctf0/PHP-Namespace-Resolver",

src/NamespaceCheck.ts

@@ -11,7 +11,7 @@
 import { execa } from 'execa';
 import groupBy from 'lodash.groupby';
 import * as vscode from 'vscode';
-import Resolver from './Resolver';
+import { PKG_LABEL, Resolver } from './Resolver';
 
 export default async function checkForNamespaces(resolver: Resolver, createDiagnosticCollection: vscode.DiagnosticCollection) {
     if (resolver.CWD) {
@@ -191,7 +191,7 @@ function createDiagnostic(item) {
         vscode.DiagnosticSeverity.Warning,
     );
 
-    diagnostic.source = 'PHP Namespace Resolver';
+    diagnostic.source = PKG_LABEL;
 
     return diagnostic;
 }

src/Resolver.ts

@@ -7,11 +7,13 @@ import * as vscode from 'vscode';
 import * as Parser from './Parser';
 import BUILT_IN_CLASSES_FB from './classes';
 
+export const PKG_LABEL = 'PHP Namespace Resolver';
 const COMP_JSON = 'composer.json';
-const regexWordWithNamespace = new RegExp(/[a-zA-Z0-9\\]+/);
 const DATA_TYPES = ['object', 'resource', 'array', 'string', 'int', 'float', 'bool', 'null', 'void', 'mixed'];
+const regexWordWithNamespace = new RegExp(/[a-zA-Z0-9\\]+/);
+const outputChannel = vscode.window.createOutputChannel(PKG_LABEL, 'log');
 
-export default class Resolver {
+export class Resolver {
     BUILT_IN_CLASSES: any = BUILT_IN_CLASSES_FB;
     CLASS_AST: any;
     CWD: string;
@@ -465,7 +467,7 @@ export default class Resolver {
         const alpha = this.config('sort.alphabetically');
 
         if (useStatements.length <= 1) {
-            throw new Error('PHP Namespace Resolver: Nothing to sort.');
+            throw new Error(`${PKG_LABEL}: Nothing to sort.`);
         }
 
         let sortFunction = (a, b) => {
@@ -633,8 +635,8 @@ export default class Resolver {
         message = message.replace(/\$\(.+?\)/, '').trim();
 
         return error
-            ? vscode.window.showErrorMessage(`PHP Namespace Resolver: ${message}`)
-            : vscode.window.showInformationMessage(`PHP Namespace Resolver: ${message}`);
+            ? vscode.window.showErrorMessage(`${PKG_LABEL}: ${message}`)
+            : vscode.window.showInformationMessage(`${PKG_LABEL}: ${message}`);
     }
 
     /**
@@ -843,7 +845,7 @@ export default class Resolver {
         const phpCommand = this.config('php.command');
 
         if (!phpCommand) {
-            throw new Error('config required : phpCommand');
+            throw new Error('config required : "namespaceResolver.php.command"');
         }
 
         try {
@@ -855,6 +857,10 @@ export default class Resolver {
             return JSON.parse(stdout);
         } catch (error) {
             // console.error(error);
+
+            outputChannel.clear();
+            outputChannel.appendLine(error.message);
+            outputChannel.show();
         }
     }
 

src/extension.ts

@@ -1,10 +1,10 @@
 import * as vscode from 'vscode';
 import checkForNamespaces from './NamespaceCheck';
-import Resolver from './Resolver';
+import { PKG_LABEL, Resolver } from './Resolver';
 
 export async function activate(context) {
     const resolver = new Resolver();
-    const createDiagnosticCollection = vscode.languages.createDiagnosticCollection('PHP Namespace Resolver');
+    const createDiagnosticCollection = vscode.languages.createDiagnosticCollection(PKG_LABEL);
 
     context.subscriptions.push(
         createDiagnosticCollection,