create EditorService.kt

JetBrains-Research · Jan 3, 2024 · a2620e1 · a2620e1
1 parent 64740d9
commit a2620e1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/src/main/kotlin/org/jetbrains/research/testspark/services/CoverageVisualisationService.kt b/src/main/kotlin/org/jetbrains/research/testspark/services/CoverageVisualisationService.kt
@@ -95,7 +95,7 @@ class CoverageVisualisationService(private val project: Project) {
         testReport: Report,
     ) {
         currentHighlightedData =
-            HighlightedData(linesToCover, selectedTests, testReport, project.service<ProjectContextService>().editor!!)
+            HighlightedData(linesToCover, selectedTests, testReport, project.service<EditorService>().editor!!)
         clear()
 
         val settingsProjectState = project.service<SettingsProjectService>().state
@@ -140,7 +140,7 @@ class CoverageVisualisationService(private val project: Project) {
             for (i in linesToCover) {
                 val line = i - 1
 
-                val hl = project.service<ProjectContextService>().editor!!.markupModel.addLineHighlighter(
+                val hl = project.service<EditorService>().editor!!.markupModel.addLineHighlighter(
                     line,
                     HighlighterLayer.ADDITIONAL_SYNTAX,
                     textAttribute,

diff --git a/src/main/kotlin/org/jetbrains/research/testspark/services/EditorService.kt b/src/main/kotlin/org/jetbrains/research/testspark/services/EditorService.kt
@@ -0,0 +1,9 @@
+package org.jetbrains.research.testspark.services
+
+import com.intellij.openapi.components.Service
+import com.intellij.openapi.editor.Editor
+
+@Service(Service.Level.PROJECT)
+class EditorService {
+    var editor: Editor? = null
+}
diff --git a/src/main/kotlin/org/jetbrains/research/testspark/services/ProjectContextService.kt b/src/main/kotlin/org/jetbrains/research/testspark/services/ProjectContextService.kt
@@ -1,14 +1,11 @@
 package org.jetbrains.research.testspark.services
 
 import com.intellij.openapi.components.Service
-import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.module.Module
 import com.intellij.psi.PsiClass
 
 @Service(Service.Level.PROJECT)
 class ProjectContextService {
-    var editor: Editor? = null
-
     // The class path of the project.
     var projectClassPath: String? = null
 

diff --git a/src/main/kotlin/org/jetbrains/research/testspark/services/ReportLockingService.kt b/src/main/kotlin/org/jetbrains/research/testspark/services/ReportLockingService.kt
@@ -27,7 +27,7 @@ class ReportLockingService(private val project: Project) {
 
         project.service<TestCaseDisplayService>().updateEditorForFileUrl(project.service<TestGenerationDataService>().fileUrl)
 
-        if (project.service<ProjectContextService>().editor != null) {
+        if (project.service<EditorService>().editor != null) {
             project.service<TestCaseDisplayService>().displayTestCases()
             project.service<CoverageVisualisationService>().showCoverage(report)
         } else {

diff --git a/src/main/kotlin/org/jetbrains/research/testspark/services/TestCaseDisplayService.kt b/src/main/kotlin/org/jetbrains/research/testspark/services/TestCaseDisplayService.kt
@@ -95,7 +95,7 @@ class TestCaseDisplayService(private val project: Project) {
      */
     fun displayTestCases() {
         val report = project.service<ReportLockingService>().getReport()
-        val editor = project.service<ProjectContextService>().editor!!
+        val editor = project.service<EditorService>().editor!!
 
         allTestCasePanel.removeAll()
         testCasePanels.clear()
@@ -224,7 +224,7 @@ class TestCaseDisplayService(private val project: Project) {
      * Removes all coverage highlighting from the editor.
      */
     private fun removeAllHighlights() {
-        project.service<ProjectContextService>().editor?.markupModel?.removeAllHighlighters()
+        project.service<EditorService>().editor?.markupModel?.removeAllHighlighters()
     }
 
     /**
@@ -469,7 +469,7 @@ class TestCaseDisplayService(private val project: Project) {
             val currentFile = documentManager.getFile(it.document)
             if (currentFile != null) {
                 if (currentFile.presentableUrl == fileUrl) {
-                    project.service<ProjectContextService>().editor = it
+                    project.service<EditorService>().editor = it
                 }
             }
         }