From fe5ffdca097cbba61ba6a4ecc75e8893409cdc38 Mon Sep 17 00:00:00 2001
From: Daniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Date: Tue, 25 Feb 2020 13:44:14 +0300
Subject: [PATCH] IDEA-232792 use adjusted offset to find fallback declaration
 via TargetElementUtil

GitOrigin-RevId: 9ff910b85f28508236f748b33214cd59e3d080ae
---
 .../src/com/intellij/model/psi/impl/declarations.kt         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/model/psi/impl/declarations.kt b/platform/lang-impl/src/com/intellij/model/psi/impl/declarations.kt
index ac1728718424..24bbf09b17d2 100644
--- a/platform/lang-impl/src/com/intellij/model/psi/impl/declarations.kt
+++ b/platform/lang-impl/src/com/intellij/model/psi/impl/declarations.kt
@@ -4,10 +4,12 @@
 package com.intellij.model.psi.impl
 
 import com.intellij.codeInsight.TargetElementUtil
+import com.intellij.codeInsight.TargetElementUtilBase
 import com.intellij.model.psi.PsiSymbolDeclaration
 import com.intellij.model.psi.PsiSymbolDeclarationProvider
 import com.intellij.openapi.extensions.ExtensionPointName
 import com.intellij.openapi.progress.ProgressManager
+import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.util.elementsAroundOffsetUp
@@ -26,7 +28,9 @@ fun PsiFile.allDeclarationsAround(offsetInFile: Int): Collection<PsiSymbolDeclar
   }
 
   // fall back
-  val leaf: PsiElement? = findElementAt(offsetInFile)
+  val document = PsiDocumentManager.getInstance(project).getDocument(this) ?: return emptyList()
+  val adjustedOffset = TargetElementUtilBase.adjustOffset(this, document, offsetInFile)
+  val leaf: PsiElement? = findElementAt(adjustedOffset)
   if (leaf != null) {
     val namedElement: PsiElement? = TargetElementUtil.getNamedElement(leaf)
     if (namedElement != null) {