IDEA-136017 (obscure lookup inside decompiled files avoided)

diff --git a/platform/core-impl/src/com/intellij/codeInsight/completion/CompletionUtilCoreImpl.java b/platform/core-impl/src/com/intellij/codeInsight/completion/CompletionUtilCoreImpl.java
index 6a7dfe574d6be4542270587227051f5cb2ab478c..b5c94194899ad83dcf3d31630a497cdd866e7095 100644 (file)
--- a/platform/core-impl/src/com/intellij/codeInsight/completion/CompletionUtilCoreImpl.java
+++ b/platform/core-impl/src/com/intellij/codeInsight/completion/CompletionUtilCoreImpl.java
@@ -1,8 +1,24 @@
+/*
+ * Copyright 2000-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.intellij.codeInsight.completion;
 
 import com.intellij.injected.editor.DocumentWindow;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.util.TextRange;
+import com.intellij.psi.PsiCompiledFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -15,16 +31,20 @@ import org.jetbrains.annotations.Nullable;
 public class CompletionUtilCoreImpl {
   @Nullable
   public static <T extends PsiElement> T getOriginalElement(@NotNull T psi) {
-    final PsiFile file = psi.getContainingFile();
-    return getOriginalElement(psi, file);
+    return getOriginalElement(psi, psi.getContainingFile());
   }
 
+  @Nullable
   public static <T extends PsiElement> T getOriginalElement(@NotNull T psi, PsiFile containingFile) {
-    if (containingFile != null && containingFile != containingFile.getOriginalFile() && psi.getTextRange() != null) {
+    if (containingFile == null) return psi;
+
+    PsiFile originalFile = containingFile.getOriginalFile();
+    if (originalFile != containingFile && !(originalFile instanceof PsiCompiledFile) && psi.getTextRange() != null) {
       TextRange range = psi.getTextRange();
       Integer start = range.getStartOffset();
       Integer end = range.getEndOffset();
-      final Document document = containingFile.getViewProvider().getDocument();
+
+      Document document = containingFile.getViewProvider().getDocument();
       if (document != null) {
         Document hostDocument = document instanceof DocumentWindow ? ((DocumentWindow)document).getDelegate() : document;
         OffsetTranslator translator = hostDocument.getUserData(OffsetTranslator.RANGE_TRANSLATION);
@@ -47,8 +67,9 @@ public class CompletionUtilCoreImpl {
           }
         }
       }
+
       //noinspection unchecked
-      return (T)PsiTreeUtil.findElementOfClassAtRange(containingFile.getOriginalFile(), start, end, psi.getClass());
+      return (T)PsiTreeUtil.findElementOfClassAtRange(originalFile, start, end, psi.getClass());
     }
 
     return psi;