Remove obsolete bunch fixes for 173 & as31

This commit is contained in:
Vyacheslav Gerasimov
2019-01-14 16:26:55 +03:00
parent b1f25874d8
commit 2157c777b3
11 changed files with 10 additions and 114 deletions
@@ -1,17 +0,0 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.core.formatter
import com.intellij.psi.codeStyle.CommonCodeStyleSettings
/**
* Method copyFrom is absent in 173.
* BUNCH: 181
*/
fun CommonCodeStyleSettings.copyFromEx(source: CommonCodeStyleSettings) {
@Suppress("IncompatibleAPI")
copyFrom(source)
}
@@ -21,7 +21,6 @@ import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.idea.core.formatter.CompatibilityKt;
import org.jetbrains.kotlin.idea.util.FormatterUtilKt;
import org.jetbrains.kotlin.idea.util.ReflectionUtil;
@@ -237,7 +236,7 @@ public class KotlinCommonCodeStyleSettings extends CommonCodeStyleSettings {
public void restore() {
if (settingsAgainstPreviousDefaults != null) {
CompatibilityKt.copyFromEx(this, settingsAgainstPreviousDefaults);
copyFrom(settingsAgainstPreviousDefaults);
}
}