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 b5c94194899a..6611f965f3a5 100644 --- a/platform/core-impl/src/com/intellij/codeInsight/completion/CompletionUtilCoreImpl.java +++ b/platform/core-impl/src/com/intellij/codeInsight/completion/CompletionUtilCoreImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 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. @@ -39,8 +39,8 @@ public class CompletionUtilCoreImpl { if (containingFile == null) return psi; PsiFile originalFile = containingFile.getOriginalFile(); - if (originalFile != containingFile && !(originalFile instanceof PsiCompiledFile) && psi.getTextRange() != null) { - TextRange range = psi.getTextRange(); + TextRange range; + if (originalFile != containingFile && !(originalFile instanceof PsiCompiledFile) && (range = psi.getTextRange()) != null) { Integer start = range.getStartOffset(); Integer end = range.getEndOffset();