Merge branch '2018.1' into dev

Author: DenWav

gradle.properties

@@ -8,9 +8,9 @@
 # MIT License
 #
 # suppress inspection "UnusedProperty" for whole file
-ideaVersion = 2017.3.5
+ideaVersion = 181-EAP-SNAPSHOT
 javaVersion = 1.8
 
 group = com.demonwav.minecraft-dev
-version = 2017.3-1.2.0
+version = 2018.1-1.2.0
 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/)|
 | **AppVeyor (Windows)** |[![AppVeyor Windows Build Status](https://ci.appveyor.com/api/projects/status/p2qp6iinqvf4im64/branch/dev?svg=true)](https://ci.appveyor.com/project/DemonWav/minecraftdev/branch/dev)|
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-2017.3--1.2.0-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-2018.1--1.2.0-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
 ----------------------
 
 Visit [https://minecraftdev.org](https://minecraftdev.org) for some information about the project, FAQs, and chat.

src/main/kotlin/com/demonwav/mcdev/error/IdeaITNProxy.kt

@@ -13,7 +13,7 @@ package com.demonwav.mcdev.error
 import com.intellij.errorreport.bean.ErrorBean
 import com.intellij.openapi.application.ApplicationNamesInfo
 import com.intellij.openapi.application.ex.ApplicationInfoEx
-import com.intellij.util.SystemProperties
+import com.intellij.openapi.util.SystemInfo
 
 object IdeaITNProxy {
     fun getKeyValuePairs(error: ErrorBean,
@@ -26,9 +26,9 @@ object IdeaITNProxy {
         params["Plugin Name"] = error.pluginName
         params["Plugin Version"] = error.pluginVersion
 
-        params["OS Name"] = SystemProperties.getOsName()
-        params["Java Version"] = SystemProperties.getJavaVersion()
-        params["Java VM Vendor"] = SystemProperties.getJavaVmVendor()
+        params["OS Name"] = SystemInfo.OS_NAME
+        params["Java Version"] = SystemInfo.JAVA_VERSION
+        params["Java VM Vendor"] = SystemInfo.JAVA_VENDOR
 
         params["App Name"] = namesInfo.productName
         params["App Full Name"] = namesInfo.fullProductName

src/main/kotlin/com/demonwav/mcdev/facet/MinecraftFacet.kt

@@ -21,13 +21,13 @@ import com.demonwav.mcdev.platform.sponge.SpongeModuleType
 import com.demonwav.mcdev.util.containsAllKeys
 import com.demonwav.mcdev.util.filterNotNull
 import com.demonwav.mcdev.util.mapFirstNotNull
-import com.demonwav.mcdev.util.runInlineReadAction
 import com.google.common.collect.HashMultimap
 import com.intellij.facet.Facet
 import com.intellij.facet.FacetManager
 import com.intellij.facet.FacetTypeId
 import com.intellij.facet.FacetTypeRegistry
 import com.intellij.ide.projectView.ProjectView
+import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.roots.ModuleRootManager
@@ -210,7 +210,7 @@ class MinecraftFacet(module: Module, name: String, configuration: MinecraftFacet
 
         fun getInstance(module: Module) = FacetManager.getInstance(module).getFacetByType(ID)
 
-        fun getChildInstances(module: Module) = runInlineReadAction run@{
+        fun getChildInstances(module: Module) = runReadAction run@{
             val instance = getInstance(module)
             if (instance != null) {
                 return@run setOf(instance)

src/main/kotlin/com/demonwav/mcdev/facet/MinecraftFacetConfiguration.kt

@@ -15,8 +15,8 @@ import com.intellij.facet.FacetConfiguration
 import com.intellij.facet.ui.FacetEditorContext
 import com.intellij.facet.ui.FacetValidatorsManager
 import com.intellij.openapi.components.PersistentStateComponent
-import com.intellij.util.xmlb.annotations.AbstractCollection
 import com.intellij.util.xmlb.annotations.Tag
+import com.intellij.util.xmlb.annotations.XCollection
 import org.jdom.Element
 
 class MinecraftFacetConfiguration : FacetConfiguration, PersistentStateComponent<MinecraftFacetConfigurationData> {
@@ -40,7 +40,7 @@ data class MinecraftFacetConfigurationData(
     @Tag("userChosenTypes")
     var userChosenTypes: MutableMap<PlatformType, Boolean> = mutableMapOf(),
     @Tag("autoDetectTypes")
-    @AbstractCollection(surroundWithTag = false, elementTag = "platformType", elementValueAttribute = "")
+    @XCollection(elementName = "platformType", valueAttributeName = "", style = XCollection.Style.v2)
     var autoDetectTypes: MutableSet<PlatformType> = mutableSetOf(),
     @Tag("forgePatcher")
     var forgePatcher: Boolean = false

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

@@ -12,13 +12,13 @@ package com.demonwav.mcdev.platform.forge.gradle
 
 import com.demonwav.mcdev.buildsystem.gradle.GradleBuildSystem
 import com.demonwav.mcdev.util.invokeLater
-import com.demonwav.mcdev.util.runInlineReadAction
 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
 import com.intellij.openapi.externalSystem.model.project.ProjectData
@@ -49,7 +49,7 @@ class ForgeRunConfigDataService : AbstractProjectDataService<ProjectData, Projec
         }
 
         val (moduleName, sizeText) = try {
-            runInlineReadAction {
+            runReadAction {
                 hello.inputStream.bufferedReader().use { it.readText() }.split("\n")
             }
         } finally {

src/main/kotlin/com/demonwav/mcdev/platform/forge/inspections/sideonly/SideOnlyProjectComponent.kt

@@ -14,8 +14,8 @@ import com.demonwav.mcdev.facet.MinecraftFacet
 import com.demonwav.mcdev.platform.forge.ForgeModuleType
 import com.demonwav.mcdev.platform.forge.util.ForgeConstants
 import com.demonwav.mcdev.util.AbstractProjectComponent
-import com.demonwav.mcdev.util.runInlineReadAction
 import com.intellij.facet.ProjectFacetManager
+import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.progress.Task
@@ -38,10 +38,10 @@ class SideOnlyProjectComponent(project: Project) : AbstractProjectComponent(proj
             DumbService.getInstance(project).smartInvokeLater {
                 ProgressManager.getInstance().run(object : Task.Backgroundable(project, "Indexing @SidedProxy", true, null) {
                     override fun run(indicator: ProgressIndicator) {
-                        runInlineReadAction {
+                        runReadAction {
                             indicator.isIndeterminate = true
                             val scope = GlobalSearchScope.projectScope(myProject)
-                            val sidedProxy = JavaPsiFacade.getInstance(myProject).findClass(ForgeConstants.SIDED_PROXY_ANNOTATION, scope) ?: return
+                            val sidedProxy = JavaPsiFacade.getInstance(myProject).findClass(ForgeConstants.SIDED_PROXY_ANNOTATION, scope) ?: return@runReadAction
                             val annotatedFields = AnnotatedElementsSearch.searchPsiFields(sidedProxy, scope).findAll()
 
                             indicator.isIndeterminate = false

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

@@ -23,7 +23,7 @@ import com.intellij.openapi.actionSystem.CommonDataKeys.CARET
 import com.intellij.openapi.actionSystem.CommonDataKeys.EDITOR
 import com.intellij.openapi.actionSystem.CommonDataKeys.PROJECT
 import com.intellij.openapi.actionSystem.CommonDataKeys.PSI_FILE
-import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.progress.runBackgroundableTask
 import com.intellij.openapi.wm.ToolWindowAnchor
 import com.intellij.openapi.wm.ToolWindowManager
@@ -52,9 +52,9 @@ class FindMixinsAction : AnAction() {
             runBackgroundableTask("Searching for Mixins", project, true) run@ { indicator ->
                 indicator.isIndeterminate = true
 
-                val classes = ApplicationManager.getApplication().acquireReadActionLock().use {
+                val classes = runReadAction {
                     val mixinAnnotation = JavaPsiFacade.getInstance(project).findClass(MixinConstants.Annotations.MIXIN,
-                            GlobalSearchScope.allScope(project)) ?: return@use null
+                            GlobalSearchScope.allScope(project)) ?: return@runReadAction null
 
                     // Check all classes with the Mixin annotation
                     val classes = AnnotatedElementsSearch.searchPsiClasses(mixinAnnotation,

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

@@ -19,6 +19,7 @@ import com.demonwav.mcdev.util.findLastChild
 import com.demonwav.mcdev.util.findNextMember
 import com.demonwav.mcdev.util.ifEmpty
 import com.demonwav.mcdev.util.toTypedArray
+import com.intellij.application.options.CodeStyle
 import com.intellij.codeInsight.generation.GenerateMembersUtil
 import com.intellij.codeInsight.generation.GenerationInfo
 import com.intellij.codeInsight.generation.OverrideImplementUtil
@@ -45,8 +46,7 @@ import com.intellij.psi.PsiModifier
 import com.intellij.psi.PsiModifierList
 import com.intellij.psi.PsiModifierListOwner
 import com.intellij.psi.PsiSubstitutor
-import com.intellij.psi.codeStyle.CodeStyleSettings
-import com.intellij.psi.codeStyle.CodeStyleSettingsManager
+import com.intellij.psi.codeStyle.CommonCodeStyleSettings
 import java.util.stream.Stream
 import kotlin.streams.toList
 
@@ -207,11 +207,11 @@ private fun copyAnnotation(modifiers: PsiModifierList, newModifiers: PsiModifier
 }
 
 inline fun disableAnnotationWrapping(project: Project, func: () -> Unit) {
-    val settings = CodeStyleSettingsManager.getSettings(project).getCommonSettings(JavaLanguage.INSTANCE)
+    val settings = CodeStyle.getSettings(project).getCommonSettings(JavaLanguage.INSTANCE)
     val methodWrap = settings.METHOD_ANNOTATION_WRAP
     val fieldWrap = settings.FIELD_ANNOTATION_WRAP
-    settings.METHOD_ANNOTATION_WRAP = CodeStyleSettings.DO_NOT_WRAP
-    settings.FIELD_ANNOTATION_WRAP = CodeStyleSettings.DO_NOT_WRAP
+    settings.METHOD_ANNOTATION_WRAP = CommonCodeStyleSettings.DO_NOT_WRAP
+    settings.FIELD_ANNOTATION_WRAP = CommonCodeStyleSettings.DO_NOT_WRAP
 
     try {
         func()

src/main/kotlin/com/demonwav/mcdev/platform/mixin/search/MixinSoftImplementMethodSuperSearcher.kt

@@ -11,7 +11,7 @@
 package com.demonwav.mcdev.platform.mixin.search
 
 import com.demonwav.mcdev.platform.mixin.util.findSoftImplementedMethods
-import com.demonwav.mcdev.util.runInlineReadAction
+import com.intellij.openapi.application.runReadAction
 import com.intellij.psi.CommonClassNames
 import com.intellij.psi.PsiModifier
 import com.intellij.psi.search.searches.SuperMethodsSearch
@@ -34,19 +34,19 @@ class MixinSoftImplementMethodSuperSearcher : QueryExecutor<MethodSignatureBacke
         // This is very simple and probably doesn't handle all cases
         // Right now we simply check for @Implements annotation on the class and look
         // for a similar method in the interface
-        runInlineReadAction {
+        runReadAction run@ {
             if (!method.name.contains('$') || method.hasModifierProperty(PsiModifier.STATIC)) {
-                return true
+                return@run true
             }
 
             // Don't return anything if method has an @Override annotation because that would be an error
             if (method.modifierList.findAnnotation(CommonClassNames.JAVA_LANG_OVERRIDE) != null) {
-                return true
+                return@run true
             }
 
             method.findSoftImplementedMethods(checkBases) {
                 if (!consumer.process(it.hierarchicalMethodSignature)) {
-                    return false
+                    return@run false
                 }
             }
         }