Merge branch 'dev' into 2018.3

Author: DenWav

build.gradle.kts

@@ -23,10 +23,10 @@ buildscript {
 }
 
 plugins {
-    id("org.jetbrains.kotlin.jvm") version "1.2.51" // kept in sync with IntelliJ's bundled dep
+    id("org.jetbrains.kotlin.jvm") version "1.3.0" // kept in sync with IntelliJ's bundled dep
     groovy
     idea
-    id("org.jetbrains.intellij") version "0.3.9"
+    id("org.jetbrains.intellij") version "0.3.12"
     id("net.minecrell.licenser") version "0.4.1"
 }
 
@@ -97,8 +97,7 @@ dependencies {
     "testLibs"("org.spongepowered:mixin:0.7-SNAPSHOT:thin")
 
     // For non-SNAPSHOT versions (unless Jetbrains fixes this...) find the version with:
-    // intellij.ideaDependency.buildNumber.substring(intellij.type.length + 1)
-    "gradle-tooling-extension"("com.jetbrains.intellij.gradle:gradle-tooling-extension:183-EAP-SNAPSHOT")
+    "gradle-tooling-extension"("com.jetbrains.intellij.gradle:gradle-tooling-extension:183.4284.85")
 }
 
 intellij {

gradle.properties

@@ -9,9 +9,9 @@
 #
 
 # suppress inspection "UnusedProperty" for whole file
-ideaVersion = 183-EAP-SNAPSHOT
+ideaVersion = 2018.3
 
 name = MinecraftDev
 group = com.demonwav.minecraft-dev
-version = 2018.3-1.2.10
+version = 2018.3-1.2.11
 downloadIdeaSources = true

readme.md

@@ -11,7 +11,7 @@ Minecraft Development for IntelliJ
 |   **Travis (macOS)**   |[![Travis macOS Build Status](https://travis-matrix-badges.herokuapp.com/repos/minecraft-dev/MinecraftDev/branches/dev/2)](https://travis-ci.org/minecraft-dev/MinecraftDev/)|
 | **TeamCity (Windows)** |[![TeamCity Windows Build Status](https://tc.demonwav.com/app/rest/builds/buildType:(id:MinecraftDev_WindowsBuild)/statusIcon)](https://ci.demonwav.com/viewType.html?buildTypeId=MinecraftDev_WindowsBuild)|
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-2018.3--1.2.10-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-2018.3--1.2.11-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
 ----------------------
 
 <a href="https://discord.gg/j6UNcfr"><img src="https://i.imgur.com/JXu9C1G.png" height="48px"></img></a>

src/main/kotlin/com/demonwav/mcdev/buildsystem/gradle/GradleBuildSystem.kt

@@ -67,7 +67,7 @@ class GradleBuildSystem : BuildSystem() {
     var buildGradle: VirtualFile? = null
 
     override fun create(project: Project, configuration: ProjectConfiguration, indicator: ProgressIndicator) {
-        rootDirectory.refresh(false,  true)
+        rootDirectory.refresh(false, true)
         createDirectories()
 
         if (configuration.type == PlatformType.FORGE || configuration is SpongeForgeProjectConfiguration) {
@@ -204,11 +204,11 @@ class GradleBuildSystem : BuildSystem() {
         element.children.asSequence()
             .filter {
                 // We want to find the child which has a GrReferenceExpression with the right name
-                it.children.any { it is GrReferenceExpression && it.text == name }
+                it.children.any { child -> child is GrReferenceExpression && child.text == name }
             }.map {
                 // We want to find the grandchild which is a GrClosable block, this is the
                 // basis for the method block
-                it.children.mapNotNull { it as? GrClosableBlock }.firstOrNull()
+                it.children.mapNotNull { child -> child as? GrClosableBlock }.firstOrNull()
             }.filterNotNull()
             .firstOrNull()
 
@@ -294,6 +294,8 @@ class GradleBuildSystem : BuildSystem() {
                 requestCreateForgeRunConfigs(project, rootModule, configurations)
             }
 
+            val runManager = RunManager.getInstance(project)
+
             val runConfiguration = ExternalSystemRunConfiguration(
                 GradleConstants.SYSTEM_ID,
                 project,
@@ -306,16 +308,15 @@ class GradleBuildSystem : BuildSystem() {
             runConfiguration.settings.executionName = rootModule.name + " build"
             runConfiguration.settings.taskNames = listOf("build")
 
-            val settings = RunnerAndConfigurationSettingsImpl(
-                RunManagerImpl.getInstanceImpl(project),
+            runConfiguration.isAllowRunningInParallel = false
+
+            val settings = runManager.createConfiguration(
                 runConfiguration,
-                false
+                GradleExternalTaskConfigurationType.getInstance().configurationFactories.first()
             )
 
             settings.isActivateToolWindowBeforeRun = true
-            settings.isSingleton = true
 
-            val runManager = RunManager.getInstance(project)
             runManager.addConfiguration(settings, false)
             if (runManager.selectedConfiguration == null) {
                 runManager.selectedConfiguration = settings

src/main/kotlin/com/demonwav/mcdev/i18n/reference/I18nGotoModel.kt

@@ -23,7 +23,7 @@ import java.util.Locale
 import java.util.TreeSet
 
 class I18nGotoModel(project: Project, val filter: Regex? = null) :
-    ContributorsBasedGotoByModel(project, arrayOf(Extensions.findExtension(ChooseByNameContributor.SYMBOL_EP_NAME, I18nGotoSymbolContributor::class.java))) {
+    ContributorsBasedGotoByModel(project, arrayOf(ChooseByNameContributor.SYMBOL_EP_NAME.findExtensionOrFail(I18nGotoSymbolContributor::class.java))) {
     override fun acceptItem(item: NavigationItem?): Boolean {
         return (item as I18nEntry).containingFile.virtualFile.nameWithoutExtension.toLowerCase(Locale.ROOT) == I18nConstants.DEFAULT_LOCALE
     }

src/main/kotlin/com/demonwav/mcdev/platform/bukkit/BukkitTemplate.kt

@@ -101,6 +101,14 @@ object BukkitTemplate {
             properties.setProperty("HAS_WEBSITE", "true")
         }
 
+        // Plugins targeting 1.13 or newer need an explicit api declaration flag
+        // Unfortunately this flag has no contract to match any specific API version
+        val mcVer = settings.minecraftVersion.substring(0, 4).toDoubleOrNull()
+        if (mcVer != null && mcVer >= 1.13) {
+            properties.setProperty("API_VERSION", "1.13")
+            properties.setProperty("HAS_API_VERSION", "true")
+        }
+
         BaseTemplate.applyTemplate(project, file, MinecraftFileTemplateGroupFactory.BUKKIT_PLUGIN_YML_TEMPLATE, properties, true)
     }
 }

src/main/kotlin/com/demonwav/mcdev/platform/forge/gradle/ForgeRunConfigDataService.kt

@@ -16,8 +16,6 @@ import com.demonwav.mcdev.util.runWriteTaskLater
 import com.intellij.execution.RunManager
 import com.intellij.execution.application.ApplicationConfiguration
 import com.intellij.execution.application.ApplicationConfigurationType
-import com.intellij.execution.impl.RunManagerImpl
-import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl
 import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.externalSystem.model.DataNode
 import com.intellij.openapi.externalSystem.model.ProjectKeys
@@ -76,12 +74,16 @@ class ForgeRunConfigDataService : AbstractProjectDataService<ProjectData, Projec
             }
             val forgeModule = moduleMap[rootModule.name + "-forge"]
 
+            val runManager = RunManager.getInstance(project)
+            val factory = ApplicationConfigurationType.getInstance().configurationFactories.first()
+
             // Client run config
-            val runClientConfiguration = ApplicationConfiguration(
+            val clientSettings = runManager.createConfiguration(
                 (forgeModule ?: rootModule).name + " run client",
-                project,
-                ApplicationConfigurationType.getInstance()
+                factory
             )
+            val runClientConfiguration = clientSettings.configuration as ApplicationConfiguration
+            runClientConfiguration.isAllowRunningInParallel = false
 
             val runningDir = File(project.basePath, "run")
             if (!runningDir.exists()) {
@@ -96,26 +98,18 @@ class ForgeRunConfigDataService : AbstractProjectDataService<ProjectData, Projec
             } else {
                 runClientConfiguration.setModule(mainModule ?: forgeModule ?: rootModule)
             }
-
-            val clientSettings = RunnerAndConfigurationSettingsImpl(
-                RunManagerImpl.getInstanceImpl(project),
-                runClientConfiguration,
-                false
-            )
-
             clientSettings.isActivateToolWindowBeforeRun = true
-            clientSettings.isSingleton = true
 
-            val runManager = RunManager.getInstance(project)
             runManager.addConfiguration(clientSettings, false)
             runManager.selectedConfiguration = clientSettings
 
             // Server run config
-            val runServerConfiguration = ApplicationConfiguration(
+            val serverSettings = runManager.createConfiguration(
                 (forgeModule ?: rootModule).name + " run server",
-                project,
-                ApplicationConfigurationType.getInstance()
+                factory
             )
+            val runServerConfiguration = serverSettings.configuration as ApplicationConfiguration
+            runServerConfiguration.isAllowRunningInParallel = false
 
             runServerConfiguration.mainClassName = "GradleStartServer"
             runServerConfiguration.programParameters = "nogui"
@@ -127,14 +121,7 @@ class ForgeRunConfigDataService : AbstractProjectDataService<ProjectData, Projec
                 runServerConfiguration.setModule(mainModule ?: forgeModule ?: rootModule)
             }
 
-            val serverSettings = RunnerAndConfigurationSettingsImpl(
-                RunManagerImpl.getInstanceImpl(project),
-                runServerConfiguration,
-                false
-            )
-
             serverSettings.isActivateToolWindowBeforeRun = true
-            serverSettings.isSingleton = true
             runManager.addConfiguration(serverSettings, false)
         }
     }

src/main/kotlin/com/demonwav/mcdev/platform/mixin/action/GenerateShadowAction.kt

@@ -33,6 +33,7 @@ import com.intellij.ide.util.MemberChooser
 import com.intellij.lang.java.JavaLanguage
 import com.intellij.openapi.application.runWriteAction
 import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.extensions.ExtensionPointName
 import com.intellij.openapi.extensions.Extensions
 import com.intellij.openapi.project.Project
 import com.intellij.psi.CommonClassNames
@@ -189,7 +190,7 @@ private fun copyModifiers(modifiers: PsiModifierList, newModifiers: PsiModifierL
 
 private fun copyAnnotations(file: PsiFile, modifiers: PsiModifierList, newModifiers: PsiModifierList) {
     // Copy annotations registered by extensions (e.g. @Nullable), based on OverrideImplementUtil.annotateOnOverrideImplement
-    for (ext in Extensions.getExtensions(OverrideImplementsAnnotationsHandler.EP_NAME)) {
+    for (ext in OverrideImplementsAnnotationsHandler.EP_NAME.extensionList) {
         for (annotation in ext.getAnnotations(file)) {
             copyAnnotation(modifiers, newModifiers, annotation)
         }

src/main/kotlin/com/demonwav/mcdev/util/ModuleDebugRunConfigurationExtension.kt

@@ -23,28 +23,28 @@ import org.jdom.Element
 
 abstract class ModuleDebugRunConfigurationExtension : RunConfigurationExtension() {
 
-    override fun isApplicableFor(configuration: RunConfigurationBase): Boolean {
-        return configuration is ModuleBasedConfiguration<*>
+    override fun isApplicableFor(configuration: RunConfigurationBase<*>): Boolean {
+        return configuration is ModuleBasedConfiguration<*, *>
     }
 
-    override fun <T : RunConfigurationBase?> updateJavaParameters(configuration: T, params: JavaParameters?, runnerSettings: RunnerSettings?) {}
+    override fun <T : RunConfigurationBase<*>?> updateJavaParameters(configuration: T, params: JavaParameters?, runnerSettings: RunnerSettings?) {}
 
     protected abstract fun attachToProcess(handler: ProcessHandler, module: Module)
 
-    override fun attachToProcess(configuration: RunConfigurationBase, handler: ProcessHandler, runnerSettings: RunnerSettings?) {
+    override fun attachToProcess(configuration: RunConfigurationBase<*>, handler: ProcessHandler, runnerSettings: RunnerSettings?) {
         // Check if we are in a debug run
         if (runnerSettings !is DebuggingRunnerData) {
             return
         }
 
-        val config = configuration as ModuleBasedConfiguration<*>
+        val config = configuration as ModuleBasedConfiguration<*, *>
         val module = config.configurationModule.module ?: return
         attachToProcess(handler, module)
     }
 
-    override fun readExternal(runConfiguration: RunConfigurationBase, element: Element) {}
+    override fun readExternal(runConfiguration: RunConfigurationBase<*>, element: Element) {}
 
     override fun getEditorTitle(): String? = null
-    override fun <P : RunConfigurationBase?> createEditor(configuration: P): SettingsEditor<P>? = null
+    override fun <P : RunConfigurationBase<*>?> createEditor(configuration: P): SettingsEditor<P>? = null
 
 }

src/main/kotlin/com/demonwav/mcdev/util/class-utils.kt

@@ -174,7 +174,7 @@ fun PsiElement.getAnonymousIndex(anonymousElement: PsiElement): Int {
 @get:Contract(pure = true)
 val PsiElement.anonymousElements: Array<PsiElement>
     get() {
-        for (provider in Extensions.getExtensions(AnonymousElementProvider.EP_NAME)) {
+        for (provider in AnonymousElementProvider.EP_NAME.extensionList) {
             val elements = provider.getAnonymousElements(this)
             if (elements.isNotEmpty()) {
                 return elements