diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelObjectShortNameIndex.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelObjectShortNameIndex.java deleted file mode 100644 index 358cd67b193..00000000000 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelObjectShortNameIndex.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2010-2013 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 org.jetbrains.jet.plugin.stubindex; - -import com.intellij.openapi.project.Project; -import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.psi.stubs.StringStubIndexExtension; -import com.intellij.psi.stubs.StubIndexKey; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetObjectDeclaration; - -import java.util.Collection; - -public class JetTopLevelObjectShortNameIndex extends StringStubIndexExtension { - private static final StubIndexKey KEY = KotlinIndexUtil.createIndexKey(JetTopLevelObjectShortNameIndex.class); - - private static final JetTopLevelObjectShortNameIndex ourInstance = new JetTopLevelObjectShortNameIndex(); - - @NotNull - public static JetTopLevelObjectShortNameIndex getInstance() { - return ourInstance; - } - - private JetTopLevelObjectShortNameIndex() {} - - @NotNull - @Override - public StubIndexKey getKey() { - return KEY; - } - - @Override - public Collection get(String s, Project project, @NotNull GlobalSearchScope scope) { - return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project)); - } -} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java index b7a67fa2ca4..7de46328d0b 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java @@ -73,10 +73,6 @@ public class StubIndexServiceImpl implements StubIndexService { if (name != null) { sink.occurrence(JetClassShortNameIndex.getInstance().getKey(), name); - - if (stub.isTopLevel()) { - sink.occurrence(JetTopLevelObjectShortNameIndex.getInstance().getKey(), name); - } } if (fqName != null) { diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 97f9cbc14cc..f4203d4228a 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -409,7 +409,6 @@ -