优化引用符添加；

lilei · lilei · commit 8430798467b2 · 2019-05-28T14:01:30.000+08:00
引入icon
diff --git a/src/main/java/me/hiten/completion/DependencySearchManager.kt b/src/main/java/me/hiten/completion/DependencySearchManager.kt
@@ -1,13 +1,13 @@
 package me.hiten.completion
 
 import com.intellij.codeInsight.completion.CompletionResultSet
-import com.intellij.codeInsight.lookup.LookupElement
-import com.intellij.codeInsight.lookup.LookupElementBuilder
-import com.intellij.codeInsight.lookup.LookupElementPresentation
-import com.intellij.codeInsight.lookup.LookupElementRenderer
+import com.intellij.codeInsight.completion.CompletionSorter
+import com.intellij.codeInsight.completion.impl.PreferStartMatching
+import com.intellij.codeInsight.lookup.*
 import com.intellij.util.containers.isNullOrEmpty
 import me.hiten.completion.androidsearch.AndroidDependencySearcher
 import me.hiten.completion.mavensearch.MavenDependencySearcher
+import java.awt.Color
 
 class DependencySearchManager(private val dependencyText: DependencyText) {
 
@@ -27,41 +27,74 @@ class DependencySearchManager(private val dependencyText: DependencyText) {
     private fun searchDefault(result: CompletionResultSet) {
         var searchDefault = AndroidDependencySearcher().searchDefault(dependencyText.text)
         if (needNextSearch(searchDefault)) {
-            searchDefault = MavenDependencySearcher().searchDefault(dependencyText.text)
+            searchDefault = mergeSearch(searchDefault, MavenDependencySearcher().searchDefault(dependencyText.text))
         }
         val list = searchDefault?.map { createLookupElement(it, dependencyText.text + it.groupId) }?.toList()
         list?.let {
-            result.addAllElements(list)
+            result.restartCompletionOnPrefixChange(dependencyText.text)
+            result.withRelevanceSorter(
+                    CompletionSorter.emptySorter().weigh(PreferStartMatching())
+            ).addAllElements(list)
         }
     }
 
 
     private fun searchArtifact(result: CompletionResultSet) {
         var searchArtifact = AndroidDependencySearcher().searchArtifact(dependencyText.groupId)
         if (needNextSearch(searchArtifact)) {
-            searchArtifact = MavenDependencySearcher().searchArtifact(dependencyText.groupId)
+            searchArtifact = mergeSearch(searchArtifact, MavenDependencySearcher().searchArtifact(dependencyText.groupId))
         }
         val list = searchArtifact?.map { createLookupElement(it, dependencyText.text + it.artifact) }?.toList()
         list?.let {
-            result.addAllElements(list)
+            result.restartCompletionOnPrefixChange(dependencyText.text)
+            result.withRelevanceSorter(
+                    CompletionSorter.emptySorter().weigh(PreferStartMatching())
+            ).addAllElements(list)
         }
     }
 
     private fun searchVersion(result: CompletionResultSet) {
         var searchVersion = AndroidDependencySearcher().searchVersion(dependencyText.groupId, dependencyText.artifactId)
         if (needNextSearch(searchVersion)) {
-            searchVersion = MavenDependencySearcher().searchVersion(dependencyText.groupId, dependencyText.artifactId)
+            searchVersion = mergeSearch(searchVersion, MavenDependencySearcher().searchVersion(dependencyText.groupId, dependencyText.artifactId))
         }
         val list = searchVersion?.map { createLookupElement(it, dependencyText.text + it.version) }?.toList()
         list?.let {
-            result.addAllElements(list)
+            result.restartCompletionOnPrefixChange(dependencyText.text)
+            val withRelevanceSorter = result.withRelevanceSorter(
+                    CompletionSorter.emptySorter().weigh(object : LookupElementWeigher("versionWeigher") {
+                        override fun weigh(element: LookupElement): Comparable<VersionComparable> {
+                            val obj = (element as LookupElementBuilder).`object` as DependencySearcher.Result
+                            return VersionComparable(searchVersion!!.indexOf(obj))
+                        }
+                    })
+            )
+            withRelevanceSorter.addAllElements(list)
+        }
+    }
+
+
+    private fun mergeSearch(before: List<DependencySearcher.Result>?, after: List<DependencySearcher.Result>?): List<DependencySearcher.Result>? {
+        if (before.isNullOrEmpty() && after.isNullOrEmpty()) {
+            return null
+        }
+        return ArrayList<DependencySearcher.Result>().apply {
+            before?.let {
+                this.addAll(before)
+            }
+            after?.let {
+                this.addAll(after)
+            }
         }
     }
 
     private fun needNextSearch(before: List<DependencySearcher.Result>?): Boolean {
         if (before.isNullOrEmpty()) {
             return true
         }
+        for (result in before!!) {
+            return result.artifact.isNullOrEmpty() && result.version.isNullOrEmpty()
+        }
         return false
     }
 
@@ -75,13 +108,13 @@ class DependencySearchManager(private val dependencyText: DependencyText) {
                 text = result.getFullTextAndColon()
             } else {
                 if (result.version.isNullOrEmpty() || result.artifact.isNullOrEmpty()) {
-                    text = result.getFullText()
+                    text = result.getFullTextAndColon() + "$Q_SYMBOL$quoteArg"
                 } else {
                     if (quoteArg.isEmpty()) {
-                        quoteArg = "ver_${result.artifact}"
+                        quoteArg = "ver_${result.artifact?.replace("-", "_")}"
                     }
                     text = "${result.groupId}:${result.artifact}:$$quoteArg"
-                    insertArg = "// ext.$quoteArg = '${result.version}' "
+                    insertArg = "ext.$quoteArg = '${result.version}' //please move this code to a unified place.\n"
                 }
             }
             val editor = context.editor
@@ -91,27 +124,37 @@ class DependencySearchManager(private val dependencyText: DependencyText) {
             val lineStartOffset = document.getLineStartOffset(lineNumber)
             val lineEndOffset = document.getLineEndOffset(lineNumber)
             val allText = document.text
-            var lineText = allText.substring(lineStartOffset, offset)
-            lineText = lineText.replace(cheatString, text)
+            var lineText = allText.substring(lineStartOffset, lineEndOffset)
 
-            if (lineText.contains("'")) {
-                lineText += "'"
-            } else if (lineText.contains("\"")) {
-                lineText += "\""
+            var i = lineText.indexOf("\"", offset - lineStartOffset)
+            if (i == -1) {
+                i = lineText.indexOf("'", offset - lineStartOffset)
             }
-
-            if (lineText.contains("(")) {
-                lineText += ")"
+            i += lineStartOffset
+            lineText = if (i > offset) {
+                allText.substring(lineStartOffset, offset) + allText.substring(i, lineEndOffset)
+            } else {
+                allText.substring(lineStartOffset, lineEndOffset)
             }
+            lineText = lineText.replace(cheatString, text)
             insertArg?.let {
                 if (lineText.contains("'")) {
                     lineText = lineText.replace("'", "\"")
                 }
-                if (!lineText.contains(insertArg)) {
-                    lineText += insertArg
-                }
             }
             document.replaceString(lineStartOffset, lineEndOffset, lineText)
+            insertArg?.let {
+                val stringBuilder = StringBuilder()
+                for (char in lineText.toList()) {
+                    if (char == ' ') {
+                        stringBuilder.append(char)
+                    } else {
+                        break
+                    }
+                }
+                stringBuilder.append(insertArg)
+                document.insertString(lineStartOffset, stringBuilder.toString())
+            }
         }
     }
 
@@ -121,16 +164,20 @@ class DependencySearchManager(private val dependencyText: DependencyText) {
         override fun renderElement(element: LookupElement?, presentation: LookupElementPresentation?) {
             element?.let {
                 val result = (element as LookupElementBuilder).`object` as DependencySearcher.Result
-                presentation?.typeText = result.source
-                val quoteArg = dependencyText.quoteArg
+                presentation?.setTypeText(null, Icons.getIcon(result.source))
+                var quoteArg = dependencyText.quoteArg
                 if (quoteArg == null) {
                     presentation?.itemText = result.getFullTextAndColon()
                 } else {
                     if (result.version.isNullOrEmpty() || result.artifact.isNullOrEmpty()) {
-                        presentation?.itemText = result.getFullText() + "$$quoteArg"
+                        presentation?.itemText = result.getFullTextAndColon() + "$Q_SYMBOL$quoteArg"
                     } else {
+                        if (quoteArg.isEmpty()) {
+                            quoteArg = "ver_${result.artifact?.replace("-", "_")}"
+                        }
                         presentation?.itemText = "${result.groupId}:${result.artifact}:$$quoteArg=${result.version}"
                     }
+                    presentation?.itemTextForeground = Color.BLUE
                 }
             }
 
@@ -139,6 +186,10 @@ class DependencySearchManager(private val dependencyText: DependencyText) {
 
     companion object {
         const val Q_SYMBOL = "#"
+
+        class VersionComparable(private val index: Int) : Comparable<VersionComparable> {
+            override fun compareTo(other: VersionComparable): Int = this.index - other.index
+        }
     }
 
 }
diff --git a/src/main/java/me/hiten/completion/GradleDependenciesCompletionContributor.kt b/src/main/java/me/hiten/completion/GradleDependenciesCompletionContributor.kt
@@ -1,15 +1,17 @@
 package me.hiten.completion
 
 import com.intellij.codeInsight.completion.*
-import com.intellij.patterns.PlatformPatterns
+import com.intellij.patterns.PlatformPatterns.*
 import com.intellij.util.ProcessingContext
 import org.apache.http.util.TextUtils
 import org.jetbrains.plugins.gradle.util.GradleConstants
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.literals.GrLiteral
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.literals.GrStringContent
 
 
 class GradleDependenciesCompletionContributor : CompletionContributor() {
     init {
-        extend(CompletionType.SMART, GRADLE_FILE_PATTERN, GradleDependenciesCompletionProvider())
+        extend(CompletionType.SMART, GRADLE_STRING_PATTERN, GradleDependenciesCompletionProvider())
     }
 
 
@@ -29,7 +31,10 @@ class GradleDependenciesCompletionContributor : CompletionContributor() {
     }
 
     companion object {
-        private val GRADLE_FILE_PATTERN = PlatformPatterns.psiElement().and(
-                PlatformPatterns.psiElement().inFile(PlatformPatterns.psiFile().withName(PlatformPatterns.string().endsWith('.' + GradleConstants.EXTENSION))))
+        private val GRADLE_FILE_PATTERN = psiElement().and(
+                psiElement().inFile(psiFile().withName(string().endsWith('.' + GradleConstants.EXTENSION))))
+
+        private val GRADLE_STRING_PATTERN = GRADLE_FILE_PATTERN.andOr(psiElement()
+                .withParent(GrLiteral::class.java), psiElement().withParent(GrStringContent::class.java))
     }
 }
diff --git a/src/main/java/me/hiten/completion/Icons.kt b/src/main/java/me/hiten/completion/Icons.kt
@@ -0,0 +1,19 @@
+package me.hiten.completion
+
+import com.intellij.openapi.util.IconLoader
+import javax.swing.Icon
+
+object Icons {
+
+
+    private val map = HashMap<String, Icon>()
+
+    init {
+        map["google"] = IconLoader.getIcon("/icons/google.png")
+        map["maven"] = IconLoader.getIcon("/icons/maven.png")
+    }
+
+    fun getIcon(name: String): Icon {
+        return map[name] ?: return map["maven"]!!
+    }
+}
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -1,9 +1,11 @@
 <idea-plugin>
     <id>me.hiten.completion</id>
     <name>android-dependencies-completion</name>
-    <vendor email="zzdxit@gmail.com" url="http://www.hiten.me">HitenDev</vendor>
+    <version>0.1</version>
+    <vendor email="zzdxit@gmail.com" url="https://github.com/HitenDev/android-dependencies-completion">HitenDev</vendor>
 
-    <description><![CDATA[NoneNoneNoneNoneNoneNoneNoneNoneNoneNoneNoneNoneNoneNoneNone]]></description>
+    <description>
+        <![CDATA[Gradle Dependencies Code Completion , Searched by Maven'repo and Google'repo, for Android Developer]]></description>
 
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
          on how to target different products -->
@@ -13,6 +15,8 @@
     <depends>org.jetbrains.plugins.gradle</depends>
     <depends>org.intellij.groovy</depends>
 
+    <idea-version since-build="171"/>
+
     <extensions defaultExtensionNs="com.intellij">
         <completion.contributor language="Groovy" implementationClass="me.hiten.completion.GradleDependenciesCompletionContributor" order="first"/>
     </extensions>
diff --git a/src/main/resources/icons/google.png b/src/main/resources/icons/google.png
diff --git a/src/main/resources/icons/maven.png b/src/main/resources/icons/maven.png
