diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/AfterAnalysisHighlightingVisitor.kt
similarity index 63%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HighlightingVisitor.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/AfterAnalysisHighlightingVisitor.kt
index 6cb6f57f433..fc034e1d2b1 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HighlightingVisitor.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/AfterAnalysisHighlightingVisitor.kt
@@ -14,15 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.highlighter;
+package org.jetbrains.kotlin.idea.highlighter
 
-import com.intellij.lang.annotation.AnnotationHolder;
-import org.jetbrains.kotlin.psi.KtVisitorVoid;
+import com.intellij.lang.annotation.AnnotationHolder
+import org.jetbrains.kotlin.resolve.BindingContext
 
-public abstract class HighlightingVisitor extends KtVisitorVoid {
-    protected AnnotationHolder holder;
-
-    protected HighlightingVisitor(AnnotationHolder holder) {
-        this.holder = holder;
-    }
-}
+internal abstract class AfterAnalysisHighlightingVisitor protected constructor(
+        holder: AnnotationHolder, protected var bindingContext: BindingContext
+) : HighlightingVisitor(holder)
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/AfterAnalysisHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HighlightingVisitor.kt
similarity index 56%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/AfterAnalysisHighlightingVisitor.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HighlightingVisitor.kt
index 22fe16a5533..8736522936b 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/AfterAnalysisHighlightingVisitor.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HighlightingVisitor.kt
@@ -14,16 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.highlighter;
+package org.jetbrains.kotlin.idea.highlighter
 
-import com.intellij.lang.annotation.AnnotationHolder;
-import org.jetbrains.kotlin.resolve.BindingContext;
+import com.intellij.lang.annotation.AnnotationHolder
+import org.jetbrains.kotlin.psi.KtVisitorVoid
 
-abstract class AfterAnalysisHighlightingVisitor extends HighlightingVisitor {
-    protected BindingContext bindingContext;
-
-    protected AfterAnalysisHighlightingVisitor(AnnotationHolder holder, BindingContext bindingContext) {
-        super(holder);
-        this.bindingContext = bindingContext;
-    }
-}
+abstract class HighlightingVisitor protected constructor(protected var holder: AnnotationHolder) : KtVisitorVoid()