summaryrefslogtreecommitdiff
path: root/plugins/kotlin/plugin/resources/META-INF/kotlin-core.xml
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/kotlin/plugin/resources/META-INF/kotlin-core.xml')
-rw-r--r--plugins/kotlin/plugin/resources/META-INF/kotlin-core.xml58
1 files changed, 19 insertions, 39 deletions
diff --git a/plugins/kotlin/plugin/resources/META-INF/kotlin-core.xml b/plugins/kotlin/plugin/resources/META-INF/kotlin-core.xml
index 032a5fe88f9e..5259aa82e62d 100644
--- a/plugins/kotlin/plugin/resources/META-INF/kotlin-core.xml
+++ b/plugins/kotlin/plugin/resources/META-INF/kotlin-core.xml
@@ -208,9 +208,9 @@
<search.topHitProvider implementation="org.jetbrains.kotlin.idea.editor.KotlinEditorOptionsTopHitProvider"/>
- <psi.classFileDecompiler implementation="org.jetbrains.kotlin.idea.decompiler.classFile.KotlinClassFileDecompiler"/>
+ <psi.classFileDecompiler implementation="org.jetbrains.kotlin.analysis.decompiler.psi.KotlinClassFileDecompiler"/>
<psi.classFileDecompiler implementation="org.jetbrains.kotlin.idea.decompiler.js.KotlinJavaScriptMetaFileDecompiler"/>
- <psi.classFileDecompiler implementation="org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInDecompiler"/>
+ <psi.classFileDecompiler implementation="org.jetbrains.kotlin.analysis.decompiler.psi.KotlinBuiltInDecompiler"/>
<moduleConfigurationEditorProvider implementation="org.jetbrains.kotlin.idea.roots.ui.NonJvmKotlinModuleEditorsProvider"/>
@@ -366,51 +366,26 @@
displayType="STICKY_BALLOON"
key="kotlin.external.compiler.updates.notification.group.name"
/>
+ <notificationGroup
+ id="Kotlin EAP Survey"
+ displayType="STICKY_BALLOON"
+ key="kotlin.eap.survey.notification.group.name"
+ />
+ <notificationGroup
+ id="Kotlin Maven project import"
+ displayType="STICKY_BALLOON"
+ key="configuration.maven.group.name"
+ />
</extensions>
<!-- Navigation -->
<extensions defaultExtensionNs="com.intellij">
- <navbar implementation="org.jetbrains.kotlin.idea.navigationToolbar.KotlinNavBarModelExtension" order="first"/>
<applicationService
serviceInterface="org.jetbrains.kotlin.psi.KotlinReferenceProvidersService"
serviceImplementation="org.jetbrains.kotlin.idea.references.KtIdeReferenceProviderService"/>
- <psi.referenceContributor
- implementation="org.jetbrains.kotlin.idea.references.KotlinWebReferenceContributor"/>
- <psi.referenceContributor
- id="kotlinFilePathReferenceContributor"
- language="kotlin"
- implementation="org.jetbrains.kotlin.idea.references.KotlinFilePathReferenceContributor"/>
- </extensions>
-
- <!-- Formatter -->
- <extensions defaultExtensionNs="com.intellij">
- <lang.formatter language="kotlin" implementationClass="org.jetbrains.kotlin.idea.formatter.KotlinFormattingModelBuilder"/>
-
- <lineIndentProvider implementation="org.jetbrains.kotlin.idea.formatter.KotlinLineIndentProvider"/>
-
- <preFormatProcessor implementation="org.jetbrains.kotlin.idea.formatter.KotlinPreFormatProcessor"/>
-
- <postFormatProcessor implementation="org.jetbrains.kotlin.idea.formatter.TrailingCommaPostFormatProcessor"/>
- <langCodeStyleSettingsProvider implementation="org.jetbrains.kotlin.idea.formatter.KotlinLanguageCodeStyleSettingsProvider"/>
-
- <codeStyleSettingsProvider implementation="org.jetbrains.kotlin.idea.formatter.KotlinGenerationSettingsProvider"/>
-
- <predefinedCodeStyle implementation="org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle"/>
- <predefinedCodeStyle implementation="org.jetbrains.kotlin.idea.formatter.KotlinObsoleteCodeStyle"/>
-
- <registryKey
- key="kotlin.formatter.allowTrailingCommaInAnyProject"
- description="Allow a trailing comma regardless of plugin version"
- defaultValue="false"
- restartRequired="false"/>
- <registryKey
- key="kotlin.formatter.allowTrailingCommaOnCallSite"
- description="Allow a trailing comma on call-site"
- defaultValue="false"
- restartRequired="false"/>
</extensions>
<!-- Templates -->
@@ -538,9 +513,9 @@
<importFilteringRule implementation="org.jetbrains.kotlin.idea.findUsages.KotlinImportFilteringRule"/>
- <targetElementEvaluator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinTargetElementEvaluator" />
+ <targetElementEvaluator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.search.ideaExtensions.FE10KotlinTargetElementEvaluator" />
- <targetElementUtilExtender implementation="org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinTargetElementEvaluator"/>
+ <targetElementUtilExtender implementation="org.jetbrains.kotlin.idea.search.ideaExtensions.FE10KotlinTargetElementEvaluator"/>
<structuralsearch.profile implementation="org.jetbrains.kotlin.idea.structuralsearch.KotlinStructuralSearchProfile"/>
<structuralsearch.filterProvider implementation="org.jetbrains.kotlin.idea.structuralsearch.filters.KotlinFilterProvider"/>
@@ -556,6 +531,11 @@
<usageTypeProvider implementation="org.jetbrains.kotlin.idea.findUsages.KotlinUsageTypeProviderImpl"/>
<readWriteAccessDetector implementation="org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReadWriteAccessDetector" id="kotlin"/>
+
+ <applicationService
+ serviceInterface="org.jetbrains.kotlin.analysis.decompiled.light.classes.origin.KotlinDeclarationInCompiledFileSearcher"
+ serviceImplementation="org.jetbrains.kotlin.analysis.decompiled.light.classes.fe10.KotlinDeclarationInCompiledFileSearcherFE10Impl"/>
+
</extensions>
<extensions defaultExtensionNs="com.intellij.jvm">