From fc309beaf15bb005be1e5724392f443960b4eb2d Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Thu, 6 Apr 2017 17:56:11 +0300 Subject: [PATCH] javac ast indices: update JavacFileData serializer to support member definitions --- .../org/jetbrains/jps/javac/ast/api/JavacFileData.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacFileData.java b/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacFileData.java index 6691b117c785..664cf08360f2 100644 --- a/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacFileData.java +++ b/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacFileData.java @@ -158,6 +158,10 @@ public class JavacFileData { return new JavacDef.JavacClassDef(readJavacRef(in), superClasses); case FUN_EXPR_MARKER: return new JavacDef.JavacFunExprDef(readJavacRef(in)); + case METHOD_MARKER: + JavacRef retType = readJavacRef(in); + boolean isStatic = in.readBoolean(); + return new JavacDef.JavacMemberDef(readJavacRef(in), retType, isStatic); default: throw new IllegalStateException("unknown marker " + marker); } @@ -175,6 +179,11 @@ public class JavacFileData { else if (def instanceof JavacDef.JavacFunExprDef) { out.writeByte(FUN_EXPR_MARKER); } + else if (def instanceof JavacDef.JavacMemberDef) { + out.writeByte(METHOD_MARKER); + writeJavacRef(out, ((JavacDef.JavacMemberDef)def).getReturnType()); + out.writeBoolean(((JavacDef.JavacMemberDef)def).isStatic()); + } else { throw new IllegalStateException("unknown type: " + def.getClass()); }