MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

unwrapped selection: ensure highlighting is set according to the text range (IDEA-161690)

Browse Source
This commit is contained in:
Anna.Kozlova
2016-09-27 17:21:04 +02:00
parent c661ba9291
commit 457ad67441
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/codeInsight/unwrap/UnwrapMethodParameterTest.java
+13
View File
@@ -1,5 +1,7 @@
package com.intellij.codeInsight.unwrap;
import com.intellij.openapi.editor.markup.RangeHighlighter;
public class UnwrapMethodParameterTest extends UnwrapTestCase {
public void testBasic() throws Exception {
assertOptions("foo(ba<caret>r());",
@@ -69,4 +71,15 @@ public class UnwrapMethodParameterTest extends UnwrapTestCase {
assertUnwrapped("int f = foo(bar(\"path\"<caret>));",
"int f = foo(\"path\"<caret>);");
}
public void testHighlightingOfTheExtractedFragment() throws Exception {
assertOptions("foo(bar.st<caret>r);",
"Unwrap 'bar.str'");
assertUnwrapped("foo(bar.st<caret>r);",
"bar.str;");
final RangeHighlighter[] highlighters = myEditor.getMarkupModel().getAllHighlighters();
assertSize(1, highlighters);
assertEquals(42, highlighters[0].getStartOffset());
assertEquals(49, highlighters[0].getEndOffset());
}
}
platform/lang-impl/src/com/intellij/codeInsight/unwrap/UnwrapHandler.java
+4 -2
View File
@@ -34,6 +34,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.popup.*;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.impl.source.tree.RecursiveTreeElementWalkingVisitor;
@@ -216,10 +217,11 @@ public class UnwrapHandler implements CodeInsightActionHandler {
private void highlightExtractedElements(final List<PsiElement> extractedElements) {
for (PsiElement each : extractedElements) {
final TextRange textRange = each.getTextRange();
HighlightManager.getInstance(myProject).addRangeHighlight(
myEditor,
each.getTextOffset(),
each.getTextOffset() + each.getTextLength(),
textRange.getStartOffset(),
textRange.getEndOffset(),
getTestAttributesForExtract(),
false,
true,