From 816cf3f61aa46dd6261847f87ceff767aad09329 Mon Sep 17 00:00:00 2001 From: Mitja Leino Date: Fri, 7 Jun 2024 06:46:36 +0300 Subject: [PATCH] Get color from global scheme --- .../fuzzier/entities/FuzzyMatchContainer.kt | 16 +++++++++++++++- .../fuzzier/entities/FuzzyMatchContainerTest.kt | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/com/mituuz/fuzzier/entities/FuzzyMatchContainer.kt b/src/main/kotlin/com/mituuz/fuzzier/entities/FuzzyMatchContainer.kt index b684c07d..a570e7a7 100644 --- a/src/main/kotlin/com/mituuz/fuzzier/entities/FuzzyMatchContainer.kt +++ b/src/main/kotlin/com/mituuz/fuzzier/entities/FuzzyMatchContainer.kt @@ -24,10 +24,14 @@ SOFTWARE. package com.mituuz.fuzzier.entities import com.intellij.openapi.components.service +import com.intellij.openapi.editor.colors.EditorColors +import com.intellij.openapi.editor.colors.EditorColorsManager import com.mituuz.fuzzier.settings.FuzzierSettingsService +import java.awt.Color class FuzzyMatchContainer(val score: FuzzyScore, var filePath: String, var filename: String, private var module: String = "") { - private val sm: String = "" + private val color = EditorColorsManager.getInstance().globalScheme.getColor(EditorColors.CHANGED_LINES_POPUP) + private val sm: String = "" private val em: String = "" private var initialPath: String? = null companion object { @@ -40,6 +44,15 @@ class FuzzyMatchContainer(val score: FuzzyScore, var filePath: String, var filen } } + private fun colorToHtml(color: Color?): String { + return if (color != null) { + val darkColor = color.darker() + String.format("#%02x%02x%02x", darkColor.red, darkColor.green, darkColor.blue) + } else { + "yellow" + } + } + fun toString(filenameType: FilenameType): String { return when (filenameType) { FilenameType.FILENAME_ONLY -> filename @@ -50,6 +63,7 @@ class FuzzyMatchContainer(val score: FuzzyScore, var filePath: String, var filen } fun highlight(source: String): String { + println(color) val stringBuilder: StringBuilder = StringBuilder(source) var offset = 0 for (i in score.highlightCharacters) { diff --git a/src/test/kotlin/com/mituuz/fuzzier/entities/FuzzyMatchContainerTest.kt b/src/test/kotlin/com/mituuz/fuzzier/entities/FuzzyMatchContainerTest.kt index 60c62730..90a54d90 100644 --- a/src/test/kotlin/com/mituuz/fuzzier/entities/FuzzyMatchContainerTest.kt +++ b/src/test/kotlin/com/mituuz/fuzzier/entities/FuzzyMatchContainerTest.kt @@ -1,5 +1,6 @@ package com.mituuz.fuzzier.entities +import com.intellij.testFramework.TestApplicationManager import com.mituuz.fuzzier.entities.FuzzyMatchContainer.FuzzyScore import org.junit.jupiter.api.Assertions.* import org.junit.jupiter.api.Test @@ -7,6 +8,7 @@ import org.junit.jupiter.api.Test class FuzzyMatchContainerTest { @Test fun `Test highlight indexing`() { + val testManager = TestApplicationManager.getInstance() val s = FuzzyScore() s.highlightCharacters.add(0) s.highlightCharacters.add(4)