Merge pull request #35 from absszero/fix-App-namespace

Fix app namespace
absszero · Mar 12, 2024 · 8b78da5 · 8b78da5
2 parents 86d64e6 + 3ecba2f
commit 8b78da5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
 	"name": "vscode-laravel-goto",
 	"displayName": "Laravel Goto",
 	"description": "Go to various Laravel files",
-	"version": "4.28.3",
+	"version": "4.28.4",
 	"publisher": "absszero",
 	"license": "MIT",
 	"icon": "icon.png",

diff --git a/src/Finder.ts b/src/Finder.ts
@@ -329,6 +329,14 @@ export class Finder {
 			place.path = this.path + '.php';
 		}
 
+		if (place.path.startsWith('\\')) {
+			place.path = place.path.substring(1);
+		}
+
+		if (place.path.startsWith('App\\')) {
+			place.path = 'a' + place.path.substring(1);
+		}
+
 		return place;
 	}
 

diff --git a/src/test/suite/Finder.test.ts b/src/test/suite/Finder.test.ts
@@ -54,7 +54,10 @@ suite('Finder Test Suite', () => {
 
 	test('namespace file', async () => {
 		await replace(editor, '"App\\Use|r"');
-		await assertPath("App\\User.php");
+		await assertPath("app\\User.php");
+
+		await replace(editor, '"\\App\\Use|r"');
+		await assertPath("app\\User.php");
 	});
 
 	test('closing tag Component', async () => {