From b899512770391d97480d94295e5e9b19332257eb Mon Sep 17 00:00:00 2001 From: JoshwinThomasIBM Date: Fri, 3 Jan 2025 11:27:21 +0530 Subject: [PATCH] Added build folder to excluded directories --- src/definitions/constants.ts | 2 +- src/liberty/libertyProject.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/definitions/constants.ts b/src/definitions/constants.ts index 4c42c9d7..02d8ad15 100644 --- a/src/definitions/constants.ts +++ b/src/definitions/constants.ts @@ -32,7 +32,7 @@ export const COMMAND_AND_PROJECT_TYPE_MAP: { [command: string]: string[] } = { "gradle":[ LIBERTY_GRADLE_PROJECT, LIBERTY_GRADLE_PROJECT_CONTAINER], "liberty.dev.debug": [LIBERTY_MAVEN_PROJECT, LIBERTY_GRADLE_PROJECT, LIBERTY_MAVEN_PROJECT_CONTAINER, LIBERTY_GRADLE_PROJECT_CONTAINER], }; -export const EXCLUDED_DIR_PATTERN = "**/{bin,classes,target}/**"; +export const EXCLUDED_DIR_PATTERN = "**/{bin,classes,target,build}/**"; export const COMMAND_TITLES = new Map(); export const UNTITLED_WORKSPACE="Untitled (Workspace)"; COMMAND_TITLES.set(localize("hotkey.commands.title.refresh"), "liberty.explorer.refresh"); diff --git a/src/liberty/libertyProject.ts b/src/liberty/libertyProject.ts index 936381c8..6672977b 100644 --- a/src/liberty/libertyProject.ts +++ b/src/liberty/libertyProject.ts @@ -86,8 +86,8 @@ export class ProjectProvider implements vscode.TreeDataProvider * */ public async getListOfMavenAndGradleFolders(path: string): Promise{ let uris: string[] = []; - const pomPattern = new vscode.RelativePattern(path, "**/!(target|build)/**/pom.xml"); - const gradlePattern = new vscode.RelativePattern(path, "**/!(target|build)/**/build.gradle"); + const pomPattern = new vscode.RelativePattern(path, "**/pom.xml"); + const gradlePattern = new vscode.RelativePattern(path, "**/build.gradle"); let paths = (await vscode.workspace.findFiles(pomPattern, EXCLUDED_DIR_PATTERN)).map(uri => uri.fsPath); uris = uris.concat(paths); paths = (await vscode.workspace.findFiles(gradlePattern, EXCLUDED_DIR_PATTERN)).map(uri => uri.fsPath); @@ -410,8 +410,8 @@ export class ProjectProvider implements vscode.TreeDataProvider private async updateProjects(): Promise { // find all build files in the open workspace and find all the ones that are valid for dev-mode - const pomPaths = (await vscode.workspace.findFiles("**/!(target|build)/**/pom.xml", EXCLUDED_DIR_PATTERN)).map(uri => uri.fsPath); - const gradlePaths = (await vscode.workspace.findFiles("**/!(target|build)/**/build.gradle", EXCLUDED_DIR_PATTERN)).map(uri => uri.fsPath); + const pomPaths = (await vscode.workspace.findFiles("**/pom.xml", EXCLUDED_DIR_PATTERN)).map(uri => uri.fsPath); + const gradlePaths = (await vscode.workspace.findFiles("**/build.gradle", EXCLUDED_DIR_PATTERN)).map(uri => uri.fsPath); const validPoms: BuildFileImpl[] = await this.findValidPOMs(pomPaths); const validGradleBuilds: BuildFileImpl[] = await this.findValidGradleBuildFiles(gradlePaths); let serverXMLPaths: string[] = [];