Add *.gradle.kts support (#2077)

* [WIP] Add *.gradle.kts support

Signed-off-by: Fred Bricon <fbricon@gmail.com>

* Polish *.gradle.kts support

Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com>

Co-authored-by: Fred Bricon <fbricon@gmail.com>

Author: snjeza

package-lock.json

@@ -39,14 +39,17 @@
     "onLanguage:java",
     "workspaceContains:pom.xml",
     "workspaceContains:build.gradle",
+    "workspaceContains:settings.gradle",
+    "workspaceContains:build.gradle.kts",
+    "workspaceContains:settings.gradle.kts",
     "workspaceContains:.classpath",
     "onCommand:_java.templateVariables"
   ],
   "main": "./dist/extension",
   "contributes": {
     "javaBuildFilePatterns": [
-      "^pom.xml$",
-      ".*\\.gradle$"
+      "^pom\\.xml$",
+      ".*\\.gradle(\\.kts)?$"
     ],
     "semanticTokenTypes": [
       {
@@ -942,7 +945,7 @@
       "explorer/context": [
         {
           "command": "java.projectConfiguration.update",
-          "when": "resourceFilename =~ /(.*\\.gradle)|(pom.xml)$/",
+          "when": "resourceFilename =~ /(.*\\.gradle)|(.*\\.gradle\\.kts)|(pom\\.xml)$/",
           "group": "1_javaactions"
         },
         {
@@ -964,7 +967,7 @@
         },
         {
           "command": "java.projectConfiguration.update",
-          "when": "resourceFilename =~ /(.*\\.gradle)|(pom.xml)$/",
+          "when": "resourceFilename =~ /(.*\\.gradle)|(.*\\.gradle\\.kts)|(pom\\.xml)$/",
           "group": "1_javaactions"
         },
         {

package.json

@@ -451,6 +451,8 @@ async function hasBuildToolConflicts(): Promise<boolean> {
 	const eclipseDirectories = getDirectoriesByBuildFile(projectConfigurationFsPaths, [], ".project");
 	// ignore the folders that already has .project file (already imported before)
 	const gradleDirectories = getDirectoriesByBuildFile(projectConfigurationFsPaths, eclipseDirectories, ".gradle");
+	const gradleDirectoriesKts = getDirectoriesByBuildFile(projectConfigurationFsPaths, eclipseDirectories, ".gradle.kts");
+	gradleDirectories.concat(gradleDirectoriesKts);
 	const mavenDirectories = getDirectoriesByBuildFile(projectConfigurationFsPaths, eclipseDirectories, "pom.xml");
 	return gradleDirectories.some((gradleDir) => {
 		return mavenDirectories.includes(gradleDir);

src/extension.ts

@@ -56,6 +56,7 @@ export function getBuildFilePatterns(): string[] {
 	}
 	if (isGradleImporterEnabled) {
 		patterns.push("**/*.gradle");
+		patterns.push("**/*.gradle.kts");
 	}
 
 	return patterns;

src/utils.ts

@@ -16,7 +16,7 @@
 			"./bin/java.extend.jar"
 		],
 		"javaBuildFilePatterns": [
-			"^pom.xml$", ".*\\.gradle$"
+			"^pom.xml$", ".*\\.gradle(\\.kts)?$"
 		]
 	},
 	"extensionDependencies": [

test/resources/packageExample.json

@@ -121,7 +121,7 @@ suite('Java Language Extension - Standard', () => {
 		const result = plugin.collectBuildFilePattern(extensions);
 		assert(result.length === 2);
 		assert(result[0].endsWith("^pom.xml$"));
-		assert(result[1].endsWith(".*\\.gradle$"));
+		assert(result[1].endsWith(".*\\.gradle(\\.kts)?$"));
 	});
 
 	test('should collect java extensions', () => {

test/standard-mode-suite/extension.test.ts

@@ -37,7 +37,7 @@ suite('Utils Test', () => {
 
 		const result: string[] = getBuildFilePatterns();
 
-		assert.deepEqual(result, ["**/pom.xml", "**/*.gradle"]);
+		assert.deepEqual(result, ["**/pom.xml", "**/*.gradle", "**/*.gradle.kts"]);
 	});
 
 	test('getBuildFilePatterns() - no importers is enabled', async function () {