Remove use of getSearchGlob and add new parameter to loadProjects

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

cli/src/index.ts

@@ -177,7 +177,7 @@ async function main() {
 	let files: string[];
 
 	if (!scanGlob) {
-		scanGlob = targets.getSearchGlob();
+		scanGlob = Targets.LanguageProvider.getGlob();
 	}
 
 	try {

cli/src/targets/index.ts

@@ -95,10 +95,6 @@ export class Targets {
 		return ignoredObjects;
 	}
 
-	getSearchGlob(): string {
-		return Targets.LanguageProvider.getGlob();
-	}
-
 	public getCwd() {
 		return this.cwd;
 	}
@@ -139,12 +135,12 @@ export class Targets {
 		this.resolvedObjects[localPath] = ileObject;
 	}
 
-	public async loadProject(withRef?: string) {
-		if (withRef) {
-			await this.handleRefsFile(path.join(this.cwd, withRef));
+	public async loadProject(options: { withRef?: string, additionalExtensions?: string[] } = {}) {
+		if (options.withRef) {
+			await this.handleRefsFile(path.join(this.cwd, options.withRef));
 		}
 
-		const initialFiles = await this.fs.getFiles(this.cwd, this.getSearchGlob());
+		const initialFiles = await this.fs.getFiles(this.cwd, Targets.LanguageProvider.getGlob(options.additionalExtensions));
 		await this.loadObjectsFromPaths(initialFiles);
 		await Promise.allSettled(initialFiles.map(f => this.parseFile(f)));
 	}

cli/src/targets/languages.ts

@@ -33,8 +33,8 @@ export class TargetsLanguageProvider {
     return this.languageTargets.map(lang => lang.extensions).flat();
   }
 
-  public getGlob() {
-    const allExtensions = this.getExtensions();
+  public getGlob(additionalExtensions: string[] = []): string {
+    const allExtensions = this.getExtensions().concat(additionalExtensions);
     return `**/*.{${allExtensions.join(`,`)},${allExtensions.map(e => e.toUpperCase()).join(`,`)}}`;
   }
 

cli/test/ddsDepsWithRefFile.test.ts

@@ -16,7 +16,7 @@ describe(`dds_refs tests with reference file`, () => {
   targets.setSuggestions({renames: true, includes: true})
 
   beforeAll(async () => {
-    await targets.loadProject(`.objrefs`);
+    await targets.loadProject({withRef: `.objrefs`});
 
     expect(targets.getTargets().length).toBeGreaterThan(0);
     targets.resolveBinder();

cli/test/overrideObjRef.test.ts

@@ -1,13 +1,9 @@
-import { assert, beforeAll, describe, expect, test } from 'vitest';
+import { describe, expect, test } from 'vitest';
 
 import { Targets } from '../src/targets'
 import path from 'path';
-import { MakeProject } from '../src/builders/make';
-import { getFiles } from '../src/utils';
 import { setupFixture } from './fixtures/projects';
 import { referencesFileName } from '../src/extensions';
-import { writeFileSync } from 'fs';
-import { BobProject } from '../src/builders/bob';
 import { ReadFileSystem } from '../src/readFileSystem';
 
 const cwd = setupFixture(`override_objref`);

vs/server/src/TargetsManager.ts

@@ -46,7 +46,7 @@ export class TargetsManager {
 
     const targets = new Targets(url, rfs);
 
-    const files = await rfs.getFiles(url, targets.getSearchGlob());
+    const files = await rfs.getFiles(url, Targets.LanguageProvider.getGlob());
 
     await targets.loadObjectsFromPaths(files);
 

vs/server/src/setup.ts

@@ -93,7 +93,7 @@ export async function fixProject(workspaceUri: string, suggestions: TargetSugges
 
 	const targets = new Targets(url, rfs);
 
-	const files = await rfs.getFiles(url, targets.getSearchGlob());
+	const files = await rfs.getFiles(url, Targets.LanguageProvider.getGlob());
 
 	targets.setSuggestions(suggestions);