azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use highlight visitor instead of custom general like highlighting pass

Browse Source 
#KTIJ-1760 Fixed
#KT-45254 Fixed
This commit is contained in:
Vladimir Dolzhenko
2021-03-04 07:11:58 +00:00
committed by Space
parent 5e173c9f83
commit cb92474af9
27 changed files with 335 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/PerformanceProjectsTest.kt
+14 -30
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.idea.perf
import com.intellij.codeHighlighting.*
import com.intellij.codeInsight.daemon.impl.HighlightInfo
import com.intellij.codeInsight.daemon.impl.analysis.HighlightInfoHolder
import com.intellij.openapi.editor.Document
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.progress.ProgressIndicator
@@ -15,7 +16,7 @@ import com.intellij.psi.PsiFile
import com.intellij.testFramework.RunAll
import com.intellij.util.ThrowableRunnable
import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
import org.jetbrains.kotlin.idea.highlighter.KotlinHighlightingPass
import org.jetbrains.kotlin.idea.highlighter.KotlinHighlightVisitor
import org.jetbrains.kotlin.idea.perf.Stats.Companion.TEST_KEY
import org.jetbrains.kotlin.idea.perf.Stats.Companion.runAndMeasure
import org.jetbrains.kotlin.idea.perf.util.Metric
@@ -379,8 +380,8 @@ class PerformanceProjectsTest : AbstractPerformanceProjectsTest() {
private fun replaceWithCustomHighlighter() {
org.jetbrains.kotlin.idea.testFramework.replaceWithCustomHighlighter(
testRootDisposable,
KotlinHighlightingPass.Registrar::class.java.name,
TestKotlinHighlightingPass.Registrar::class.java.name
KotlinHighlightVisitor::class.java.name,
TestKotlinHighlightVisitor::class.java.name
)
}
@@ -434,38 +435,21 @@ class PerformanceProjectsTest : AbstractPerformanceProjectsTest() {
}
class TestKotlinHighlightingPass(file: KtFile, document: Document) : KotlinHighlightingPass(file, document) {
override fun doCollectInformation(progress: ProgressIndicator) {
annotationCallback {
val nowNs = System.nanoTime()
diagnosticTimer.addAndGet(nowNs)
resetAnnotationCallback()
}
class TestKotlinHighlightVisitor : KotlinHighlightVisitor() {
override fun analyze(psiFile: PsiFile, updateWholeFile: Boolean, holder: HighlightInfoHolder, action: Runnable): Boolean {
// TODO:
//annotationCallback {
// val nowNs = System.nanoTime()
// diagnosticTimer.addAndGet(nowNs)
// resetAnnotationCallback()
//}
try {
super.doCollectInformation(progress)
return super.analyze(psiFile, updateWholeFile, holder, action)
} finally {
resetAnnotationCallback()
//resetAnnotationCallback()
markTimestamp()
}
}
class Factory : TextEditorHighlightingPassFactory {
override fun createHighlightingPass(file: PsiFile, editor: Editor): TextEditorHighlightingPass? {
if (file !is KtFile) return null
return TestKotlinHighlightingPass(file, editor.document)
}
}
class Registrar : TextEditorHighlightingPassFactoryRegistrar {
override fun registerHighlightingPassFactory(registrar: TextEditorHighlightingPassRegistrar, project: Project) {
registrar.registerTextEditorHighlightingPass(
Factory(),
null,
intArrayOf(Pass.UPDATE_ALL),
false,
-1
)
}
}
}
}