[🦁release] 兼容2021.1，和klint,detekt部分语法

Author: trydofor

README.md

@@ -181,6 +181,8 @@ Open <kbd>Preferences</kbd> > <kbd>Plugins</kbd>, and
 - Manually: Download the [latest release](https://github.com/trydofor/intellij-any2dto/releases/latest) and install it manually using
   <kbd>⚙️</kbd> > <kbd>Install plugin from disk...</kbd>
 
+- Developer: git clone, clean,compile,buildPlugin (note skip any check style, only use Idea IDE style)
+
 ## Moilion Product
 
  * [redis-replicator](https://github.com/leonchen83/redis-replicator)

build.gradle.kts

@@ -7,15 +7,15 @@ plugins {
     // Java support
     id("java")
     // Kotlin support
-    id("org.jetbrains.kotlin.jvm") version "1.4.20"
+    id("org.jetbrains.kotlin.jvm") version "1.4.32"
     // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
-    id("org.jetbrains.intellij") version "0.6.5"
+    id("org.jetbrains.intellij") version "0.7.3"
     // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
-    id("org.jetbrains.changelog") version "0.6.2"
+    id("org.jetbrains.changelog") version "1.1.2"
     // detekt linter - read more: https://detekt.github.io/detekt/gradle.html
-    id("io.gitlab.arturbosch.detekt") version "1.14.2"
+    id("io.gitlab.arturbosch.detekt") version "1.16.0"
     // ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle
-    id("org.jlleitschuh.gradle.ktlint") version "9.4.1"
+    id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
 }
 
 // Import variables from gradle.properties file

detekt-config.yml

@@ -1,8 +1,30 @@
 # Default detekt configuration:
 # https://github.com/detekt/detekt/blob/master/detekt-core/src/main/resources/default-detekt-config.yml
 
+build:
+  maxIssues: 200
+  excludeCorrectable: false
+  weights:
+    complexity: 20
+    LongParameterList: 10
+    style: 10
+    comments: 10
+    LongMethod: 10
+
+complexity:
+  TooManyFunctions:
+    active: false
+
+exceptions:
+  TooGenericExceptionCaught:
+    active: false
+
 formatting:
-  Indentation:
-    continuationIndentSize: 8
   ParameterListWrapping:
-    indentSize: 8
+    active: false
+  ChainWrapping:
+    active: false
+
+style:
+  ReturnCount:
+    active: false

gradle.properties

@@ -3,12 +3,12 @@
 
 pluginGroup = com.moilioncircle.intellij
 pluginName_ = any2dto
-pluginVersion = 1.1.1
+pluginVersion = 1.1.2
 pluginSinceBuild = 192
-pluginUntilBuild = 203.*
+pluginUntilBuild = 211.*
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions
-pluginVerifierIdeVersions = 2020.1, 2020.2, 2020.3
+pluginVerifierIdeVersions = 2020.1, 2020.2, 2020.3, 2021.1
 
 platformType = IU
 # 2019.2

src/main/kotlin/com/moilioncircle/intellij/any2dto/actions/Any2DtoAction.kt

@@ -5,7 +5,6 @@ import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.moilioncircle.intellij.any2dto.helper.IdeaUiHelper
 
-
 class Any2DtoAction : AnAction() {
 
     override fun actionPerformed(e: AnActionEvent) {
@@ -17,4 +16,4 @@ class Any2DtoAction : AnAction() {
 
         ActionManager.getInstance().getAction(action).actionPerformed(e)
     }
-}
+}

src/main/kotlin/com/moilioncircle/intellij/any2dto/actions/Any2DtoActionJdbc.kt

@@ -17,7 +17,6 @@ import com.moilioncircle.intellij.any2dto.helper.MergerHelper
 import com.moilioncircle.intellij.any2dto.helper.MergerHelper.ColumnInfo
 import com.moilioncircle.intellij.any2dto.settings.SettingsState
 
-
 class Any2DtoActionJdbc : AnAction() {
     private val logger = Logger.getInstance(Any2DtoActionJdbc::class.java)
 
@@ -76,10 +75,10 @@ class Any2DtoActionJdbc : AnAction() {
         mergeJava(sqlCol, e, "Table/Columns")
     }
 
-    private fun mergeJava(sqlCol: List<ColumnInfo>, e: AnActionEvent, from:String) {
+    private fun mergeJava(sqlCol: List<ColumnInfo>, e: AnActionEvent, from: String) {
         val state = SettingsState.loadSettingState()
         val project = e.getData(LangDataKeys.PROJECT)
         val fields = MergerHelper.matchFields(state, sqlCol)
-        MergerHelper.generateJava(state, fields, project,from)
+        MergerHelper.generateJava(state, fields, project, from)
     }
-}
+}

src/main/kotlin/com/moilioncircle/intellij/any2dto/actions/Any2DtoActionJooq.kt

@@ -17,7 +17,6 @@ import com.moilioncircle.intellij.any2dto.helper.MergerHelper.FieldInfo
 import com.moilioncircle.intellij.any2dto.helper.NamingFuns
 import com.moilioncircle.intellij.any2dto.settings.SettingsState
 
-
 class Any2DtoActionJooq : AnAction() {
 
     private val logger = Logger.getInstance(Any2DtoActionJooq::class.java)
@@ -51,9 +50,9 @@ class Any2DtoActionJooq : AnAction() {
             val offBgn = eleBgn.textRange.startOffset
             val offEnd = eleEnd.textRange.endOffset
             val eleTgt = eleParent.children.filter {
+                it.textRange.endOffset >= offBgn &&
+                it.textRange.startOffset <= offEnd &&
                 (it is PsiReferenceExpression || it is PsiMethodCallExpression)
-                        && it.textRange.endOffset >= offBgn
-                        && it.textRange.startOffset <= offEnd
             }
             if (eleTgt.isEmpty()) {
                 Messages.showWarningDialog("empty Jooq's field-like expression list", "Unsupported")
@@ -90,4 +89,4 @@ class Any2DtoActionJooq : AnAction() {
         val name = NamingFuns.camelCase(IdeaPsiHelper.inferMethodNaming(ele))
         return FieldInfo(name, type)
     }
-}
+}

src/main/kotlin/com/moilioncircle/intellij/any2dto/actions/Any2DtoActionSqlDsl.kt

@@ -11,7 +11,6 @@ import com.moilioncircle.intellij.any2dto.settings.SettingsState
 import com.moilioncircle.intellij.any2dto.sqldsl.DslMerger
 import java.awt.datatransfer.StringSelection
 
-
 class Any2DtoActionSqlDsl : AnAction() {
     private val logger = Logger.getInstance(Any2DtoActionSqlDsl::class.java)
 
@@ -39,4 +38,4 @@ class Any2DtoActionSqlDsl : AnAction() {
         val editor = e.getData(CommonDataKeys.EDITOR)
         e.presentation.isEnabled = editor?.caretModel?.primaryCaret?.selectedText?.isNotBlank() ?: false
     }
-}
+}

src/main/kotlin/com/moilioncircle/intellij/any2dto/actions/Any2DtoActionText.kt

@@ -11,7 +11,6 @@ import com.moilioncircle.intellij.any2dto.helper.MergerHelper
 import com.moilioncircle.intellij.any2dto.helper.MergerHelper.FieldInfo
 import com.moilioncircle.intellij.any2dto.settings.SettingsState
 
-
 class Any2DtoActionText : AnAction() {
     private val logger = Logger.getInstance(Any2DtoActionText::class.java)
 
@@ -51,4 +50,4 @@ class Any2DtoActionText : AnAction() {
             IdeaUiHelper.showError("failed to generate by jooq", t)
         }
     }
-}
+}

src/main/kotlin/com/moilioncircle/intellij/any2dto/helper/ConfigHelper.kt

@@ -74,4 +74,4 @@ object ConfigHelper {
         .getResourceAsStream("/config/$name")
         .reader()
         .readText()
-}
+}