Skip to content

Commit d94b31b

Browse files
authored
enhancement - Activate the extension when gradle files are in sub-folders of the workspace (#1570)
1 parent 32d689a commit d94b31b

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

extension/jdtls.ext/com.microsoft.gradle.bs.importer/src/com/microsoft/gradle/bs/importer/NamedPipeStream.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private String generateRandomPipeName() {
129129

130130
private void sendImporterPipeName(String pipeName) {
131131
JavaLanguageServerPlugin.getInstance().getClientConnection()
132-
.sendNotification("gradle.onWillImporterConnect", pipeName);
132+
.sendNotification("_gradle.onWillImporterConnect", pipeName);
133133
}
134134

135135
private void attemptConnection(File pipeFile) throws IOException {

extension/package.json

+6-1
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,14 @@
3636
"workspaceContains:**/gradlew",
3737
"workspaceContains:**/gradlew.bat",
3838
"workspaceContains:build.gradle",
39+
"workspaceContains:*/build.gradle",
3940
"workspaceContains:settings.gradle",
41+
"workspaceContains:*/settings.gradle",
4042
"workspaceContains:build.gradle.kts",
41-
"workspaceContains:settings.gradle.kts"
43+
"workspaceContains:*/build.gradle.kts",
44+
"workspaceContains:settings.gradle.kts",
45+
"workspaceContains:*/settings.gradle.kts",
46+
"onCommand:_gradle.onWillImporterConnect"
4247
],
4348
"main": "./dist/index.js",
4449
"contributes": {

extension/src/bs/JdtlsImporterConnector.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as vscode from "vscode";
44
import * as path from "path";
55
import { sendInfo } from "vscode-extension-telemetry-wrapper";
66

7-
export const ON_WILL_IMPORTER_CONNECT = "gradle.onWillImporterConnect";
7+
export const ON_WILL_IMPORTER_CONNECT = "_gradle.onWillImporterConnect";
88

99
/**
1010
* Receive the pipe name from Java jdt.ls importer, generate named pipe file and

0 commit comments

Comments
 (0)