Replace deprecated classes with parent
This commit is contained in:
@@ -17,11 +17,11 @@
|
|||||||
package org.jetbrains.kotlin.idea;
|
package org.jetbrains.kotlin.idea;
|
||||||
|
|
||||||
import com.intellij.openapi.application.ApplicationManager;
|
import com.intellij.openapi.application.ApplicationManager;
|
||||||
import com.intellij.openapi.components.ApplicationComponent;
|
import com.intellij.openapi.components.BaseComponent;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.kotlin.idea.debugger.filter.DebuggerFiltersUtilKt;
|
import org.jetbrains.kotlin.idea.debugger.filter.DebuggerFiltersUtilKt;
|
||||||
|
|
||||||
public class JvmPluginStartupComponent implements ApplicationComponent {
|
public class JvmPluginStartupComponent implements BaseComponent {
|
||||||
public static JvmPluginStartupComponent getInstance() {
|
public static JvmPluginStartupComponent getInstance() {
|
||||||
return ApplicationManager.getApplication().getComponent(JvmPluginStartupComponent.class);
|
return ApplicationManager.getApplication().getComponent(JvmPluginStartupComponent.class);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ import com.intellij.diagnostic.PluginException;
|
|||||||
import com.intellij.ide.plugins.PluginManagerCore;
|
import com.intellij.ide.plugins.PluginManagerCore;
|
||||||
import com.intellij.openapi.application.ApplicationManager;
|
import com.intellij.openapi.application.ApplicationManager;
|
||||||
import com.intellij.openapi.compiler.*;
|
import com.intellij.openapi.compiler.*;
|
||||||
import com.intellij.openapi.components.AbstractProjectComponent;
|
import com.intellij.openapi.components.ProjectComponent;
|
||||||
import com.intellij.openapi.diagnostic.Logger;
|
import com.intellij.openapi.diagnostic.Logger;
|
||||||
import com.intellij.openapi.project.Project;
|
import com.intellij.openapi.project.Project;
|
||||||
import com.intellij.openapi.util.io.FileUtilRt;
|
import com.intellij.openapi.util.io.FileUtilRt;
|
||||||
@@ -38,7 +38,7 @@ import java.util.Set;
|
|||||||
import static org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX;
|
import static org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX;
|
||||||
import static org.jetbrains.kotlin.config.CompilerRunnerConstants.KOTLIN_COMPILER_NAME;
|
import static org.jetbrains.kotlin.config.CompilerRunnerConstants.KOTLIN_COMPILER_NAME;
|
||||||
|
|
||||||
public class KotlinCompilerManager extends AbstractProjectComponent {
|
public class KotlinCompilerManager implements ProjectComponent {
|
||||||
private static final Logger LOG = Logger.getInstance(KotlinCompilerManager.class);
|
private static final Logger LOG = Logger.getInstance(KotlinCompilerManager.class);
|
||||||
|
|
||||||
// Comes from external make
|
// Comes from external make
|
||||||
@@ -46,7 +46,6 @@ public class KotlinCompilerManager extends AbstractProjectComponent {
|
|||||||
private static final Set<String> FILE_EXTS_WHICH_NEEDS_REFRESH = ContainerUtil.immutableSet(JavaScript.DOT_EXTENSION, ".map");
|
private static final Set<String> FILE_EXTS_WHICH_NEEDS_REFRESH = ContainerUtil.immutableSet(JavaScript.DOT_EXTENSION, ".map");
|
||||||
|
|
||||||
public KotlinCompilerManager(Project project, CompilerManager manager) {
|
public KotlinCompilerManager(Project project, CompilerManager manager) {
|
||||||
super(project);
|
|
||||||
manager.addCompilableFileType(KotlinFileType.INSTANCE);
|
manager.addCompilableFileType(KotlinFileType.INSTANCE);
|
||||||
manager.addCompilationStatusListener(new CompilationStatusListener() {
|
manager.addCompilationStatusListener(new CompilationStatusListener() {
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+2
-2
@@ -6,7 +6,7 @@
|
|||||||
package org.jetbrains.kotlin.ide.konan.decompiler
|
package org.jetbrains.kotlin.ide.konan.decompiler
|
||||||
|
|
||||||
import com.intellij.openapi.application.ApplicationManager
|
import com.intellij.openapi.application.ApplicationManager
|
||||||
import com.intellij.openapi.components.ApplicationComponent
|
import com.intellij.openapi.components.BaseComponent
|
||||||
import com.intellij.openapi.vfs.VirtualFile
|
import com.intellij.openapi.vfs.VirtualFile
|
||||||
import com.intellij.util.containers.ContainerUtil.createConcurrentWeakValueMap
|
import com.intellij.util.containers.ContainerUtil.createConcurrentWeakValueMap
|
||||||
import org.jetbrains.kotlin.konan.library.KLIB_METADATA_FILE_EXTENSION
|
import org.jetbrains.kotlin.konan.library.KLIB_METADATA_FILE_EXTENSION
|
||||||
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.metadata.konan.KonanProtoBuf
|
|||||||
import org.jetbrains.kotlin.serialization.konan.parseModuleHeader
|
import org.jetbrains.kotlin.serialization.konan.parseModuleHeader
|
||||||
import org.jetbrains.kotlin.serialization.konan.parsePackageFragment
|
import org.jetbrains.kotlin.serialization.konan.parsePackageFragment
|
||||||
|
|
||||||
class KotlinNativeLoadingMetadataCache : ApplicationComponent {
|
class KotlinNativeLoadingMetadataCache : BaseComponent {
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea;
|
|||||||
|
|
||||||
import com.intellij.openapi.application.ApplicationManager;
|
import com.intellij.openapi.application.ApplicationManager;
|
||||||
import com.intellij.openapi.application.PathMacros;
|
import com.intellij.openapi.application.PathMacros;
|
||||||
import com.intellij.openapi.components.ApplicationComponent;
|
import com.intellij.openapi.components.BaseComponent;
|
||||||
import com.intellij.openapi.components.ServiceManager;
|
import com.intellij.openapi.components.ServiceManager;
|
||||||
import com.intellij.openapi.diagnostic.Logger;
|
import com.intellij.openapi.diagnostic.Logger;
|
||||||
import com.intellij.openapi.editor.EditorFactory;
|
import com.intellij.openapi.editor.EditorFactory;
|
||||||
@@ -38,7 +38,7 @@ import java.io.IOException;
|
|||||||
|
|
||||||
import static org.jetbrains.kotlin.idea.TestResourceBundleKt.registerAdditionalResourceBundleInTests;
|
import static org.jetbrains.kotlin.idea.TestResourceBundleKt.registerAdditionalResourceBundleInTests;
|
||||||
|
|
||||||
public class PluginStartupComponent implements ApplicationComponent {
|
public class PluginStartupComponent implements BaseComponent {
|
||||||
private static final Logger LOG = Logger.getInstance(PluginStartupComponent.class);
|
private static final Logger LOG = Logger.getInstance(PluginStartupComponent.class);
|
||||||
|
|
||||||
private static final String KOTLIN_BUNDLED = "KOTLIN_BUNDLED";
|
private static final String KOTLIN_BUNDLED = "KOTLIN_BUNDLED";
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import com.intellij.openapi.diagnostic.Logger
|
|||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
import com.intellij.openapi.fileEditor.FileEditorManager
|
import com.intellij.openapi.fileEditor.FileEditorManager
|
||||||
import com.intellij.openapi.fileEditor.OpenFileDescriptor
|
import com.intellij.openapi.fileEditor.OpenFileDescriptor
|
||||||
|
import com.intellij.openapi.ui.popup.IPopupChooserBuilder
|
||||||
import com.intellij.openapi.ui.popup.PopupChooserBuilder
|
import com.intellij.openapi.ui.popup.PopupChooserBuilder
|
||||||
import com.intellij.openapi.util.TextRange
|
import com.intellij.openapi.util.TextRange
|
||||||
import com.intellij.psi.PsiClass
|
import com.intellij.psi.PsiClass
|
||||||
@@ -214,17 +215,17 @@ abstract class ImplementAbstractMemberIntentionBase :
|
|||||||
cellRenderer = renderer
|
cellRenderer = renderer
|
||||||
}
|
}
|
||||||
val builder = PopupChooserBuilder<PsiElement>(list)
|
val builder = PopupChooserBuilder<PsiElement>(list)
|
||||||
renderer.installSpeedSearch(builder)
|
renderer.installSpeedSearch(builder as IPopupChooserBuilder<*>)
|
||||||
builder
|
builder
|
||||||
.setTitle(CodeInsightBundle.message("intention.implement.abstract.method.class.chooser.title"))
|
.setTitle(CodeInsightBundle.message("intention.implement.abstract.method.class.chooser.title"))
|
||||||
.setItemChoosenCallback {
|
.setItemChoosenCallback {
|
||||||
val index = list.selectedIndex
|
val index = list.selectedIndex
|
||||||
if (index < 0) return@setItemChoosenCallback
|
if (index < 0) return@setItemChoosenCallback
|
||||||
@Suppress("UNCHECKED_CAST")
|
@Suppress("UNCHECKED_CAST")
|
||||||
implementInClass(element, list.selectedValues.toList() as List<KtClassOrObject>)
|
implementInClass(element, list.selectedValues.toList() as List<KtClassOrObject>)
|
||||||
}
|
}
|
||||||
.createPopup()
|
.createPopup()
|
||||||
.showInBestPositionFor(editor)
|
.showInBestPositionFor(editor)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.versions
|
|||||||
|
|
||||||
import com.intellij.ide.util.PropertiesComponent
|
import com.intellij.ide.util.PropertiesComponent
|
||||||
import com.intellij.openapi.application.ApplicationManager
|
import com.intellij.openapi.application.ApplicationManager
|
||||||
import com.intellij.openapi.components.ApplicationComponent
|
import com.intellij.openapi.components.BaseComponent
|
||||||
import com.intellij.openapi.vfs.JarFileSystem
|
import com.intellij.openapi.vfs.JarFileSystem
|
||||||
import com.intellij.openapi.vfs.LocalFileSystem
|
import com.intellij.openapi.vfs.LocalFileSystem
|
||||||
import com.intellij.openapi.vfs.VfsUtilCore
|
import com.intellij.openapi.vfs.VfsUtilCore
|
||||||
@@ -33,7 +33,7 @@ private val INSTALLED_KOTLIN_VERSION = "installed.kotlin.plugin.version"
|
|||||||
* Component forces update for built-in libraries in plugin directory. They are ignored because of
|
* Component forces update for built-in libraries in plugin directory. They are ignored because of
|
||||||
* com.intellij.util.indexing.FileBasedIndex.isUnderConfigOrSystem()
|
* com.intellij.util.indexing.FileBasedIndex.isUnderConfigOrSystem()
|
||||||
*/
|
*/
|
||||||
class KotlinUpdatePluginComponent : ApplicationComponent {
|
class KotlinUpdatePluginComponent : BaseComponent {
|
||||||
override fun initComponent() {
|
override fun initComponent() {
|
||||||
if (ApplicationManager.getApplication()?.isUnitTestMode == true) {
|
if (ApplicationManager.getApplication()?.isUnitTestMode == true) {
|
||||||
return
|
return
|
||||||
|
|||||||
Reference in New Issue
Block a user