4 files changed, 56 insertions, 11 deletions
diff --git a/src/delombok/lombok/delombok/Delombok.java b/src/delombok/lombok/delombok/Delombok.java
index f64e36a1..059bb004 100644
--- a/src/delombok/lombok/delombok/Delombok.java
+++ b/src/delombok/lombok/delombok/Delombok.java
@@ -509,7 +509,7 @@ public class Delombok {
 			DelombokResult result = new DelombokResult(catcher.getComments(unit), unit, force || options.isChanged(unit), fps);
 			if (verbose) feedback.printf("File: %s [%s]\n", unit.sourcefile.getName(), result.isChanged() ? "delomboked" : "unchanged");
 			Writer rawWriter;
-			if (presetWriter != null) rawWriter = presetWriter;
+			if (presetWriter != null) rawWriter = createUnicodeEscapeWriter(presetWriter);
 			else if (output == null) rawWriter = createStandardOutWriter();
 			else rawWriter = createFileWriter(output, baseMap.get(unit), unit.sourcefile.toUri());
 			BufferedWriter writer = new BufferedWriter(rawWriter);
@@ -605,6 +605,10 @@ public class Delombok {
 		return createUnicodeEscapeWriter(System.out);
 	}
 	
+	private Writer createUnicodeEscapeWriter(Writer writer) {
+		return new UnicodeEscapeWriter(writer, charset);
+	}
+	
 	private Writer createUnicodeEscapeWriter(OutputStream out) {
 		return new UnicodeEscapeWriter(new OutputStreamWriter(out, charset), charset);
 	}
diff --git a/src/delombok/lombok/delombok/DelombokApp.java b/src/delombok/lombok/delombok/DelombokApp.java
index 276bd7de..aa753fc8 100644
--- a/src/delombok/lombok/delombok/DelombokApp.java
+++ b/src/delombok/lombok/delombok/DelombokApp.java
@@ -88,7 +88,7 @@ public class DelombokApp extends LombokApp {
 		// Since we only read from it, not closing it should not be a problem.
 		@SuppressWarnings({"resource", "all"}) final JarFile toolsJarFile = new JarFile(toolsJar);
 		
-		ClassLoader loader = new ClassLoader() {
+		ClassLoader loader = new ClassLoader(DelombokApp.class.getClassLoader()) {
 			private Class<?> loadStreamAsClass(String name, boolean resolve, InputStream in) throws ClassNotFoundException {
 				try {
 					try {
@@ -107,16 +107,24 @@ public class DelombokApp extends LombokApp {
 					} finally {
 						in.close();
 					}
-				} catch (IOException e2) {
+				} catch (Exception e2) {
 					throw new ClassNotFoundException(name, e2);
 				}
 			}
 			
 			@Override protected synchronized Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-				String rawName = name.replace(".", "/") + ".class";
+				String rawName, altName; {
+					String binName = name.replace(".", "/");
+					rawName = binName + ".class";
+					altName = binName + ".SCL.lombok";
+				}
 				JarEntry entry = toolsJarFile.getJarEntry(rawName);
 				if (entry == null) {
-					if (name.startsWith("lombok.")) return loadStreamAsClass(name, resolve, super.getResourceAsStream(rawName));
+					if (name.startsWith("lombok.")) {
+						InputStream res = getParent().getResourceAsStream(rawName);
+						if (res == null) res = getParent().getResourceAsStream(altName);
+						return loadStreamAsClass(name, resolve, res);
+					}
 					return super.loadClass(name, resolve);
 				}
 				
diff --git a/src/delombok/lombok/delombok/PrettyCommentsPrinter.java b/src/delombok/lombok/delombok/PrettyCommentsPrinter.java
index 9dd7e40e..72a8ff59 100644
--- a/src/delombok/lombok/delombok/PrettyCommentsPrinter.java
+++ b/src/delombok/lombok/delombok/PrettyCommentsPrinter.java
@@ -104,7 +104,6 @@ import com.sun.tools.javac.tree.JCTree.LetExpr;
 import com.sun.tools.javac.tree.JCTree.TypeBoundKind;
 import com.sun.tools.javac.tree.TreeInfo;
 import com.sun.tools.javac.tree.TreeScanner;
-import com.sun.tools.javac.util.Convert;
 import com.sun.tools.javac.util.List;
 import com.sun.tools.javac.util.Name;
 import com.sun.tools.javac.util.Position;
@@ -209,7 +208,6 @@ public class PrettyCommentsPrinter extends JCTree.Visitor {
 	
 	private void consumeComments(int until, JCTree tree) throws IOException {
 		boolean prevNewLine = onNewLine;
-		boolean found = false;
 		CommentInfo head = comments.head;
 		while (comments.nonEmpty() && head.pos < until) {
 			printComment(head);
@@ -355,7 +353,7 @@ public class PrettyCommentsPrinter extends JCTree.Visitor {
 		}
 		needsSpace = false;
 		
-		out.write(Convert.escapeUnicode(s.toString()));
+		out.write(s.toString());
 		
 		onNewLine = false;
 		aligned = false;
@@ -1413,16 +1411,51 @@ public class PrettyCommentsPrinter extends JCTree.Visitor {
 			else if (CTC_FLOAT.equals(typeTag)) print(tree.value + "F");
 			else if (CTC_DOUBLE.equals(typeTag)) print(tree.value.toString());
 			else if (CTC_CHAR.equals(typeTag)) {
-				print("\'" + Convert.quote(String.valueOf((char)((Number)tree.value).intValue())) + "\'");
+				print("\'" + quoteChar((char)((Number)tree.value).intValue()) + "\'");
 			}
 			else if (CTC_BOOLEAN.equals(typeTag)) print(((Number)tree.value).intValue() == 1 ? "true" : "false");
 			else if (CTC_BOT.equals(typeTag)) print("null");
-			else print("\"" + Convert.quote(tree.value.toString()) + "\"");
+			else print("\"" + quoteChars(tree.value.toString()) + "\"");
 		} catch (IOException e) {
 			throw new UncheckedIOException(e);
 		}
 	}
 	
+	public static String quoteChars(String s) {
+		StringBuilder buf = new StringBuilder();
+		for (int i = 0; i < s.length(); i++) {
+			buf.append(quoteChar(s.charAt(i)));
+		}
+		return buf.toString();
+	}
+	
+	/**
+	 * Escapes a character if it has an escape sequence or is non-printable
+	 * ASCII. Leaves non-ASCII characters alone.
+	 */
+	public static String quoteChar(char ch) {
+		switch (ch) {
+		case '\b':
+			return "\\b";
+		case '\f':
+			return "\\f";
+		case '\n':
+			return "\\n";
+		case '\r':
+			return "\\r";
+		case '\t':
+			return "\\t";
+		case '\'':
+			return "\\'";
+		case '\"':
+			return "\\\"";
+		case '\\':
+			return "\\\\";
+		default:
+			return ch < 32 ? String.format("\\%03o", (int) ch) : String.valueOf(ch);
+		}
+	}
+	
 	public void visitTypeIdent(JCPrimitiveTypeTree tree) {
 		TypeTag typetag = typeTag(tree);
 		try {
diff --git a/src/delombok/lombok/delombok/UnicodeEscapeWriter.java b/src/delombok/lombok/delombok/UnicodeEscapeWriter.java
index 95b55078..9c2ef190 100644
--- a/src/delombok/lombok/delombok/UnicodeEscapeWriter.java
+++ b/src/delombok/lombok/delombok/UnicodeEscapeWriter.java
@@ -63,6 +63,6 @@ public class UnicodeEscapeWriter extends Writer {
 	}
 	
 	protected void writeUnicodeEscape(char c) throws IOException {
-		writer.write("\\u" + Integer.toHexString(c));
+		writer.write(String.format("\\u%04x", (int) c));
 	}
 }
 \ No newline at end of file