From 28a45909a0f4aa596b24a1ba5564826906f902c5 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Sat, 22 Jun 2019 19:41:36 +0300 Subject: [PATCH] Fix compatibility with 192 branch (KT-32364) --- .../trackers/KotlinCodeBlockModificationListener.kt | 2 +- .../caches/trackers/psiModificationTrackerCompat.kt | 12 ++++++++++++ .../trackers/psiModificationTrackerCompat.kt.192 | 12 ++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/psiModificationTrackerCompat.kt create mode 100644 idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/psiModificationTrackerCompat.kt.192 diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt index 09bfb5a6033..c22590c7caf 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt @@ -45,7 +45,7 @@ class KotlinCodeBlockModificationListener( private val modificationTrackerImpl = modificationTracker as PsiModificationTrackerImpl @Suppress("UnstableApiUsage") - private val isLanguageTrackerEnabled = modificationTrackerImpl.isEnableLanguageTracker + private val isLanguageTrackerEnabled = modificationTrackerImpl.isEnableLanguageTrackerCompat // BUNCH: 183 // When there're we no per-language trackers we had to increment global tracker first and process result afterward diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/psiModificationTrackerCompat.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/psiModificationTrackerCompat.kt new file mode 100644 index 00000000000..3272915ebda --- /dev/null +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/psiModificationTrackerCompat.kt @@ -0,0 +1,12 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea.caches.trackers + +import com.intellij.psi.impl.PsiModificationTrackerImpl + +// BUNCH: 191 +@Suppress("unused") +val PsiModificationTrackerImpl.isEnableLanguageTrackerCompat get() = isEnableLanguageTracker \ No newline at end of file diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/psiModificationTrackerCompat.kt.192 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/psiModificationTrackerCompat.kt.192 new file mode 100644 index 00000000000..e7426b9b021 --- /dev/null +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/psiModificationTrackerCompat.kt.192 @@ -0,0 +1,12 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea.caches.trackers + +import com.intellij.psi.impl.PsiModificationTrackerImpl + +// BUNCH: 191 +@Suppress("unused") +val PsiModificationTrackerImpl.isEnableLanguageTrackerCompat get() = true \ No newline at end of file