Make one pop-up dialog asking for reload.

    Use regular expression to check java build file names.

    Signed-off-by: Siarhei Leanavets <Siarhei_Leanavets1@epam.com>

Signed-off-by: Siarhei Leanavets <Siarhei_Leanavets1@epam.com>

Author: LeonovecSergey

package.json

@@ -36,7 +36,7 @@
   "main": "./dist/extension",
   "contributes": {
     "javaBuildFilePatterns": [
-      "pom.xml", ".gradle"
+      "^pom.xml$", ".*\\.gradle$"
     ],
     "semanticTokenTypes": [
       {

schemas/package.schema.json

@@ -19,7 +19,7 @@
 					"markdownDescription": "Java build file patterns",
 					"items": {
 						"type": "string",
-						"description": "Specific build file patterns"
+						"description": "Regular expressions for specifying build file"
 					}
 				}
 			}

src/plugin.ts

@@ -46,65 +46,46 @@ export function collectBuildFilePattern(extensions: readonly vscode.Extension<an
 }
 
 export function onExtensionChange(extensions: readonly vscode.Extension<any>[]) {
-	updateExistingExtensions(extensions);
-	updateExistinguildFilePatterns(extensions);
-
+	if (isExistingExtensionsUpdated(extensions) || isExistingBuildFilePatternsUpdated(extensions)) {
+		const msg = `Java Extension Contributions changed, reloading ${vscode.env.appName} is required for the changes to take effect.`;
+		const action = 'Reload';
+		const restartId = Commands.RELOAD_WINDOW;
+		vscode.window.showWarningMessage(msg, action).then((selection) => {
+			if (action === selection) {
+				vscode.commands.executeCommand(restartId);
+			}
+		});
+	}
 }
 
-function updateExistingExtensions(extensions: readonly vscode.Extension<any>[]) {
+function isExistingExtensionsUpdated(extensions: readonly vscode.Extension<any>[]) {
 	if (!existingExtensions) {
-		return;
+		return false;
 	}
 	const oldExtensions = new Set(existingExtensions.slice());
 	const newExtensions = collectJavaExtensions(extensions);
-	let hasChanged = ( oldExtensions.size !== newExtensions.length);
+	const hasChanged = ( oldExtensions.size !== newExtensions.length);
 	if (!hasChanged) {
 		for (const newExtension of newExtensions) {
 			if (!oldExtensions.has(newExtension)) {
-				hasChanged = true;
-				break;
+				return true;
 			}
 		}
 	}
-
-	if (hasChanged) {
-		const msg = `Extensions to the Java Language Server changed, reloading ${vscode.env.appName} is required for the changes to take effect.`;
-		const action = 'Reload';
-		const restartId = Commands.RELOAD_WINDOW;
-		vscode.window.showWarningMessage(msg, action).then((selection) => {
-			if (action === selection) {
-				vscode.commands.executeCommand(restartId);
-			}
-		});
-	}
-
 }
 
-function updateExistinguildFilePatterns(extensions: readonly vscode.Extension<any>[]) {
+function isExistingBuildFilePatternsUpdated(extensions: readonly vscode.Extension<any>[]) {
 	if (!existingBuildFilePatterns) {
-		return;
+		return false;
 	}
 	const oldPatterns = new Set(existingBuildFilePatterns.slice());
 	const newPatterns = collectBuildFilePattern(extensions);
-	let hasChanged = ( oldPatterns.size !== newPatterns.length);
+	const hasChanged = ( oldPatterns.size !== newPatterns.length);
 	if (!hasChanged) {
 		for (const newPattern of newPatterns) {
 			if (!oldPatterns.has(newPattern)) {
-				hasChanged = true;
-				break;
+				return true;
 			}
 		}
 	}
-
-	if (hasChanged) {
-		const msg = `Java build file patterns changed, reloading ${vscode.env.appName} is required for the changes to take effect.`;
-		const action = 'Reload';
-		const restartId = Commands.RELOAD_WINDOW;
-		vscode.window.showWarningMessage(msg, action).then((selection) => {
-			if (action === selection) {
-				vscode.commands.executeCommand(restartId);
-			}
-		});
-	}
-
 }

src/standardLanguageClient.ts

@@ -467,9 +467,10 @@ function projectConfigurationUpdate(languageClient: LanguageClient, uri?: Uri) {
 	}
 }
 
-function isJavaConfigFile(path: String) {
-	return buildFilePatterns.filter((pattern: String) => path.toLowerCase().endsWith(pattern.toLowerCase()))
-	.length > 0;
+function isJavaConfigFile(path: string) {
+	const fileName = require("path").basename(path);
+	const regEx = new RegExp(buildFilePatterns.map(r => `(${r})`).join('|'), 'i');
+	return regEx.test(fileName);
 }
 
 function setProjectConfigurationUpdate(languageClient: LanguageClient, uri: Uri, status: FeatureStatus) {

test/resources/packageExample.json

@@ -14,6 +14,9 @@
 	"contributes": {
 		"javaExtensions": [
 			"./bin/java.extend.jar"
+		],
+		"javaBuildFilePatterns": [
+			"^pom.xml$", ".*\\.gradle$"
 		]
 	},
 	"extensionDependencies": [