@@ -7,7 +7,6 @@ import com.intellij.psi.PsiManager
77import com.intellij.psi.TokenType
88import com.intellij.psi.util.PsiTreeUtil
99import com.intellij.psi.util.elementType
10- import com.intellij.refactoring.suggested.startOffset
1110import org.rhai.*
1211import org.rhai.lang.RhaiFile
1312
@@ -213,7 +212,7 @@ class RhaiGotoDeclarationHandler : GotoDeclarationHandler {
213212 ) {
214213 PsiTreeUtil .findChildrenOfType(file, RhaiFunctionDefinition ::class .java).forEach { funcDef ->
215214 val identifier = funcDef.identifier
216- if (identifier.text == name && identifier.startOffset != sourceElement.startOffset ) {
215+ if (identifier.text == name && identifier.textOffset != sourceElement.textOffset ) {
217216 targets.add(identifier)
218217 }
219218 }
@@ -225,7 +224,7 @@ class RhaiGotoDeclarationHandler : GotoDeclarationHandler {
225224 sourceElement : PsiElement ,
226225 targets : MutableList <PsiElement >
227226 ) {
228- val sourceOffset = sourceElement.startOffset
227+ val sourceOffset = sourceElement.textOffset
229228
230229 // Find let declarations
231230 PsiTreeUtil .findChildrenOfType(file, RhaiLetDeclaration ::class .java)
@@ -273,7 +272,7 @@ class RhaiGotoDeclarationHandler : GotoDeclarationHandler {
273272 val forStmt = PsiTreeUtil .getParentOfType(sourceElement, RhaiForStatement ::class .java)
274273 forStmt?.let {
275274 val idNode = it.node.findChildByType(RhaiTypes .IDENTIFIER )
276- if (idNode?.text == name && idNode.startOffset != sourceElement.startOffset ) {
275+ if (idNode?.text == name && idNode.psi.textOffset != sourceElement.textOffset ) {
277276 targets.add(idNode.psi)
278277 }
279278 }
@@ -292,7 +291,7 @@ class RhaiGotoDeclarationHandler : GotoDeclarationHandler {
292291 closure.closureParams?.closureParamList?.forEach { param ->
293292 val pattern = param.pattern
294293 val idNode = pattern.node.findChildByType(RhaiTypes .IDENTIFIER )
295- if (idNode?.text == name && idNode.startOffset != sourceElement.startOffset ) {
294+ if (idNode?.text == name && idNode.psi.textOffset != sourceElement.textOffset ) {
296295 targets.add(idNode.psi)
297296 }
298297 }
0 commit comments