Skip to content
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

fix issue #1440, #1472: wrap BasedFileManager for jdk9 #1495

Merged
merged 4 commits into from
Oct 25, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Robbert Jan Grootjans <grootjans@gmail.com>
Roel Spilker <r.spilker@gmail.com>
Sander Koning <askoning@gmail.com>
Szymon Pacanowski <spacanowski@gmail.com>
Takuya Murakami <tmurakam@tmurakam.org>
Taiki Sugawara <buzz.taiki@gmail.com>
Thomas Darimont <thomas.darimont@gmail.com>
Yun Zhi Lin <yun@yunspace.com>
Expand Down
95 changes: 95 additions & 0 deletions src/core/lombok/javac/apt/LombokFileObjects.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,22 @@

package lombok.javac.apt;

import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.net.URI;
import java.nio.charset.Charset;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;

import javax.tools.FileObject;
import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
import javax.tools.JavaFileObject.Kind;
import javax.tools.StandardLocation;

import lombok.core.DiagnosticsReceiver;

Expand Down Expand Up @@ -120,6 +126,9 @@ static Compiler getCompiler(JavaFileManager jfm) {
Class<?> superType = Class.forName("com.sun.tools.javac.file.BaseFileManager");
if (superType.isInstance(wrappedManager)) {
return new Java9Compiler(wrappedManager);
} else {
String encoding = getEncodingOf(wrappedManager);
return new Java9Compiler(new BaseFileManagerWrapper(wrappedManager, encoding != null ? Charset.forName(encoding) : null));
}
}
catch (Exception e) {}
Expand All @@ -142,6 +151,92 @@ static Compiler getCompiler(JavaFileManager jfm) {
}
throw new IllegalArgumentException(sb.toString());
}

private static String getEncodingOf(JavaFileManager manager) {
try {
// FileObject may be instance of org.jetbrains.jps.javac.OutputFileObject
FileObject fo = manager.getFileForOutput(StandardLocation.CLASS_OUTPUT, "", "dummy", null);
Field encodingField = fo.getClass().getDeclaredField("myEncodingName");
encodingField.setAccessible(true);
return (String)encodingField.get(fo);
} catch (Exception e) {
return null;
}
}

static class BaseFileManagerWrapper extends BaseFileManager {
JavaFileManager manager;

public BaseFileManagerWrapper(JavaFileManager manager, Charset charset) {
super(charset);
this.manager = manager;
}

@Override
public int isSupportedOption(String option) {
return manager.isSupportedOption(option);
}

@Override
public ClassLoader getClassLoader(Location location) {
return manager.getClassLoader(location);
}

@Override
public Iterable<JavaFileObject> list(Location location, String packageName, Set<Kind> kinds, boolean recurse) throws IOException {
return manager.list(location, packageName, kinds, recurse);
}

@Override
public String inferBinaryName(Location location, JavaFileObject file) {
return manager.inferBinaryName(location, file);
}

@Override
public boolean isSameFile(FileObject a, FileObject b) {
return manager.isSameFile(a, b);
}

@Override
public boolean handleOption(String current, Iterator<String> remaining) {
return manager.handleOption(current, remaining);
}

@Override
public boolean hasLocation(Location location) {
return manager.hasLocation(location);
}

@Override
public JavaFileObject getJavaFileForInput(Location location, String className, Kind kind) throws IOException {
return manager.getJavaFileForInput(location, className, kind);
}

@Override
public JavaFileObject getJavaFileForOutput(Location location, String className, Kind kind, FileObject sibling) throws IOException {
return manager.getJavaFileForOutput(location, className, kind, sibling);
}

@Override
public FileObject getFileForInput(Location location, String packageName, String relativeName) throws IOException {
return manager.getFileForInput(location, packageName, relativeName);
}

@Override
public FileObject getFileForOutput(Location location, String packageName, String relativeName, FileObject sibling) throws IOException {
return manager.getFileForOutput(location, packageName, relativeName, sibling);
}

@Override
public void flush() throws IOException {
manager.flush();
}

@Override
public void close() throws IOException {
manager.close();
}
}

static JavaFileObject createEmpty(Compiler compiler, String name, Kind kind) {
return compiler.wrap(new EmptyLombokFileObject(name, kind));
Expand Down
5 changes: 4 additions & 1 deletion src/stubs/com/sun/tools/javac/file/BaseFileManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@
package com.sun.tools.javac.file;

import javax.tools.JavaFileManager;
import java.nio.charset.Charset;

public abstract class BaseFileManager implements JavaFileManager{}
public abstract class BaseFileManager implements JavaFileManager {
protected BaseFileManager(Charset charset) {}
}