feat: differentiate math operators from keyword operators

Author: lppedd

.idea/codeStyles/Project.xml

@@ -7,6 +7,8 @@ import com.intellij.openapi.editor.colors.TextAttributesKey
 import com.intellij.openapi.editor.markup.TextAttributes
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.idea.highlighter.KotlinHighlightingColors
+import org.jetbrains.kotlin.lexer.KtKeywordToken
+import org.jetbrains.kotlin.lexer.KtSingleValueToken
 import org.jetbrains.kotlin.psi.KtOperationReferenceExpression
 
 internal val KOTLIN_INFIX_FUN: TextAttributesKey =
@@ -15,28 +17,43 @@ internal val KOTLIN_INFIX_FUN: TextAttributesKey =
     KotlinHighlightingColors.FUNCTION_CALL
   )
 
-internal val KOTLIN_OPERATOR_FUN: TextAttributesKey =
+internal val KOTLIN_KEYWORD_OPERATOR_FUN: TextAttributesKey =
   TextAttributesKey.createTextAttributesKey(
-    "CUSTOM_KOTLIN_OPERATOR_FUN",
+    "CUSTOM_KOTLIN_KEYWORD_OPERATOR_FUN",
     KotlinHighlightingColors.KEYWORD
   )
 
+internal val KOTLIN_MATH_OPERATOR_FUN: TextAttributesKey =
+  TextAttributesKey.createTextAttributesKey(
+    "CUSTOM_KOTLIN_MATH_OPERATOR_FUN",
+    KotlinHighlightingColors.OPERATOR_SIGN
+  )
+
 /**
  * @author Edoardo Luppi
  */
 private class KotlinAnnotator : Annotator {
   private val globalScheme = EditorColorsManager.getInstance().globalScheme
   private val infixFunAttributes = globalScheme.getAttributes(KOTLIN_INFIX_FUN)
-  private val operatorFunAttributes = globalScheme.getAttributes(KOTLIN_OPERATOR_FUN)
+  private val keywordOperatorFunAttributes = globalScheme.getAttributes(KOTLIN_KEYWORD_OPERATOR_FUN)
+  private val mathOperatorFunAttributes = globalScheme.getAttributes(KOTLIN_MATH_OPERATOR_FUN)
 
   override fun annotate(element: PsiElement, annotationHolder: AnnotationHolder) {
-    if (element !is KtOperationReferenceExpression) return
-
-    val textAttributes =
-      if (element.isConventionOperator()) operatorFunAttributes
-      else infixFunAttributes
+    if (element is KtOperationReferenceExpression) {
+      getTextAttributes(element)?.let {
+        annotationHolder.setTextAttributes(element, it)
+      }
+    }
+  }
 
-    annotationHolder.setTextAttributes(element, textAttributes)
+  private fun getTextAttributes(expr: KtOperationReferenceExpression): TextAttributes? {
+    val operationSignTokenType = expr.operationSignTokenType
+    return when {
+      !expr.isConventionOperator() -> infixFunAttributes
+      operationSignTokenType is KtKeywordToken -> keywordOperatorFunAttributes
+      operationSignTokenType is KtSingleValueToken -> mathOperatorFunAttributes
+      else -> null
+    }
   }
 
   private fun AnnotationHolder.setTextAttributes(

src/main/kotlin/com/github/lppedd/kotlin/KotlinAnnotator.kt

@@ -25,19 +25,22 @@ private class KotlinColorSettingsPage : ColorSettingsPage {
   override fun getAttributeDescriptors(): Array<AttributesDescriptor> =
     arrayOf(
       AttributesDescriptor("Infix function call", KOTLIN_INFIX_FUN),
-      AttributesDescriptor("Operator function call", KOTLIN_OPERATOR_FUN)
+      AttributesDescriptor("Keyword operator function call", KOTLIN_KEYWORD_OPERATOR_FUN),
+      AttributesDescriptor("Math operator function call", KOTLIN_MATH_OPERATOR_FUN),
     )
 
   override fun getAdditionalHighlightingTagToDescriptorMap(): Map<String, TextAttributesKey> =
     mapOf(
-      "infix" to KOTLIN_INFIX_FUN,
-      "operator" to KOTLIN_OPERATOR_FUN,
+      "k-infix" to KOTLIN_INFIX_FUN,
+      "k-kw-operator" to KOTLIN_KEYWORD_OPERATOR_FUN,
+      "k-math-operator" to KOTLIN_MATH_OPERATOR_FUN,
     )
 
   override fun getDemoText(): String = """
         |fun myFunction(myValue: String, myValues: List<String>) {
-        |    if (myValue <infix>owns</infix> 'c') { }
-        |    if (myValue <operator>!in</operator> myValues) { }
+        |    if (myValue <k-infix>owns</k-infix> 'c') { }
+        |    if (myValue <k-kw-operator>!in</k-kw-operator> myValues) { }
+        |    if (myValue <k-math-operator>></k-math-operator> myValues.first()) { }
         |}
         |
         |infix fun String.owns(char: Char): Boolean = contains(char)