updates!

eminarican · Jan 29, 2023 · 2243ad9 · 2243ad9
1 parent 397e4c1
commit 2243ad9
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 16 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -28,8 +28,8 @@ tasks {
     }
 
     patchPluginXml {
-        //sinceBuild.set("213")
-        //untilBuild.set("223.*")
+        sinceBuild.set("213")
+        untilBuild.set("231.*")
     }
 
     signPlugin {

diff --git a/src/main/kotlin/com/eminarican/gopherformat/FormatData.kt b/src/main/kotlin/com/eminarican/gopherformat/FormatData.kt
@@ -9,6 +9,8 @@ object FormatData {
     const val TAG_START_SIZE = "<>".length
     const val TAG_END_SIZE = "</>".length
 
+    const val FORMAT_FUNCTION = "Colourf"
+
     val HolderPattern: Pattern = Pattern.compile("%[bcdeEfFgGopqstTUvVxX]")
     val TagPattern: Pattern = Pattern.compile("<([\\w-]+)>(.*?)</\\1>")
 

diff --git a/src/main/kotlin/com/eminarican/gopherformat/FormatHelper.kt b/src/main/kotlin/com/eminarican/gopherformat/FormatHelper.kt
@@ -1,5 +1,6 @@
 package com.eminarican.gopherformat
 
+import com.goide.highlighting.GoSyntaxHighlightingColors
 import com.goide.psi.GoCallExpr
 import com.intellij.lang.annotation.AnnotationBuilder
 import com.intellij.lang.annotation.AnnotationHolder
@@ -34,7 +35,7 @@ object FormatHelper {
         }
     }
 
-    fun iteratePlaceholders(
+    fun iterateSymbols(
         text: String, offset: Int,
         callback: (range: TextRange) -> Unit
     ) {
@@ -43,7 +44,7 @@ object FormatHelper {
         }
     }
 
-    fun iterateSymbols(
+    fun iterateFunctionSymbols(
         expression: GoCallExpr,
         callback: (ok: Boolean, range: TextRange, index: Int, count: Int) -> Unit
     ) {
@@ -52,13 +53,12 @@ object FormatHelper {
 
         first.value?.string?.let { value ->
             val verbCount = value.split(FormatData.HolderPattern).size - 1
-            if (verbCount < 1) return
+            val argCount = expressions.size - 1
 
-            val argCount = expressions.size - 2
-            if (verbCount == argCount) return
+            if (verbCount < 1) return
 
-            var count = 0
-            iteratePlaceholders(value, first.textRange.startOffset.inc()) { range ->
+            var count = 1
+            iterateSymbols(value, first.textRange.startOffset.inc()) { range ->
                 callback(count <= argCount, range, count, argCount)
                 count++
             }
@@ -72,6 +72,10 @@ object FormatHelper {
         }
     }
 
+    fun isFormatFunction(element: GoCallExpr): Boolean {
+        return element.expression.text.contains(FormatData.FORMAT_FUNCTION)
+    }
+
     fun findStringLiterals(element: PsiElement): Collection<PsiElement> {
         object : PsiElementProcessor.CollectElements<PsiElement>() {
             override fun execute(each: PsiElement): Boolean {
@@ -96,4 +100,8 @@ object FormatHelper {
     fun createWarning(holder: AnnotationHolder, message: String, range: TextRange) {
         return holder.newAnnotation(HighlightSeverity.WEAK_WARNING, message).range(range).create()
     }
+
+    fun highlightPlaceholder(holder: AnnotationHolder, range: TextRange) {
+        createAnnotation(holder, range).textAttributes(GoSyntaxHighlightingColors.VALID_STRING_ESCAPE).create()
+    }
 }
diff --git a/src/main/kotlin/com/eminarican/gopherformat/annotator/FunctionAnnotator.kt b/src/main/kotlin/com/eminarican/gopherformat/annotator/FunctionAnnotator.kt
@@ -11,9 +11,11 @@ class FunctionAnnotator : Annotator {
 
     override fun annotate(element: PsiElement, holder: AnnotationHolder) {
         if (element !is GoCallExpr) return
+        if (!FormatHelper.isFormatFunction(element)) return
 
-        FormatHelper.iterateSymbols(element) { ok, range, index, count ->
+        FormatHelper.iterateFunctionSymbols(element) { ok, range, index, count ->
             if (!ok) addVerbWarning(holder, range, index, count)
+            FormatHelper.highlightPlaceholder(holder, range)
         }
     }
 

diff --git a/src/main/kotlin/com/eminarican/gopherformat/annotator/LiteralAnnotator.kt b/src/main/kotlin/com/eminarican/gopherformat/annotator/LiteralAnnotator.kt
@@ -2,7 +2,10 @@ package com.eminarican.gopherformat.annotator
 
 import com.eminarican.gopherformat.FormatData
 import com.eminarican.gopherformat.FormatHelper
+import com.goide.GoLanguage
 import com.goide.highlighting.GoSyntaxHighlightingColors
+import com.goide.psi.GoCallExpr
+import com.goide.psi.GoStringLiteral
 import com.intellij.lang.annotation.AnnotationHolder
 import com.intellij.lang.annotation.Annotator
 import com.intellij.openapi.util.TextRange
@@ -23,8 +26,10 @@ class LiteralAnnotator : Annotator {
             }
         }
 
-        FormatHelper.iteratePlaceholders(element.text, element.textRange.startOffset) { range ->
-            highlightPlaceholder(holder, range)
+        if (element.language is GoLanguage) return
+
+        FormatHelper.iterateSymbols(element.text, element.textRange.startOffset) { range ->
+            FormatHelper.highlightPlaceholder(holder, range)
         }
     }
 
@@ -47,8 +52,4 @@ class LiteralAnnotator : Annotator {
         }
         return false
     }
-
-    private fun highlightPlaceholder(holder: AnnotationHolder, range: TextRange) {
-        FormatHelper.createAnnotation(holder, range).textAttributes(GoSyntaxHighlightingColors.VALID_STRING_ESCAPE).create()
-    }
 }