azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not serialize/deserialize CommonCompilerArguments#errors

Browse Source 
This prevents .idea/kotlinc.xml from being added with an empty
ArgumentParseErrors object and also fixes
ConfigureKotlinInTempDirTest.testKotlincExistsNoSettingsRuntime11
This commit is contained in:
Alexander Udalov
2017-04-21 12:57:59 +03:00
parent e0a4f9ba76
commit c9769ab454
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java
+1 -1
View File
@@ -109,7 +109,7 @@ public abstract class CommonCompilerArguments implements Serializable {
public List<String> freeArgs = new SmartList<>(); public List<String> freeArgs = new SmartList<>();
public ArgumentParseErrors errors = new ArgumentParseErrors(); public transient ArgumentParseErrors errors = new ArgumentParseErrors();
@NotNull @NotNull
public static CommonCompilerArguments createDefaultInstance() { public static CommonCompilerArguments createDefaultInstance() {
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/argumentUtils.kt
+1 -1
View File
@@ -79,7 +79,7 @@ fun collectFieldsToCopy(clazz: Class<*>, inheritedOnly: Boolean): List<Field> {
while (currentClass != null) { while (currentClass != null) {
for (field in currentClass.declaredFields) { for (field in currentClass.declaredFields) {
val modifiers = field.modifiers val modifiers = field.modifiers
if (!Modifier.isStatic(modifiers) && Modifier.isPublic(modifiers)) { if (!Modifier.isStatic(modifiers) && Modifier.isPublic(modifiers) && !Modifier.isTransient(modifiers)) {
fromFields.add(field) fromFields.add(field)
} }
} }