初步完成引用符号的替换

Author: lilei

gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -68,17 +68,20 @@ class DependencySearchManager(private val dependencyText: DependencyText) {
 
     private fun createLookupElement(result: DependencySearcher.Result, cheatString: String): LookupElement {
         return LookupElementBuilder.create(result, cheatString).withRenderer(CustomLookupElementRenderer(dependencyText)).withInsertHandler { context, item ->
-            val quoteArg = dependencyText.quoteArg
+            var quoteArg = dependencyText.quoteArg
             val text: String
             var insertArg: String? = null
-            if (quoteArg.isNullOrEmpty()) {
-                text = result.getFullText()
+            if (quoteArg == null) {
+                text = result.getFullTextAndColon()
             } else {
                 if (result.version.isNullOrEmpty() || result.artifact.isNullOrEmpty()) {
-                    text = result.getFullText() + "$$quoteArg"
+                    text = result.getFullText()
                 } else {
+                    if (quoteArg.isEmpty()) {
+                        quoteArg = "ver_${result.artifact}"
+                    }
                     text = "${result.groupId}:${result.artifact}:$$quoteArg"
-                    insertArg = "//{ext.$quoteArg = '${result.version}'}"
+                    insertArg = "// ext.$quoteArg = '${result.version}' "
                 }
             }
             val editor = context.editor
@@ -88,10 +91,18 @@ 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, lineEndOffset)
+            var lineText = allText.substring(lineStartOffset, offset)
             lineText = lineText.replace(cheatString, text)
 
+            if (lineText.contains("'")) {
+                lineText += "'"
+            } else if (lineText.contains("\"")) {
+                lineText += "\""
+            }
 
+            if (lineText.contains("(")) {
+                lineText += ")"
+            }
             insertArg?.let {
                 if (lineText.contains("'")) {
                     lineText = lineText.replace("'", "\"")
@@ -112,8 +123,8 @@ class DependencySearchManager(private val dependencyText: DependencyText) {
                 val result = (element as LookupElementBuilder).`object` as DependencySearcher.Result
                 presentation?.typeText = result.source
                 val quoteArg = dependencyText.quoteArg
-                if (quoteArg.isNullOrEmpty()) {
-                    presentation?.itemText = result.getFullText()
+                if (quoteArg == null) {
+                    presentation?.itemText = result.getFullTextAndColon()
                 } else {
                     if (result.version.isNullOrEmpty() || result.artifact.isNullOrEmpty()) {
                         presentation?.itemText = result.getFullText() + "$$quoteArg"
@@ -126,4 +137,8 @@ class DependencySearchManager(private val dependencyText: DependencyText) {
         }
     }
 
+    companion object {
+        const val Q_SYMBOL = "#"
+    }
+
 }

src/main/java/me/hiten/completion/DependencySearchManager.kt

@@ -29,6 +29,23 @@ interface DependencySearcher {
             return fullText!!
         }
 
+        fun getFullTextAndColon(): String {
+            var fullText = groupId
+            if (!groupId.isNullOrEmpty()) {
+                fullText += ":"
+            }
+            if (!artifact.isNullOrEmpty()) {
+                fullText += "$artifact:"
+            }
+            if (!version.isNullOrEmpty()) {
+                fullText += "$version"
+            }
+            if (fullText.isNullOrEmpty()) {
+                return ""
+            }
+            return fullText!!
+        }
+
     }
 
 }

src/main/java/me/hiten/completion/DependencySearcher.kt

@@ -1,13 +1,15 @@
 package me.hiten.completion
 
+import me.hiten.completion.DependencySearchManager.Companion.Q_SYMBOL
+
 
 class DependencyText(val text: String) {
 
     val isShort: Boolean = text.length < 2
 
-    val quoteArg: String? = text.split("$").getOrNull(1)
+    val quoteArg: String? = text.split(Q_SYMBOL).getOrNull(1)
 
-    val splitText = text.split("$").getOrElse(0) { text }.split(":")
+    val splitText = text.split(Q_SYMBOL).getOrElse(0) { text }.split(":")
     val groupId = splitText.getOrElse(0) { "" }
     val artifactId = splitText.getOrElse(1) { "" }