Implemented proper completion for slots names

Fixes #1636
Camelcade · Nov 28, 2017 · 3d54e08 · 3d54e08
1 parent 1b3867b
commit 3d54e08
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 1 deletion.
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -49,6 +49,7 @@
        <li>Intention to convert statement with modifier to compound statement and vice versa, by <a href="https://github.com/Camelcade/Perl5-IDEA/issues/1604">cjelli</a>
        <li>Re-worked live templates: abbreviations, defaults and so on (need a feedback)</li>
        <li>Already typed import parameters are now excluded from completion</li>
+       <li>Completion in braces after typeglobs now contains slots names</li>
      </ul>
      </p>
      <p>Fixes:

diff --git a/src/com/perl5/lang/perl/idea/completion/providers/PerlStringContentCompletionProvider.java b/src/com/perl5/lang/perl/idea/completion/providers/PerlStringContentCompletionProvider.java
@@ -22,11 +22,14 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiLanguageInjectionHost;
 import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.ProcessingContext;
 import com.perl5.lang.perl.idea.PerlElementPatterns;
 import com.perl5.lang.perl.idea.completion.util.PerlPackageCompletionUtil;
 import com.perl5.lang.perl.idea.completion.util.PerlStringCompletionUtil;
 import com.perl5.lang.perl.psi.PsiPerlAnnotationInject;
+import com.perl5.lang.perl.psi.PsiPerlGlobSlot;
+import com.perl5.lang.perl.psi.PsiPerlHashIndex;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -50,7 +53,13 @@ protected void addCompletions(@NotNull CompletionParameters parameters,
     }
     else if (SIMPLE_HASH_INDEX.accepts(element))    // hash indexes
     {
-      PerlStringCompletionUtil.fillWithHashIndexes(element, result);
+      PsiPerlHashIndex indexElement = PsiTreeUtil.getParentOfType(element, PsiPerlHashIndex.class);
+      if (indexElement != null && indexElement.getParent() instanceof PsiPerlGlobSlot) {
+        PerlStringCompletionUtil.fillWithRefTypes(result);
+      }
+      else {
+        PerlStringCompletionUtil.fillWithHashIndexes(element, result);
+      }
     }
     else if (USE_PARAMETERS_PATTERN.accepts(element))    // use or no parameters
     {

diff --git a/test/completion/PerlCompletionTest.java b/test/completion/PerlCompletionTest.java
@@ -380,4 +380,6 @@ public void testTryCatch() {
   public void testPackageVarTypeAnnotation() {doTestCompletion();}
 
   public void testLazyExportOkQw() {doTestCompletion();}
+
+  public void testGlobSlots() {doTestCompletion();}
 }
diff --git a/testData/completion/perl/globSlots.code b/testData/completion/perl/globSlots.code
@@ -0,0 +1 @@
+*a{<caret>}
diff --git a/testData/completion/perl/globSlots.pl.txt b/testData/completion/perl/globSlots.pl.txt
@@ -0,0 +1,11 @@
+Lookups: ARRAY; Text: ARRAY; Tail: null; Type: null; Icon: null; Type Icon: null
+Lookups: CODE; Text: CODE; Tail: null; Type: null; Icon: null; Type Icon: null
+Lookups: FORMAT; Text: FORMAT; Tail: null; Type: null; Icon: null; Type Icon: null
+Lookups: GLOB; Text: GLOB; Tail: null; Type: null; Icon: null; Type Icon: null
+Lookups: HASH; Text: HASH; Tail: null; Type: null; Icon: null; Type Icon: null
+Lookups: IO; Text: IO; Tail: null; Type: null; Icon: null; Type Icon: null
+Lookups: LVALUE; Text: LVALUE; Tail: null; Type: null; Icon: null; Type Icon: null
+Lookups: REF; Text: REF; Tail: null; Type: null; Icon: null; Type Icon: null
+Lookups: Regexp; Text: Regexp; Tail: null; Type: null; Icon: null; Type Icon: null
+Lookups: SCALAR; Text: SCALAR; Tail: null; Type: null; Icon: null; Type Icon: null
+Lookups: VSTRING; Text: VSTRING; Tail: null; Type: null; Icon: null; Type Icon: null