enhancement - Activate the extension when gradle files are in sub-fol…

…ders of the workspace (#1570)
microsoft · Aug 8, 2024 · d94b31b · d94b31b
1 parent 32d689a
commit d94b31b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/...om.microsoft.gradle.bs.importer/src/com/microsoft/gradle/bs/importer/NamedPipeStream.java b/...om.microsoft.gradle.bs.importer/src/com/microsoft/gradle/bs/importer/NamedPipeStream.java
@@ -129,7 +129,7 @@ private String generateRandomPipeName() {
 
         private void sendImporterPipeName(String pipeName) {
             JavaLanguageServerPlugin.getInstance().getClientConnection()
-                .sendNotification("gradle.onWillImporterConnect", pipeName);
+                .sendNotification("_gradle.onWillImporterConnect", pipeName);
         }
 
         private void attemptConnection(File pipeFile) throws IOException {

diff --git a/extension/package.json b/extension/package.json
@@ -36,9 +36,14 @@
     "workspaceContains:**/gradlew",
     "workspaceContains:**/gradlew.bat",
     "workspaceContains:build.gradle",
+    "workspaceContains:*/build.gradle",
     "workspaceContains:settings.gradle",
+    "workspaceContains:*/settings.gradle",
     "workspaceContains:build.gradle.kts",
-    "workspaceContains:settings.gradle.kts"
+    "workspaceContains:*/build.gradle.kts",
+    "workspaceContains:settings.gradle.kts",
+    "workspaceContains:*/settings.gradle.kts",
+    "onCommand:_gradle.onWillImporterConnect"
   ],
   "main": "./dist/index.js",
   "contributes": {

diff --git a/extension/src/bs/JdtlsImporterConnector.ts b/extension/src/bs/JdtlsImporterConnector.ts
@@ -4,7 +4,7 @@ import * as vscode from "vscode";
 import * as path from "path";
 import { sendInfo } from "vscode-extension-telemetry-wrapper";
 
-export const ON_WILL_IMPORTER_CONNECT = "gradle.onWillImporterConnect";
+export const ON_WILL_IMPORTER_CONNECT = "_gradle.onWillImporterConnect";
 
 /**
  * Receive the pipe name from Java jdt.ls importer, generate named pipe file and