050

Author: ctf0

package.json

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

src/Resolver.ts

@@ -9,6 +9,7 @@ import BUILT_IN_CLASSES_FB from './classes';
 
 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'];
 
 export default class Resolver {
     BUILT_IN_CLASSES: any = BUILT_IN_CLASSES_FB;
@@ -160,22 +161,26 @@ export default class Resolver {
         const phpClasses: any = [];
 
         while (matches = regex.exec(text)) {
-            phpClasses.push(matches[1]);
+            const txt = matches[1];
+
+            if (!this.BUILT_IN_CLASSES.includes(txt)) {
+                phpClasses.push(txt);
+            }
         }
 
         return phpClasses;
     }
 
     getFromReturnType(text) {
-        const regex = /(?<=\): )([A-Z_][A-Za-z0-9_]*)/gm;
+        const regex = /(?<=\):( )?)([A-Z_][A-Za-z0-9_]*)/gm;
 
         let matches: any = [];
         const phpClasses: any = [];
 
         while (matches = regex.exec(text)) {
             const txt = matches[1];
 
-            if (txt !== 'self') {
+            if (!this.BUILT_IN_CLASSES.includes(txt)) {
                 phpClasses.push(txt);
             }
         }