From 4a0f9fa27270ddfba8600ff27a8ce5709cf24f7b Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Tue, 18 Jun 2019 13:45:44 +0300 Subject: [PATCH] add and use EditorUtil#inVirtualSpace(Editor) GitOrigin-RevId: 05a9779f2ff2bf0ffa37c6035875809e4fa2d4ce --- .../codeInsight/daemon/impl/IdentifierHighlighterPass.java | 5 +++-- .../src/com/intellij/openapi/editor/ex/util/EditorUtil.java | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java index dc70eb31ce30..c485c4638832 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java @@ -1,4 +1,4 @@ -// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.codeInsight.daemon.impl; @@ -14,6 +14,7 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.ex.EditorEx; +import com.intellij.openapi.editor.ex.util.EditorUtil; import com.intellij.openapi.editor.impl.DocumentMarkupModel; import com.intellij.openapi.editor.markup.MarkupModel; import com.intellij.openapi.editor.markup.RangeHighlighter; @@ -214,7 +215,7 @@ public class IdentifierHighlighterPass extends TextEditorHighlightingPass { @Override public void doApplyInformationToEditor() { - final boolean virtSpace = TargetElementUtil.inVirtualSpace(myEditor, myEditor.getCaretModel().getOffset()); + final boolean virtSpace = EditorUtil.inVirtualSpace(myEditor); final List infos = virtSpace || isCaretOverCollapsedFoldRegion() ? Collections.emptyList() : getHighlights(); UpdateHighlightersUtil.setHighlightersToEditor(myProject, myDocument, 0, myFile.getTextLength(), infos, getColorsScheme(), getId()); doAdditionalCodeBlockHighlighting(); diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java b/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java index b7b0b9127282..3c76dace4992 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java @@ -639,6 +639,10 @@ public final class EditorUtil { : e.isControlDown() && !e.isMetaDown() && !e.isAltDown() && !e.isShiftDown(); } + public static boolean inVirtualSpace(@NotNull Editor editor) { + return inVirtualSpace(editor, editor.getCaretModel().getLogicalPosition()); + } + public static boolean inVirtualSpace(@NotNull Editor editor, @NotNull LogicalPosition logicalPosition) { return !editor.offsetToLogicalPosition(editor.logicalPositionToOffset(logicalPosition)).equals(logicalPosition); }