Skip to content

Updated the JavaLangFeatures feature name extractor to work with JDK25+ EA #451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 22, 2025
Merged

Updated the JavaLangFeatures feature name extractor to work with JDK25+ EA #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 85 additions & 25 deletions ...telemetry/src/org/netbeans/modules/nbcode/java/lsp/server/telemetry/JavaLangFeatures.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,20 @@
import com.sun.tools.javac.code.Source;
import com.sun.tools.javac.resources.CompilerProperties;
import com.sun.tools.javac.util.JCDiagnostic;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.function.Consumer;
import java.util.logging.Level;
import java.util.logging.Logger;

class JavaLangFeatures {
private static final Logger LOG = Logger.getLogger(JavaLangFeatures.class.getName());

public static boolean isDiagnosticForUnsupportedFeatures(String diagnosticCode) {
return Singleton.javacParentDiagnosticKeys.contains(diagnosticCode);
Expand All @@ -47,45 +54,98 @@ private static class Singleton {
static {
Map<String, Source.Feature> featureFragments = new HashMap<>();
Set<String> parentDiagnosticKeys = new HashSet<>();
String prefix = "compiler.misc.";
String prefix = null;
try {
final JCDiagnostic.Fragment fragment = CompilerProperties.Fragments.FeatureNotSupportedInSource((JCDiagnostic) null, null, null);
final String fragmentKey = fragment.key();
final String fragmentCode = fragment.getCode();
if (fragmentKey.startsWith(fragmentCode)) {
prefix = fragmentKey.substring(fragmentCode.length());
}

parentDiagnosticKeys.add(fragmentKey);
parentDiagnosticKeys.add(CompilerProperties.Fragments.FeatureNotSupportedInSourcePlural((JCDiagnostic) null, null, null).key());
parentDiagnosticKeys.add(CompilerProperties.Errors.FeatureNotSupportedInSource((JCDiagnostic) null, null, null).key());
parentDiagnosticKeys.add(CompilerProperties.Errors.FeatureNotSupportedInSourcePlural((JCDiagnostic) null, null, null).key());

parentDiagnosticKeys.add(CompilerProperties.Errors.PreviewFeatureDisabled((JCDiagnostic) null).key());
parentDiagnosticKeys.add(CompilerProperties.Errors.PreviewFeatureDisabledPlural((JCDiagnostic) null).key());
parentDiagnosticKeys.add(CompilerProperties.Warnings.PreviewFeatureUse((JCDiagnostic) null).key());
parentDiagnosticKeys.add(CompilerProperties.Warnings.PreviewFeatureUsePlural((JCDiagnostic) null).key());

parentDiagnosticKeys.add(CompilerProperties.Errors.IsPreview(null).key());
parentDiagnosticKeys.add(CompilerProperties.Warnings.IsPreview(null).key());
parentDiagnosticKeys.add(CompilerProperties.Warnings.IsPreviewReflective(null).key());

for (Source.Feature f : Source.Feature.values()) {
try {
featureFragments.put(f.nameFragment().getCode(), f);
JCDiagnostic.Fragment nameFragment = f.nameFragment();
featureFragments.put(nameFragment.getCode(), f);

if (prefix == null) {
final String fragmentKey = nameFragment.key();
final String fragmentCode = nameFragment.getCode();
if (fragmentCode.length() > 0 && fragmentKey.endsWith(fragmentCode)) {
prefix = fragmentKey.substring(0, fragmentKey.length() - fragmentCode.length());
}
}
} catch (AssertionError | NullPointerException e) {
// In case no error message code has been registered; for example: LOCAL_VARIABLE_TYPE_INFERENCE
featureFragments.put(f.name(), f);
}
}

Set<String> diagnosticMethodNames = new HashSet<>(Arrays.asList(
"FeatureNotSupportedInSource",
"FeatureNotSupportedInSourcePlural",
"PreviewFeatureDisabled",
"PreviewFeatureDisabledPlural",
"PreviewFeatureUse",
"PreviewFeatureUsePlural",
"IsPreview",
"IsPreviewReflective"
));
supplyKeyForEachDiagnosticName(diagnosticMethodNames, parentDiagnosticKeys::add);
} catch (VirtualMachineError e) {
throw e;
} catch (Throwable ignore) {
} catch (Throwable e) {
try {
LOG.log(Level.CONFIG, "Unexpected error initialising Java Language features and parent diagnostic codes: {0}", (Object) e);
} catch (Throwable ignore) {
}
}
javacFragmentCodePrefix = prefix;
javacFragmentCodePrefix = prefix == null ? "compiler.misc." : prefix;
javacParentDiagnosticKeys = parentDiagnosticKeys.isEmpty() ? Collections.emptySet() : Collections.unmodifiableSet(parentDiagnosticKeys);
fragmentCodeToFeature = featureFragments.isEmpty() ? Collections.emptyMap() : Collections.unmodifiableMap(featureFragments);
}

private static void supplyKeyForEachDiagnosticName(Set<String> methodNames, Consumer<String> action) {
if (methodNames == null || methodNames.isEmpty()) return;
final Object[][] emptyArgs = new Object[6][];
for (int i = 0; i < emptyArgs.length; i++) {
emptyArgs[i] = new Object[i];
}
int numInitErrors = 0;
Class<?>[] classes = CompilerProperties.class.getClasses();
for (Class<?> nestedClass : classes) {
Method[] methods = Modifier.isStatic(nestedClass.getModifiers()) ? nestedClass.getMethods() : null;
if (methods == null || methods.length == 0) {
continue;
}
for (Method m : methods) {
try {
if (Modifier.isStatic(m.getModifiers())
&& JCDiagnostic.DiagnosticInfo.class.isAssignableFrom(m.getReturnType())
&& methodNames.contains(m.getName())) {
int numParams = m.getParameterCount();
JCDiagnostic.DiagnosticInfo diag = (JCDiagnostic.DiagnosticInfo) m.invoke(null, numParams < emptyArgs.length ? emptyArgs[numParams] : Arrays.copyOf(emptyArgs[0], numParams));
if (diag != null) {
action.accept(diag.key());
}
}
} catch (VirtualMachineError e) {
throw e;
} catch (Throwable e) {
numInitErrors++;
try {
String name = null;
try {
name = m.getName();
} catch (Throwable ignore) {
}
LOG.log(Level.FINE, "Unexpected error initialising diagnostic key for method \"{1}\", related to Java Language features: {0}",
name == null ? new Object[]{e, m} : new Object[]{e, name});
} catch (Throwable ignore) {
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

instead of ignoring, should we log using fine or finer level, so that for debugging purpose it will help?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added logger. Thanks.

}
}
if (numInitErrors > 0 && !LOG.isLoggable(Level.FINE)) {
try {
LOG.log(Level.CONFIG, "Unexpected {0} error(s) initialising diagnostic keys for methods related to Java Language features.", numInitErrors);
} catch (Throwable ignore) {
}
}
}
}

}
4 changes: 2 additions & 2 deletions ...rc/org/netbeans/modules/nbcode/java/lsp/server/telemetry/JavaLanguageFeaturesEmitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ Set<String> checkJavaFeatures() {
task = (JavacTask) ToolProvider.getSystemJavaCompiler().getTask(null, null, dl, List.of("--source", "8", "--source-path", sourceInfo.getSourcesPath()), null, List.of(sourceInfo.source));
task.analyze();
} catch (IOException e) {
LOG.log(Level.FINE, "IO error while scanning Java Language features: {0}", e);
LOG.log(Level.FINE, "IO error while scanning Java Language features: {0}", (Object) e);
} catch (IllegalArgumentException e) {
LOG.log(Level.CONFIG, "Invalid parsing parameters for scanning Java Language features: {0}", e);
LOG.log(Level.CONFIG, "Invalid parsing parameters for scanning Java Language features: {0}", (Object) e);
} catch (RuntimeException ignored) {
}
return featuresUsed;
Expand Down