Skip to content

Commit e42ac5b

Browse files
committed
Lombok agent doesn't need to be configured if javac is enabled
1 parent 2f57115 commit e42ac5b

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

src/lombokSupport.ts

+9
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,23 @@ export function addLombokParam(context: ExtensionContext, params: string[]) {
8383
// Exclude user setting Lombok agent parameter
8484
const reg = /-javaagent:.*[\\|/]lombok.*\.jar/;
8585
const deleteIndex = [];
86+
let hasIndexer = false;
8687
for (let i = 0; i < params.length; i++) {
8788
if (reg.test(params[i])) {
8889
deleteIndex.push(i);
8990
}
91+
hasIndexer = params[i] === "-DSourceIndexer.DOM_BASED_INDEXER=true";
9092
}
9193
for (let i = deleteIndex.length - 1; i >= 0; i--) {
9294
params.splice(deleteIndex[i], 1);
9395
}
96+
// https://github.com/redhat-developer/vscode-java/issues/3875
97+
// Lombok agent doesn't need to be configured if
98+
// java.jdt.ls.javac.enabled=on; java.completion.engine=dom; -DSourceIndexer.DOM_BASED_INDEXER=true
99+
if (hasIndexer && "on" === vscode.workspace.getConfiguration().get("java.jdt.ls.javac.enabled")
100+
&& "dom" === vscode.workspace.getConfiguration().get("java.completion.engine")) {
101+
return;
102+
}
94103
// add -javaagent arg to support Lombok.
95104
// use the extension's Lombok version by default.
96105
isExtensionLombok = true;

0 commit comments

Comments
 (0)