Merge branch 'dev' into 2017.2

# Conflicts:
#	gradle.properties
#	readme.md
#	src/main/resources/META-INF/plugin.xml

Author: DenWav

build.gradle.kts

@@ -32,7 +32,7 @@ plugins {
     id("org.jetbrains.kotlin.jvm") version "1.1.1" // kept in sync with IntelliJ's bundled dep
     groovy
     idea
-    id("org.jetbrains.intellij") version "0.2.7"
+    id("org.jetbrains.intellij") version "0.2.13"
     id("net.minecrell.licenser") version "0.3"
 }
 
@@ -91,7 +91,7 @@ java {
     }
 }
 
-val gradleToolingExtension = java().sourceSets["gradle-tooling-extension"]
+val gradleToolingExtension = java().sourceSets["gradle-tooling-extension"]!!
 val gradleToolingExtensionJar = task<Jar>(gradleToolingExtension.jarTaskName) {
     from(gradleToolingExtension.output)
     classifier = "gradle-tooling-extension"

gradle.properties

@@ -13,7 +13,7 @@ javaVersion = 1.8
 kotlinVersion = 1.1.1
 
 group = com.demonwav.minecraft-dev
-version = 2017.2-0.7.2
+version = 2017.2-0.7.3
 downloadIdeaSources = true
 
 org.gradle.script.lang.kotlin.accessors.auto=true

readme.md

@@ -10,7 +10,7 @@ Minecraft Development for IntelliJ
 |**CircleCI**|[![Travis Build Status](https://img.shields.io/circleci/project/github/minecraft-dev/MinecraftDev/dev.svg?style=flat-square)](https://circleci.com/gh/minecraft-dev/MinecraftDev)|
 | **Travis** |[![CircleCI Build Status](https://img.shields.io/travis/minecraft-dev/MinecraftDev/dev.svg?style=flat-square)](https://travis-ci.org/minecraft-dev/MinecraftDev/)|
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-2017.2--0.7.2-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-2017.2--0.7.3-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
 ----------------------
 
 Visit [https://minecraftdev.org](https://minecraftdev.org) for information about the project, change logs, features, FAQs, and chat.

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

@@ -220,15 +220,15 @@ class GradleBuildSystem : BuildSystem() {
     }
 
     private fun createRepositoriesOrDependencies(project: Project, file: GroovyFile, name: String, expressions: List<String>) {
-        // Ge the block so we can start working with it
+        // Get the block so we can start working with it
         val block = getClosableBlockByName(file, name) ?: return
 
         // Create a super expression with all the expressions tied together
         val expressionText = expressions.joinToString("\n")
 
         // We can't create each expression and add them to the file...that won't work. Groovy requires a new line
         // from one method call expression to another, and there's no way to (easily) put whitespace in Psi because Psi is
-        // stupid. So instead we make hte whole thing as one big clump and insert it into the block.
+        // stupid. So instead we make the whole thing as one big clump and insert it into the block.
         val fakeFile = GroovyPsiElementFactory.getInstance(project).createGroovyFile(expressionText, false, null)
         val last = block.children.last()
         block.addBefore(fakeFile, last)

src/main/kotlin/com/demonwav/mcdev/creator/MinecraftModuleBuilder.kt

@@ -55,7 +55,7 @@ class MinecraftModuleBuilder : JavaModuleBuilder() {
         creator.root = root
         creator.module = modifiableRootModel.module
 
-        val r = DumbAwareRunnable { creator.create() }
+        val r = DumbAwareRunnable(creator::create)
 
         if (project.isDisposed) {
             return

src/main/kotlin/com/demonwav/mcdev/creator/MinecraftModuleWizardStep.kt

@@ -12,6 +12,7 @@ package com.demonwav.mcdev.creator
 
 import com.demonwav.mcdev.exception.BadListSetupException
 import com.demonwav.mcdev.exception.EmptyInputSetupException
+import com.demonwav.mcdev.exception.InvalidMainClassNameException
 import com.demonwav.mcdev.exception.SetupException
 import com.intellij.ide.util.projectWizard.ModuleWizardStep
 import com.intellij.openapi.ui.MessageType
@@ -37,9 +38,30 @@ abstract class MinecraftModuleWizardStep : ModuleWizardStep() {
                 throw EmptyInputSetupException(pluginVersionField)
             }
 
+            // empty
             if (mainClassField.text.trim { it <= ' ' }.isEmpty()) {
                 throw EmptyInputSetupException(mainClassField)
             }
+            // default package
+            if (!mainClassField.text.contains('.')) {
+                throw InvalidMainClassNameException(mainClassField)
+            }
+            // crazy dots
+            if (mainClassField.text.split('.').any { it.isEmpty() } ||
+                mainClassField.text.first() == '.' || mainClassField.text.last() == '.') {
+                throw InvalidMainClassNameException(mainClassField)
+            }
+            // invalid character
+            if (mainClassField.text.split('.').any {
+                !it.first().isJavaIdentifierStart() || !it.asSequence().drop(1).all { it.isJavaIdentifierPart() }
+            }) {
+                throw InvalidMainClassNameException(mainClassField)
+            }
+            // keyword identifier
+            if (mainClassField.text.split('.').any { keywords.contains(it) }) {
+                throw InvalidMainClassNameException(mainClassField)
+            }
+
             if (!authorsField.text.matches(pattern)) {
                 throw BadListSetupException(authorsField)
             }
@@ -60,5 +82,11 @@ abstract class MinecraftModuleWizardStep : ModuleWizardStep() {
 
     companion object {
         val pattern = "(\\s*(\\w+)\\s*(,\\s*\\w+\\s*)*,?|\\[?\\s*(\\w+)\\s*(,\\s*\\w+\\s*)*])?".toRegex()
+        val keywords = setOf(
+            "abstract", "continue", "for", "new", "switch", "assert", "default", "goto", "package", "synchronized", "boolean", "do", "if",
+            "private", "this", "break", "double", "implements", "protected", "throw", "byte", "else", "import", "public", "throws", "case",
+            "enum", "instanceof", "return", "transient", "catch", "extends", "int", "short", "try", "char", "final", "interface", "static",
+            "void", "class", "finally", "long", "strictfp", "volatile", "const", "float", "native", "super", "while"
+        )
     }
 }

src/main/kotlin/com/demonwav/mcdev/creator/PlatformVersion.kt

@@ -11,6 +11,7 @@
 package com.demonwav.mcdev.creator
 
 import com.demonwav.mcdev.platform.PlatformType
+import com.demonwav.mcdev.util.fromJson
 import com.google.gson.Gson
 import org.jetbrains.concurrency.runAsync
 import java.net.URL
@@ -44,7 +45,7 @@ fun getVersionSelector(type: PlatformType) = runAsync {
         "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.4; en-US; rv:1.9.2.2) Gecko/20100316 Firefox/3.6.2"
     )
     val text = connection.getInputStream().use { it.reader().use { it.readText() } }
-    Gson().fromJson(text, PlatformVersion::class.java)
+    Gson().fromJson<PlatformVersion>(text)
 }
 
 data class PlatformVersion(var versions: Array<String>, var selectedIndex: Int) {

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

@@ -11,6 +11,7 @@
 package com.demonwav.mcdev.error
 
 import com.demonwav.mcdev.update.PluginUtil
+import com.demonwav.mcdev.util.fromJson
 import com.google.gson.Gson
 import com.intellij.ide.plugins.PluginManager
 import org.apache.commons.io.IOUtils
@@ -19,8 +20,20 @@ import java.net.URL
 
 object AnonymousFeedback {
 
-    fun sendFeedback(factory: HttpConnectionFactory, envDetails: LinkedHashMap<String, String?>): Int {
-        return sendFeedback(factory, convertToGitHubIssueFormat(envDetails))
+    data class FeedbackData(val url: String, val token: Int, val isDuplicate: Boolean)
+
+    const val url = "https://www.demonwav.com/errorReport"
+
+    fun sendFeedback(factory: HttpConnectionFactory, envDetails: LinkedHashMap<String, String?>): FeedbackData {
+        val duplicateId = findDuplicateIssue(envDetails)
+        if (duplicateId != null) {
+            // This is a duplicate
+            val commentUrl = sendCommentOnDuplicateIssue(duplicateId, factory, convertToGitHubIssueFormat(envDetails))
+            return FeedbackData(commentUrl, duplicateId, true)
+        }
+
+        val (htmlUrl, token) = sendFeedback(factory, convertToGitHubIssueFormat(envDetails))
+        return FeedbackData(htmlUrl, token, false)
     }
 
     private fun convertToGitHubIssueFormat(envDetails: LinkedHashMap<String, String?>): ByteArray {
@@ -62,22 +75,8 @@ object AnonymousFeedback {
         return sb.toString()
     }
 
-    private fun sendFeedback(factory: HttpConnectionFactory, payload: ByteArray): Int {
-        val url = "https://www.demonwav.com/errorReport"
-        var userAgent = "Minecraft Development IntelliJ IDEA plugin"
-
-        val pluginDescriptor = PluginManager.getPlugin(PluginUtil.PLUGIN_ID)
-        if (pluginDescriptor != null) {
-            val name = pluginDescriptor.name
-            val version = pluginDescriptor.version
-            userAgent = "$name ($version)"
-        }
-
-        val connection = connect(factory, url)
-        connection.doOutput = true
-        connection.requestMethod = "POST"
-        connection.setRequestProperty("User-Agent", userAgent)
-        connection.setRequestProperty("Content-Type", "application/json")
+    private fun sendFeedback(factory: HttpConnectionFactory, payload: ByteArray): Pair<String, Int> {
+        val connection = getConnection(factory, url)
         connection.outputStream.use {
             it.write(payload)
         }
@@ -92,9 +91,8 @@ object AnonymousFeedback {
             IOUtils.toString(it, contentEncoding)
         }
 
-        val json = Gson().fromJson(body, HashMap::class.java)
-        val issueNum = json["number"].toString().toDouble().toInt()
-        return issueNum
+        val json = Gson().fromJson<Map<*, *>>(body)
+        return json["html_url"] as String to (json["number"] as Double).toInt()
     }
 
     private fun connect(factory: HttpConnectionFactory, url: String): HttpURLConnection {
@@ -104,9 +102,69 @@ object AnonymousFeedback {
         return connection
     }
 
-    open class HttpConnectionFactory {
-        open fun openHttpConnection(url: String): HttpURLConnection {
-            return URL(url).openConnection() as HttpURLConnection
+    private fun findDuplicateIssue(envDetails: LinkedHashMap<String, String?>): Int? {
+        val stack = envDetails["error.stacktrace"]?.replace("\\d+".toRegex(), "") ?: return null
+
+        val text = URL("https://api.github.com/repos/minecraft-dev/MinecraftDev/issues?state=all&creator=minecraft-dev-autoreporter").readText()
+        val list = Gson().fromJson<List<Map<*, *>>>(text)
+        val block = list.firstOrNull {
+            val body = it["body"] as? String ?: return@firstOrNull false
+
+            // We can't comment on locked issues
+            if (it["locked"] as Boolean) {
+                return@firstOrNull false
+            }
+
+            val first = body.indexOf("\n```\n", startIndex = 0) + 5
+            val second = body.indexOf("\n```\n", startIndex = first)
+            val stackText = body.substring(first, second)
+
+            stackText.replace("\\d+".toRegex(), "") == stack
+        } ?: return null
+        return (block["number"] as Double).toInt()
+    }
+
+    private fun sendCommentOnDuplicateIssue(id: Int, factory: HttpConnectionFactory, payload: ByteArray): String {
+        val commentUrl = "$url/$id/comments"
+        val connection = getConnection(factory, commentUrl)
+        connection.outputStream.use {
+            it.write(payload)
         }
+
+        val responseCode = connection.responseCode
+        if (responseCode != 201) {
+            throw RuntimeException("Expected HTTP_CREATED (201), obtained $responseCode instead.")
+        }
+
+        val contentEncoding = connection.contentEncoding ?: "UTF-8"
+        val body = connection.inputStream.use {
+            IOUtils.toString(it, contentEncoding)
+        }
+
+        val json = Gson().fromJson<Map<*, *>>(body)
+        return json["html_url"] as String
+    }
+
+    private fun getConnection(factory: HttpConnectionFactory, url: String): HttpURLConnection {
+        var userAgent = "Minecraft Development IntelliJ IDEA plugin"
+
+        val pluginDescription = PluginManager.getPlugin(PluginUtil.PLUGIN_ID)
+        if (pluginDescription != null) {
+            val name = pluginDescription.name
+            val version = pluginDescription.version
+            userAgent = "$name ($version)"
+        }
+
+        val connection = connect(factory, url)
+        connection.doOutput = true
+        connection.requestMethod = "POST"
+        connection.setRequestProperty("User-Agent", userAgent)
+        connection.setRequestProperty("Content-Type", "application/json")
+
+        return connection
+    }
+
+    open class HttpConnectionFactory {
+        open fun openHttpConnection(url: String) = URL(url).openConnection() as HttpURLConnection
     }
 }

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

@@ -14,31 +14,28 @@ import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.progress.Task
 import com.intellij.openapi.project.Project
 import com.intellij.util.net.HttpConfigurable
-import java.net.HttpURLConnection
 
 class AnonymousFeedbackTask(
     project: Project?,
     title: String,
     canBeCancelled: Boolean,
     private val params: LinkedHashMap<String, String?>,
-    private val callback: (Int) -> Unit,
+    private val callback: (String, Int, Boolean) -> Unit,
     private val errorCallback: (Exception) -> Unit
 ) : Task.Backgroundable(project, title, canBeCancelled) {
 
     override fun run(indicator: ProgressIndicator) {
         indicator.isIndeterminate = true
 
         try {
-            val token = AnonymousFeedback.sendFeedback(ProxyHttpConnectionFactory(), params)
-            callback(token)
+            val (url, token, isDuplicate) = AnonymousFeedback.sendFeedback(ProxyHttpConnectionFactory(), params)
+            callback(url, token, isDuplicate)
         } catch (e: Exception) {
             errorCallback(e)
         }
     }
 
     private inner class ProxyHttpConnectionFactory : AnonymousFeedback.HttpConnectionFactory() {
-        override fun openHttpConnection(url: String): HttpURLConnection {
-            return HttpConfigurable.getInstance().openHttpConnection(url)
-        }
+        override fun openHttpConnection(url: String) = HttpConfigurable.getInstance().openHttpConnection(url)
     }
 }

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

@@ -31,7 +31,7 @@ import com.intellij.util.Consumer
 import java.awt.Component
 
 class ErrorReporter : ErrorReportSubmitter() {
-    val baseUrl = "https://github.com/minecraft-dev/MinecraftDev/issues"
+    private val baseUrl = "https://github.com/minecraft-dev/MinecraftDev/issues"
     override fun getReportActionText() = "Report to Minecraft Dev GitHub Issue Tracker"
 
     override fun submit(events: Array<out IdeaLoggingEvent>,
@@ -68,13 +68,17 @@ class ErrorReporter : ErrorReportSubmitter() {
 
         val project = CommonDataKeys.PROJECT.getData(dataContext)
 
-        val task = AnonymousFeedbackTask(project, "Submitting error report", true, reportValues, { token ->
-            val url = "$baseUrl/$token"
-            val reportInfo = SubmittedReportInfo(url, "Issue #$token", SubmittedReportInfo.SubmissionStatus.NEW_ISSUE)
+        val task = AnonymousFeedbackTask(project, "Submitting error report", true, reportValues, { htmlUrl, token, isDuplicate ->
+            val reportInfo = SubmittedReportInfo(htmlUrl, "Issue #$token", SubmittedReportInfo.SubmissionStatus.NEW_ISSUE)
             consumer.consume(reportInfo)
 
-            val message = "<html>Created Issue #$token successfully.<br>" +
-                "<a href=\"$url\">View issue.</a></html>"
+            val message = if (!isDuplicate) {
+                "<html>Created Issue #$token successfully. " +
+                    "<a href=\"$htmlUrl\">View issue.</a></html>"
+            } else {
+                "<html>Commented on existing Issue #$token successfully. " +
+                    "<a href=\"$htmlUrl\">View comment.</a></html>"
+            }
 
             ReportMessages.GROUP.createNotification(
                 ReportMessages.ERROR_REPORT,