properties: rename & minor
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Tue, 31 May 2016 12:54:32 +0000 (15:54 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Tue, 31 May 2016 12:54:32 +0000 (15:54 +0300)
plugins/properties/properties-psi-api/src/com/intellij/lang/properties/psi/PropertyKeyIndex.java
plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/references/PropertiesPsiCompletionUtil.java

index 5f4acef71be1ac2e2dd44cac7cc0b6e65def6cbf..e8c8be6f9c7228e9e689dc7b8987ffd1c7004a78 100644 (file)
@@ -43,7 +43,7 @@ public class PropertyKeyIndex extends StringStubIndexExtension<Property> {
   }
 
   @Override
-  public Collection<Property> get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) {
-    return StubIndex.getElements(getKey(), s, project, scope, Property.class);
+  public Collection<Property> get(@NotNull String key, @NotNull Project project, @NotNull GlobalSearchScope scope) {
+    return StubIndex.getElements(getKey(), key, project, scope, Property.class);
   }
 }
index 4fe5ce2f8e8dec6a834f22f5f924321cc0e303cc..92aa1eb9ad8575d3b47946386819fc8fc8806698 100644 (file)
@@ -32,7 +32,7 @@ public class PropertiesPsiCompletionUtil {
                                          final PropertiesFile propertiesFile,
                                          final Set<Object> variants) {
     if (propertiesFile == null) return;
-    if (!ProjectRootManager.getInstance(propertyReference.getElement().getProject()).getFileIndex().isInContent(propertiesFile.getVirtualFile())) return;
+    if (!ProjectRootManager.getInstance(propertiesFile.getProject()).getFileIndex().isInContent(propertiesFile.getVirtualFile())) return;
     List<? extends IProperty> properties = propertiesFile.getProperties();
     for (IProperty property : properties) {
       propertyReference.addKey(property, variants);