-
Notifications
You must be signed in to change notification settings - Fork 42
Add support for Annotation Processors in the Javac Extension #3686
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.
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
Open
PiIsRational
wants to merge
21
commits into
KeYProject:main
Choose a base branch
from
PiIsRational:javac-extension
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 16 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
ef77b66
extend the javac extension
PiIsRational 2a5ca56
updated the code and text to be clearer
PiIsRational 74af1d7
save proof independent settings, that are not used by the configuration
PiIsRational 0ae4244
few changes
PiIsRational 1931fe9
Merge branch 'main' into javac-extension
PiIsRational 0f710eb
fix mistakes introduced by the merge
PiIsRational d84fb9f
Revert "save proof independent settings, that are not used by the con…
PiIsRational 7ca2241
un-revert the name of the Javac Settings
PiIsRational ba35a99
update the javaCompilerCheckFacade interface and fix tests
PiIsRational 7a1658c
change the help messages in the settings provider
PiIsRational 4c5f41e
make compiler errors acessible from the gui
PiIsRational 0f42201
wip: Javac in separate process
wadoon 622a300
finish implementing the external java checks
PiIsRational 285af93
Merge branch 'main' into javac-extension
wadoon f89754d
replace HashMap with a TreeMap
PiIsRational 7c4df33
minor fixups and comments
PiIsRational 495123b
replace unclear var declarations
PiIsRational 3f01c36
run spotless
PiIsRational 8357972
simplify the javac check facade
PiIsRational a1b3580
run spotless
PiIsRational 73d9619
Merge branch 'main' into javac-extension
WolframPfeifer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,15 +3,13 @@ | |
| * SPDX-License-Identifier: GPL-2.0-only */ | ||
| package de.uka.ilkd.key.gui.plugins.javac; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.io.OutputStream; | ||
| import java.io.StringWriter; | ||
| import java.io.*; | ||
| import java.net.URI; | ||
| import java.net.URISyntaxException; | ||
| import java.nio.charset.Charset; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.Paths; | ||
| import java.util.*; | ||
| import java.util.concurrent.CompletableFuture; | ||
| import java.util.stream.Collectors; | ||
|
|
@@ -21,7 +19,11 @@ | |
| import de.uka.ilkd.key.java.Position; | ||
| import de.uka.ilkd.key.parser.Location; | ||
| import de.uka.ilkd.key.proof.init.ProblemInitializer; | ||
| import de.uka.ilkd.key.settings.Configuration; | ||
|
|
||
| import org.key_project.util.Streams; | ||
|
|
||
| import org.antlr.v4.runtime.CharStreams; | ||
| import org.jspecify.annotations.NonNull; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
@@ -43,24 +45,154 @@ | |
| * @version 1 (14.10.22) | ||
| */ | ||
| public class JavaCompilerCheckFacade { | ||
| private JavaCompilerCheckFacade() { | ||
| /* This utility class should not be instantiated */ | ||
| } | ||
|
|
||
| private static final Logger LOGGER = LoggerFactory.getLogger(JavaCompilerCheckFacade.class); | ||
|
|
||
| /** | ||
| * This main method be exclusively used by `checkExternally` to perform javac checks | ||
| */ | ||
| public static void main(String[] args) { | ||
| try (var input = new InputStreamReader(System.in)) { | ||
| var params = Configuration.load(CharStreams.fromReader(input)); | ||
|
|
||
| var settings = new JavacSettings(); | ||
| settings.readSettings(params); | ||
|
|
||
| var result = check(null, | ||
PiIsRational marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| Paths.get(params.getString("bootClassPath")), | ||
| params.getStringList("classPath").stream().map(Paths::get).toList(), | ||
| Paths.get(params.getString("javaPath")), settings).get(); | ||
|
|
||
| var out = new Configuration(); | ||
| out.set("messages", | ||
| result.stream().map(it -> { | ||
| var map = Map.of( | ||
| "message", it.text, | ||
| "kind", it.getKind().toString(), | ||
| "line", it.location.getPosition().line(), | ||
| "column", it.location.getPosition().column(), | ||
| "additionalInfo", it.getAdditionalInfo()); | ||
| if (it.location.fileUri() != null) { | ||
| map = new TreeMap<>(map); | ||
| map.put("fileUri", it.location.fileUri().toString()); | ||
| } | ||
| return map; | ||
| }).toList()); | ||
|
|
||
| // send the data over stderr to not interfere with the log messages | ||
| Writer writer = new OutputStreamWriter(System.err); | ||
| out.save(writer, null); | ||
| writer.close(); | ||
| } catch (Exception e) { | ||
| LOGGER.error("Error during execution.", e); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * initiates the compilation check on the target Java source (the Java program to be verified) | ||
| * in a separate process (with another java runtime) and | ||
| * reports any issues to the provided <code>listener</code> | ||
| * | ||
| * @param listener the {@link ProblemInitializer.ProblemInitializerListener} to be informed | ||
| * about any issues found in the target Java program | ||
| * @param bootClassPath the {@link Path} referring to the path containing the core Java classes | ||
| * @param classPath the {@link List} of {@link Path}s referring to the directory that make up | ||
| * the target Java programs classpath | ||
| * @param javaPath the {@link Path} to the source of the target Java program | ||
| * @param settings the {@link JavacSettings} that describe what other options the compiler | ||
| * should be called with | ||
| * @return future providing the list of diagnostics | ||
| */ | ||
| public static @NonNull CompletableFuture<List<PositionedIssueString>> checkExternally( | ||
| ProblemInitializer.ProblemInitializerListener listener, | ||
| Path bootClassPath, List<Path> classPath, Path javaPath, | ||
| JavacSettings settings) { | ||
| if (Boolean.getBoolean("KEY_JAVAC_DISABLE")) { | ||
| LOGGER.info("Javac check is disabled by system property -PKEY_JAVAC_DISABLE"); | ||
| return CompletableFuture.completedFuture(Collections.emptyList()); | ||
| } | ||
| LOGGER.info( | ||
| "External Javac check is triggered. To disable use property -PKEY_JAVAC_DISABLE=true"); | ||
| var params = new Configuration(); | ||
| params.set("bootClassPath", Objects.toString(bootClassPath)); | ||
| params.set("classPath", | ||
| classPath.stream().map(Path::toAbsolutePath).map(Path::toString).toList()); | ||
| params.set("javaPath", Objects.toString(javaPath)); | ||
| settings.writeSettings(params); | ||
|
|
||
| String classpath = System.getProperty("java.class.path"); | ||
| String path = | ||
| Paths.get(System.getProperty("java.home"), "bin", "java").toAbsolutePath().toString(); | ||
| ProcessBuilder processBuilder = | ||
| new ProcessBuilder(path, | ||
| "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED", | ||
| "--add-exports", "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED", | ||
| "--add-exports", "jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED", | ||
| "--add-exports", "jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED", | ||
| "--add-exports", "jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED", | ||
| "--add-exports", "jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED", | ||
| "--add-exports", "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED", | ||
| "--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED", | ||
| "--add-opens", "jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED", | ||
| "-cp", | ||
| classpath, | ||
| JavaCompilerCheckFacade.class.getCanonicalName()); | ||
| return CompletableFuture.supplyAsync(() -> { | ||
| try { | ||
| var process = processBuilder.start(); | ||
| params.save(process.outputWriter(), null); | ||
| process.outputWriter().close(); | ||
|
|
||
| // the KeY logging messages from `process` (currently not used) | ||
| var logs = Streams.toString(process.getInputStream()); | ||
| var messages = Configuration.load(CharStreams.fromStream(process.getErrorStream())); | ||
PiIsRational marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| process.waitFor(); | ||
|
|
||
| return messages.getList("messages").stream() | ||
| .map(msgObj -> { | ||
| Configuration msg = (Configuration) msgObj; | ||
| return new PositionedIssueString( | ||
| msg.getString("message"), | ||
| new Location( | ||
| msg.exists("fileUri") | ||
| ? URI.create(msg.getString("fileUri")) | ||
| : null, | ||
| msg.getInt("line") == -1 || msg.getInt("column") == -1 | ||
| ? Position.UNDEFINED | ||
| : Position.newOneBased( | ||
| msg.getInt("line"), | ||
| msg.getInt("column"))), | ||
| msg.getString("additionalInfo"), | ||
| PositionedIssueString.Kind.valueOf(msg.getString("kind"))); | ||
| }).toList(); | ||
| } catch (IOException | InterruptedException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * initiates the compilation check on the target Java source (the Java program to be verified) | ||
| * and | ||
| * reports any issues to the provided <code>listener</code> | ||
| * | ||
| * @param listener the {@link ProblemInitializer.ProblemInitializerListener} to be informed | ||
| * about any issues found in the target Java program | ||
| * @param bootClassPath the {@link File} referring to the path containing the core Java classes | ||
| * @param classPath the {@link List} of {@link File}s referring to the directory that make up | ||
| * @param bootClassPath the {@link Path} referring to the path containing the core Java classes | ||
| * @param classPath the {@link List} of {@link Path}s referring to the directory that make up | ||
| * the target Java programs classpath | ||
| * @param javaPath the {@link String} with the path to the source of the target Java program | ||
| * @param javaPath the {@link Path} to the source of the target Java program | ||
| * @param settings the {@link JavacSettings} that describe what other options the compiler | ||
| * should be called with | ||
| * @return future providing the list of diagnostics | ||
| */ | ||
| public static @NonNull CompletableFuture<List<PositionedIssueString>> check( | ||
| ProblemInitializer.ProblemInitializerListener listener, | ||
|
||
| Path bootClassPath, List<Path> classPath, Path javaPath) { | ||
| Path bootClassPath, List<Path> classPath, Path javaPath, | ||
| JavacSettings settings) { | ||
| if (Boolean.getBoolean("KEY_JAVAC_DISABLE")) { | ||
| LOGGER.info("Javac check is disabled by system property -PKEY_JAVAC_DISABLE"); | ||
| return CompletableFuture.completedFuture(Collections.emptyList()); | ||
|
|
@@ -72,7 +204,9 @@ public class JavaCompilerCheckFacade { | |
|
|
||
| if (compiler == null) { | ||
| LOGGER.info("Javac is not available in current java runtime. Javac check skipped"); | ||
| listener.reportStatus(null, "No javac compiler found. Java check disabled."); | ||
| if (listener != null) { | ||
| listener.reportStatus(null, "No javac compiler found. Java check disabled."); | ||
| } | ||
| return CompletableFuture.completedFuture(Collections.emptyList()); | ||
| } | ||
|
|
||
|
|
@@ -86,17 +220,46 @@ public class JavaCompilerCheckFacade { | |
|
|
||
| // gather configured bootstrap classpath and regular classpath | ||
| List<String> options = new ArrayList<>(); | ||
|
|
||
| if (settings.getUseProcessors()) { | ||
| String newlineClassPath = settings.getClassPaths(); | ||
| List<Path> processorClassPath = | ||
| Arrays.asList(newlineClassPath.split(System.lineSeparator())) | ||
| .stream() | ||
| .filter(s -> !s.isBlank()) | ||
| .map(Paths::get) | ||
| .toList(); | ||
|
|
||
| if (!processorClassPath.isEmpty()) { | ||
| classPath = new ArrayList<>(classPath); | ||
| classPath.addAll(processorClassPath); | ||
| } | ||
|
|
||
| List<String> processors = | ||
| Arrays.asList(settings.getProcessors().split(System.lineSeparator())) | ||
| .stream() | ||
| .filter(s -> !s.isBlank()) | ||
| .toList(); | ||
|
|
||
| if (!processors.isEmpty()) { | ||
| options.add("-processor"); | ||
| options.add(processors.stream().collect(Collectors.joining(","))); | ||
| } | ||
| } | ||
|
|
||
| if (bootClassPath != null) { | ||
| options.add("-Xbootclasspath"); | ||
| options.add("-bootclasspath"); | ||
| options.add(bootClassPath.toAbsolutePath().toString()); | ||
| } | ||
|
|
||
| if (classPath != null && !classPath.isEmpty()) { | ||
| options.add("-classpath"); | ||
| options.add( | ||
| classPath.stream().map(Path::toAbsolutePath) | ||
| .map(Objects::toString) | ||
| .collect(Collectors.joining(":"))); | ||
| } | ||
|
|
||
| ArrayList<Path> files = new ArrayList<>(); | ||
| if (Files.isDirectory(javaPath)) { | ||
| try (var s = Files.walk(javaPath)) { | ||
|
|
@@ -127,7 +290,9 @@ public class JavaCompilerCheckFacade { | |
| it -> new PositionedIssueString( | ||
| it.getMessage(Locale.ENGLISH), | ||
| new Location( | ||
| fileManager.asPath(it.getSource()).toFile().toPath().toUri(), | ||
| it.getSource() == null | ||
| ? null | ||
| : fileManager.asPath(it.getSource()).toFile().toPath().toUri(), | ||
| it.getPosition() != Diagnostic.NOPOS | ||
| ? Position.newOneBased((int) it.getLineNumber(), | ||
| (int) it.getColumnNumber()) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.