More 182 branch mentioning remove
#KT-33536 Fixed
This commit is contained in:
-5
@@ -100,13 +100,8 @@
|
|||||||
<list>
|
<list>
|
||||||
<Problem reference="com.intellij.util.JdomKt#element" reason="Removed in 191" />
|
<Problem reference="com.intellij.util.JdomKt#element" reason="Removed in 191" />
|
||||||
<Problem reference="com.intellij.execution.JavaRunConfigurationExtensionManager#getInstance" reason="Can't be used in Kotlin, because method was replaced with property after J2K in 183. Use JavaRunConfigurationExtensionManagerUtil instead." />
|
<Problem reference="com.intellij.execution.JavaRunConfigurationExtensionManager#getInstance" reason="Can't be used in Kotlin, because method was replaced with property after J2K in 183. Use JavaRunConfigurationExtensionManagerUtil instead." />
|
||||||
<Problem reference="org.jetbrains.java.decompiler.main.decompiler.BaseDecompiler#addSpace" reason="Method was replaced with outher methods in 182. Use addSpaceEx instead." />
|
|
||||||
<Problem reference="com.intellij.openapi.ui.popup.PopupChooserBuilder#PopupChooserBuilder(javax.swing.JList)" reason="Generified in 182. Use PopupChooserBuilderWrapper instead." />
|
|
||||||
<Problem reference="com.intellij.openapi.diagnostic.LoggerKt#debugOrInfoIfTestMode" reason="Absent in 182." />
|
|
||||||
<Problem reference="com.intellij.psi.search.PsiSearchHelper.SERVICE" reason="Deprecated since 182. Use psiSearchHelperInstance() instead." />
|
|
||||||
<Problem reference="org.jetbrains.kotlin.idea.reporter.ITNReporterCompat#submit" reason="parentComponent is nullable in AS" />
|
<Problem reference="org.jetbrains.kotlin.idea.reporter.ITNReporterCompat#submit" reason="parentComponent is nullable in AS" />
|
||||||
<Problem reference="com.intellij.diagnostic.ITNReporter#submit" reason="parentComponent is nullable in AS" />
|
<Problem reference="com.intellij.diagnostic.ITNReporter#submit" reason="parentComponent is nullable in AS" />
|
||||||
<Problem reference="com.intellij.codeInspection.dataFlow.Nullness" reason="Deprecated since 182. Use org.jetbrains.kotlin.idea.util.compat.Nullability instead." />
|
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</inspection_tool>
|
</inspection_tool>
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import com.intellij.formatting.ASTBlock
|
|||||||
import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
|
import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ASTBlock is nullable since 182, this extension was introduced to minimize changes between bunches
|
* ASTBlock.node is nullable, this extension was introduced to minimize changes
|
||||||
*/
|
*/
|
||||||
fun ASTBlock.requireNode() = node ?: error("ASTBlock.getNode() returned null")
|
fun ASTBlock.requireNode() = node ?: error("ASTBlock.getNode() returned null")
|
||||||
|
|
||||||
|
|||||||
@@ -212,15 +212,6 @@ class ScriptDefinitionsManager(private val project: Project) : LazyScriptDefinit
|
|||||||
return emptyList()
|
return emptyList()
|
||||||
}
|
}
|
||||||
|
|
||||||
@Suppress("unused") // used in the 182/as33 bunches
|
|
||||||
fun getDefinitionsBy(source: ScriptDefinitionsSource): List<ScriptDefinition> = lock.write {
|
|
||||||
if (definitions == null) return emptyList() // not loaded yet
|
|
||||||
|
|
||||||
if (source !in definitionsBySource) error("Unknown source: ${source::class.java.name}")
|
|
||||||
|
|
||||||
return definitionsBySource[source] ?: emptyList()
|
|
||||||
}
|
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
fun getInstance(project: Project): ScriptDefinitionsManager =
|
fun getInstance(project: Project): ScriptDefinitionsManager =
|
||||||
ServiceManager.getService(project, ScriptDefinitionProvider::class.java) as ScriptDefinitionsManager
|
ServiceManager.getService(project, ScriptDefinitionProvider::class.java) as ScriptDefinitionsManager
|
||||||
|
|||||||
+2
-2
@@ -45,7 +45,7 @@ import com.intellij.util.containers.ContainerUtil
|
|||||||
import com.intellij.util.containers.ContainerUtilRt
|
import com.intellij.util.containers.ContainerUtilRt
|
||||||
import junit.framework.TestCase
|
import junit.framework.TestCase
|
||||||
import org.jetbrains.kotlin.idea.codeInsight.gradle.GradleImportingTestCase
|
import org.jetbrains.kotlin.idea.codeInsight.gradle.GradleImportingTestCase
|
||||||
import org.jetbrains.kotlin.idea.configuration.*
|
import org.jetbrains.kotlin.idea.configuration.KotlinGradleAbstractMultiplatformModuleBuilder
|
||||||
import org.jetbrains.kotlin.utils.PrintingLogger
|
import org.jetbrains.kotlin.utils.PrintingLogger
|
||||||
import org.jetbrains.plugins.gradle.service.execution.GradleExecutionHelper
|
import org.jetbrains.plugins.gradle.service.execution.GradleExecutionHelper
|
||||||
import org.jetbrains.plugins.gradle.settings.DistributionType
|
import org.jetbrains.plugins.gradle.settings.DistributionType
|
||||||
@@ -93,7 +93,7 @@ abstract class AbstractGradleMultiplatformWizardTest : ProjectWizardTestCase<Abs
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val oldFactory = getLoggerFactory()
|
val oldFactory = Logger.getFactory().javaClass
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Logger.setFactory(PrintingFactory::class.java)
|
Logger.setFactory(PrintingFactory::class.java)
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
|
||||||
* 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.gradle
|
|
||||||
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import java.lang.reflect.Modifier
|
|
||||||
|
|
||||||
// BUNCH: 182
|
|
||||||
internal fun getLoggerFactory(): Class<out Logger.Factory> {
|
|
||||||
return Logger.getFactory().javaClass
|
|
||||||
}
|
|
||||||
@@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.idea.debugger
|
package org.jetbrains.kotlin.idea.debugger
|
||||||
|
|
||||||
|
import com.intellij.debugger.engine.AsyncStackTraceProvider
|
||||||
import com.intellij.debugger.engine.JavaValue
|
import com.intellij.debugger.engine.JavaValue
|
||||||
import com.intellij.debugger.memory.utils.StackFrameItem
|
import com.intellij.debugger.memory.utils.StackFrameItem
|
||||||
import com.intellij.execution.process.ProcessOutputTypes
|
import com.intellij.execution.process.ProcessOutputTypes
|
||||||
@@ -31,9 +32,7 @@ import java.lang.reflect.Modifier
|
|||||||
abstract class AbstractAsyncStackTraceTest : KotlinDebuggerTestBase() {
|
abstract class AbstractAsyncStackTraceTest : KotlinDebuggerTestBase() {
|
||||||
private companion object {
|
private companion object {
|
||||||
const val MARGIN = " "
|
const val MARGIN = " "
|
||||||
|
val ASYNC_STACKTRACE_EP_NAME = AsyncStackTraceProvider.EP.name
|
||||||
// Absent in 182, should be AsyncStackTraceProvider.EP.name
|
|
||||||
const val ASYNC_STACKTRACE_EP_NAME = "com.intellij.debugger.asyncStackTraceProvider"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected fun doTest(path: String) {
|
protected fun doTest(path: String) {
|
||||||
|
|||||||
+1
-2
@@ -117,8 +117,7 @@ public class MockUpdateParameterInfoContext implements UpdateParameterInfoContex
|
|||||||
return myFixture.getEditor();
|
return myFixture.getEditor();
|
||||||
}
|
}
|
||||||
|
|
||||||
//@Override since 183
|
@Override
|
||||||
//add `@Override` when BUNCH: 182 is dropped
|
|
||||||
public boolean isSingleParameterInfo() {
|
public boolean isSingleParameterInfo() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user