From 256733b5984ba701e3e1258c2db39bb23cae6a04 Mon Sep 17 00:00:00 2001
From: "Natalia.Ukhorskaya" <natalia.ukhorskaya@jetbrains.com>
Date: Wed, 13 Feb 2013 13:34:33 +0400
Subject: [PATCH] find expression at offset without whitespaces

---
 .../refactoring/JetRefactoringUtil.java       | 50 ++++++++++++++-----
 1 file changed, 37 insertions(+), 13 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
index e084a4a82ec..b7826997601 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
@@ -182,9 +182,8 @@ public class JetRefactoringUtil {
 
     @Nullable
     public static JetExpression findExpression(@NotNull PsiFile file, int startOffset, int endOffset) throws IntroduceRefactoringException{
-        PsiElement element = PsiTreeUtil.findElementOfClassAtRange(file, startOffset, endOffset, JetExpression.class);
-        if (element == null || element.getTextRange().getStartOffset() != startOffset ||
-            element.getTextRange().getEndOffset() != endOffset) {
+        PsiElement element = findElementOfClassAtRange(file, startOffset, endOffset, JetExpression.class);
+        if (element == null) {
             //todo: if it's infix expression => add (), then commit document then return new created expression
             throw new IntroduceRefactoringException(JetRefactoringBundle.message("cannot.refactor.not.expression"));
         }
@@ -203,20 +202,45 @@ public class JetRefactoringUtil {
         return (JetExpression) element;
     }
 
+    @Nullable
+    public static PsiElement findElementOfClassAtRange(@NotNull PsiFile file, int startOffset, int endOffset, Class<JetExpression> aClass) {
+        PsiElement element1 = getElementAtOffsetIgnoreWhitespaceBefore(file, startOffset);
+        PsiElement element2 = getElementAtOffsetIgnoreWhitespaceAfter(file, endOffset);
+
+        if (element1 == null || element2 == null) return null;
+
+        return PsiTreeUtil.findElementOfClassAtRange(file, element1.getTextRange().getStartOffset(),
+                                                     element2.getTextRange().getEndOffset(), aClass);
+    }
+
+    @Nullable
+    private static PsiElement getElementAtOffsetIgnoreWhitespaceBefore(@NotNull PsiFile file, int offset) {
+        PsiElement element = file.findElementAt(offset);
+        if (element instanceof PsiWhiteSpace) {
+            return file.findElementAt(element.getTextRange().getEndOffset());
+        }
+        return element;
+    }
+
+    @Nullable
+    private static PsiElement getElementAtOffsetIgnoreWhitespaceAfter(@NotNull PsiFile file, int offset) {
+        PsiElement element = file.findElementAt(offset - 1);
+        if (element instanceof PsiWhiteSpace) {
+            return file.findElementAt(element.getTextRange().getStartOffset() - 1);
+        }
+        return element;
+    }
+
     @NotNull
     public static PsiElement[] findStatements(@NotNull PsiFile file, int startOffset, int endOffset) {
-        PsiElement element1 = file.findElementAt(startOffset);
-        PsiElement element2 = file.findElementAt(endOffset - 1);
-        if (element1 instanceof PsiWhiteSpace) {
-            startOffset = element1.getTextRange().getEndOffset();
-            element1 = file.findElementAt(startOffset);
-        }
-        if (element2 instanceof PsiWhiteSpace) {
-            endOffset = element2.getTextRange().getStartOffset();
-            element2 = file.findElementAt(endOffset - 1);
-        }
+        PsiElement element1 = getElementAtOffsetIgnoreWhitespaceBefore(file, startOffset);
+        PsiElement element2 = getElementAtOffsetIgnoreWhitespaceAfter(file, endOffset);
+
         if (element1 == null || element2 == null) return PsiElement.EMPTY_ARRAY;
 
+        startOffset = element1.getTextRange().getStartOffset();
+        endOffset = element2.getTextRange().getEndOffset();
+
         PsiElement parent = PsiTreeUtil.findCommonParent(element1, element2);
         if (parent == null) return PsiElement.EMPTY_ARRAY;
         while (true) {