Skip to content

Commit 3f41361

Browse files
Changed index name
1 parent b07d4c9 commit 3f41361

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

resources/META-INF/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
<fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.js.MagentoLibJsIndex" />
126126
<fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.xml.AclResourceIndex" />
127127
<fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.xml.MenuIndex" />
128-
<fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.xml.TableAndColumnNameIndex" />
128+
<fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.xml.DeclarativeSchemaElementsIndex" />
129129

130130
<codeInsight.lineMarkerProvider language="PHP" implementationClass="com.magento.idea.magento2plugin.linemarker.php.PluginLineMarkerProvider"/>
131131
<codeInsight.lineMarkerProvider language="PHP" implementationClass="com.magento.idea.magento2plugin.linemarker.php.PluginTargetLineMarkerProvider"/>

src/com/magento/idea/magento2plugin/completion/provider/ColumnNameCompletionProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import com.intellij.util.ProcessingContext;
1717
import com.intellij.util.indexing.FileBasedIndex;
1818
import com.magento.idea.magento2plugin.magento.files.ModuleDbSchemaXml;
19-
import com.magento.idea.magento2plugin.stubs.indexes.xml.TableAndColumnNameIndex;
19+
import com.magento.idea.magento2plugin.stubs.indexes.xml.DeclarativeSchemaElementsIndex;
2020
import java.util.Collection;
2121
import java.util.List;
2222
import java.util.stream.Collectors;
@@ -58,7 +58,7 @@ protected void addCompletions(
5858
return;
5959
}
6060
final Collection<String> tableAndColumnNames = FileBasedIndex.getInstance().getAllKeys(
61-
TableAndColumnNameIndex.KEY, position.getProject()
61+
DeclarativeSchemaElementsIndex.KEY, position.getProject()
6262
);
6363
final List<String> filteredColumnNames = tableAndColumnNames.stream()
6464
.filter(name -> name.contains(targetTableName + ".")).collect(Collectors.toList())

src/com/magento/idea/magento2plugin/completion/provider/TableNameCompletionProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.intellij.psi.PsiElement;
1313
import com.intellij.util.ProcessingContext;
1414
import com.intellij.util.indexing.FileBasedIndex;
15-
import com.magento.idea.magento2plugin.stubs.indexes.xml.TableAndColumnNameIndex;
15+
import com.magento.idea.magento2plugin.stubs.indexes.xml.DeclarativeSchemaElementsIndex;
1616
import java.util.Collection;
1717
import java.util.List;
1818
import java.util.stream.Collectors;
@@ -34,7 +34,7 @@ protected void addCompletions(
3434
}
3535

3636
final Collection<String> tableNames = FileBasedIndex.getInstance().getAllKeys(
37-
TableAndColumnNameIndex.KEY, position.getProject()
37+
DeclarativeSchemaElementsIndex.KEY, position.getProject()
3838
);
3939
final List<String> filteredTableNames = tableNames.stream()
4040
.filter(name -> !name.contains(".")).collect(Collectors.toList());

src/com/magento/idea/magento2plugin/indexes/IndexManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import com.magento.idea.magento2plugin.stubs.indexes.mftf.SectionIndex;
2626
import com.magento.idea.magento2plugin.stubs.indexes.mftf.TestNameIndex;
2727
import com.magento.idea.magento2plugin.stubs.indexes.xml.AclResourceIndex;
28+
import com.magento.idea.magento2plugin.stubs.indexes.xml.DeclarativeSchemaElementsIndex;
2829
import com.magento.idea.magento2plugin.stubs.indexes.xml.MenuIndex;
2930
import com.magento.idea.magento2plugin.stubs.indexes.xml.PhpClassNameIndex;
30-
import com.magento.idea.magento2plugin.stubs.indexes.xml.TableAndColumnNameIndex;
3131

3232
@SuppressWarnings({"PMD.ClassNamingConventions", "PMD.UseUtilityClass"})
3333
public class IndexManager {
@@ -42,7 +42,7 @@ public static void manualReindex() {
4242
// xml|di configuration
4343
PluginIndex.KEY,
4444
VirtualTypeIndex.KEY,
45-
TableAndColumnNameIndex.KEY,
45+
DeclarativeSchemaElementsIndex.KEY,
4646
// layouts
4747
BlockNameIndex.KEY,
4848
ContainerNameIndex.KEY,

src/com/magento/idea/magento2plugin/reference/provider/TableColumnNamesReferenceProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.intellij.util.indexing.FileBasedIndex;
2424
import com.magento.idea.magento2plugin.magento.files.ModuleDbSchemaXml;
2525
import com.magento.idea.magento2plugin.reference.xml.PolyVariantReferenceBase;
26-
import com.magento.idea.magento2plugin.stubs.indexes.xml.TableAndColumnNameIndex;
26+
import com.magento.idea.magento2plugin.stubs.indexes.xml.DeclarativeSchemaElementsIndex;
2727
import java.util.ArrayList;
2828
import java.util.Collection;
2929
import java.util.List;
@@ -80,7 +80,7 @@ public PsiReference[] getReferencesByElement(
8080
}
8181
}
8282
final Collection<VirtualFile> files = FileBasedIndex.getInstance()
83-
.getContainingFiles(TableAndColumnNameIndex.KEY, identifier,
83+
.getContainingFiles(DeclarativeSchemaElementsIndex.KEY, identifier,
8484
GlobalSearchScope.getScopeRestrictedByFileTypes(
8585
GlobalSearchScope.allScope(element.getProject()),
8686
XmlFileType.INSTANCE

src/com/magento/idea/magento2plugin/stubs/indexes/xml/TableAndColumnNameIndex.java renamed to src/com/magento/idea/magento2plugin/stubs/indexes/xml/DeclarativeSchemaElementsIndex.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/**
2828
* Index to store table names and column names from db_schema.xml files.
2929
*/
30-
public class TableAndColumnNameIndex extends FileBasedIndexExtension<String, Void> {
30+
public class DeclarativeSchemaElementsIndex extends FileBasedIndexExtension<String, Void> {
3131
public static final ID<String, Void> KEY = ID.create(
3232
"com.magento.idea.magento2plugin.stubs.indexes.db_schema.tables_and_columns");
3333
private final KeyDescriptor<String> myKeyDescriptor = new EnumeratorStringDescriptor();

0 commit comments

Comments
 (0)