/*
 * 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.
 * 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.psi.search;

import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;

import java.util.LinkedHashSet;
import java.util.Set;

public class GlobalSearchScopeUtil {
  @NotNull
  public static GlobalSearchScope toGlobalSearchScope(@NotNull final SearchScope scope, @NotNull Project project) {
    if (scope instanceof GlobalSearchScope) {
      return (GlobalSearchScope)scope;
    }
    return ReadAction.compute(() -> GlobalSearchScope.filesScope(project, getLocalScopeFiles((LocalSearchScope)scope)));
  }

  @NotNull
  public static Set<VirtualFile> getLocalScopeFiles(@NotNull final LocalSearchScope scope) {
    return ReadAction.compute(() -> {
      Set<VirtualFile> files = new LinkedHashSet<>();
      for (VirtualFile file : scope.getVirtualFiles()) {
        ContainerUtil.addIfNotNull(files, file);
      }
      return files;
    });
  }
}

@@ -770,16 +770,85 @@
 alFile;%0A
+import com.intellij.psi.PsiElement;%0Aimport com.intellij.psi.PsiFile;%0A
 import c
@@ -1580,31 +1580,176 @@
 or (
-VirtualFile file : scop
+PsiElement element : scope.getScope()) %7B%0A        PsiFile file = element.getContainingFile();%0A        if (file != null) %7B%0A          ContainerUtil.addIfNotNull(files, fil
 e.ge
@@ -1764,15 +1764,15 @@
 File
-s
 ())
- %7B%0A
+;%0A  
     
@@ -1813,18 +1813,88 @@
 es, file
-);
+.getNavigationElement().getContainingFile().getVirtualFile());%0A        %7D
 %0A      %7D

Rollback the part that might have changed the behvaior