bugfix: go-to definition tests jumping

lifeart · May 20, 2020 · 8082482 · 8082482
1 parent 48a35db
commit 8082482
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/builtin-addons/core/template-definition-provider.ts b/src/builtin-addons/core/template-definition-provider.ts
@@ -7,7 +7,7 @@ import { isLinkToTarget, isLinkComponentRouteTarget } from './../../utils/ast-he
 import ASTPath from './../../glimmer-utils';
 import { getGlobalRegistry } from './../../utils/registry-api';
 import { normalizeToClassicComponent } from '../../utils/normalizers';
-import { isTemplatePath, getComponentNameFromURI, isModuleUnificationApp, getPodModulePrefix } from './../../utils/layout-helpers';
+import { isTemplatePath, isTestFile, getComponentNameFromURI, isModuleUnificationApp, getPodModulePrefix } from './../../utils/layout-helpers';
 
 import {
   getAbstractHelpersParts,
@@ -26,7 +26,7 @@ export function getPathsFromRegistry(type: 'helper' | 'modifier' | 'component',
   const absRoot = path.normalize(root);
   const registry = getGlobalRegistry();
   const bucket: any = registry[type].get(name) || new Set();
-  return Array.from(bucket).filter((el: string) => path.normalize(el).includes(absRoot) && fs.existsSync(el)) as string[];
+  return Array.from(bucket).filter((el: string) => path.normalize(el).includes(absRoot) && !isTestFile(path.normalize(el)) && fs.existsSync(el)) as string[];
 }
 
 export function provideComponentTemplatePaths(root: string, rawComponentName: string) {

diff --git a/src/utils/layout-helpers.ts b/src/utils/layout-helpers.ts
@@ -274,6 +274,18 @@ export function isTemplatePath(filePath: string) {
   return filePath.endsWith('.hbs');
 }
 
+export function normalizedPath(filePath: string) {
+  if (filePath.includes('\\')) {
+    return filePath.split('\\').join('/');
+  } else {
+    return filePath;
+  }
+}
+
+export function isTestFile(filePath: string) {
+  return normalizedPath(filePath).includes('/tests/');
+}
+
 export function hasAddonFolderInPath(name: string) {
   return name.includes(path.sep + 'addon' + path.sep);
 }