From f623cf21b8bc18e22bdb707469d805b06a7be67f Mon Sep 17 00:00:00 2001 From: Alexey Gopachenko Date: Wed, 19 Nov 2014 10:11:34 +0100 Subject: [PATCH] Fix non-file scope case for CR-IU-898 Significant performance improvement for processing word at caret (i.e. var highlights) for worst cases (cherry picked from commit fcc3450) --- .../src/com/intellij/psi/impl/search/LowLevelSearchUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java index fd1e532bad08..e600b6d720d0 100644 --- a/platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java @@ -145,7 +145,7 @@ public class LowLevelSearchUtil { TreeElement leafNode; int offsetR = offset; if (last !=null) { - offsetR -= last.getStartOffset() + last.getTextLength(); + offsetR -= (last.getStartOffset() - scopeNode.getStartOffset()) + last.getTextLength(); out: while (offsetR >= 0) { TreeElement next = last.getTreeNext();