ifdef/ifndef/endif body references attributes in PSI asciidoctor#275

ahus1 · Jul 12, 2019 · 57d1e7d · 57d1e7d
1 parent fdd2833
commit 57d1e7d
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 3 deletions.
diff --git a/src/main/java/org/asciidoc/intellij/psi/AsciiDocAttributeDeclarationReference.java b/src/main/java/org/asciidoc/intellij/psi/AsciiDocAttributeDeclarationReference.java
@@ -61,13 +61,15 @@ public Object[] getVariants() {
         String attributeName = declaration.getAttributeName();
         variants.add(LookupElementBuilder.create(attributeName)
           .withIcon(AsciiDocIcons.ASCIIDOC_ICON)
-          .withPresentableText(attributeName + value)
+          .withTailText(value, true)
           .withTypeText(declaration.getContainingFile().getName())
           .withInsertHandler((insertionContext, item) -> {
             // the finalizing } hasn't been entered yet, autocomplete it here
             int offset = insertionContext.getStartOffset();
             PsiElement element = insertionContext.getFile().findElementAt(offset);
-            if (element != null && element.getNode() != null && element.getNode().getElementType() != AsciiDocTokenTypes.ATTRIBUTE_REF) {
+            if (element != null && element.getNode() != null
+              && element.getNode().getElementType() != AsciiDocTokenTypes.ATTRIBUTE_REF
+              && element.getNode().getElementType() != AsciiDocTokenTypes.BLOCK_MACRO_BODY) {
               offset += attributeName.length();
               insertionContext.getDocument().insertString(offset, "}");
               offset += 1;

diff --git a/src/main/java/org/asciidoc/intellij/psi/AsciiDocBlockMacro.java b/src/main/java/org/asciidoc/intellij/psi/AsciiDocBlockMacro.java
@@ -23,6 +23,7 @@
  */
 public class AsciiDocBlockMacro extends AsciiDocStandardBlock {
   private static final Set<String> HAS_FILE_AS_BODY = new HashSet<>();
+  private static final Set<String> HAS_ATTRIBUTE_BODY = new HashSet<>();
 
   static {
     HAS_FILE_AS_BODY.addAll(Arrays.asList(
@@ -33,6 +34,10 @@ public class AsciiDocBlockMacro extends AsciiDocStandardBlock {
       "nwdiag", "packetdiag", "plantuml", "rackdiag", "seqdiag", "shaape", "svgbob",
       "syntrax", "umlet", "vega", "vegalite", "wavedrom"
     ));
+    HAS_ATTRIBUTE_BODY.addAll(Arrays.asList(
+      // standard asciidoctor
+      "ifdef", "ifndef"
+    ));
   }
 
   public AsciiDocBlockMacro(@NotNull ASTNode node) {
@@ -65,6 +70,29 @@ public PsiReference[] getReferences() {
         );
         return references.toArray(new PsiReference[0]);
       }
+    } else if (HAS_ATTRIBUTE_BODY.contains(getMacroName())) {
+      ASTNode bodyNode = getNode().findChildByType(AsciiDocTokenTypes.BLOCK_MACRO_BODY);
+      if (bodyNode != null) {
+        String file = bodyNode.getText();
+        ArrayList<PsiReference> references = new ArrayList<>();
+        int start = 0;
+        for (int i = 0; i < file.length(); ++i) {
+          if (file.charAt(i) == ',' || file.charAt(i) == '+') {
+            references.add(
+              new AsciiDocAttributeDeclarationReference(this,
+                TextRange.create(bodyNode.getPsi().getStartOffsetInParent() + start, bodyNode.getPsi().getStartOffsetInParent() + i)
+              )
+            );
+            start = i + 1;
+          }
+        }
+        references.add(
+          new AsciiDocAttributeDeclarationReference(this,
+            TextRange.create(bodyNode.getPsi().getStartOffsetInParent() + start, bodyNode.getPsi().getStartOffsetInParent() + file.length())
+          )
+        );
+        return references.toArray(new PsiReference[0]);
+      }
     }
     return super.getReferences();
   }

diff --git a/src/main/java/org/asciidoc/intellij/psi/AsciiDocFileReference.java b/src/main/java/org/asciidoc/intellij/psi/AsciiDocFileReference.java
@@ -141,7 +141,8 @@ public Object[] getVariants() {
         final Icon icon = result.getElement().getIcon(Iconable.ICON_FLAG_READ_STATUS | Iconable.ICON_FLAG_VISIBILITY);
         additionalItems.add(
           FileInfoManager.getFileLookupItem(result.getElement(), "{" + decl.getAttributeName() + "}", icon)
-            .withTypeText(decl.getAttributeValue())
+            .withTailText(" (" + decl.getAttributeValue() + ")", true)
+            .withTypeText(decl.getContainingFile().getName())
         );
       }
     }

diff --git a/src/test/java/org/asciidoc/intellij/psi/AsciiDocPsiTest.java b/src/test/java/org/asciidoc/intellij/psi/AsciiDocPsiTest.java
@@ -51,9 +51,20 @@ public void testImageBlockMacroWithReferences() {
     assertEquals(1, children.length);
     AsciiDocBlockMacro blockMacro = (AsciiDocBlockMacro) children[0];
     assertEquals(2, blockMacro.getReferences().length);
+    assertEquals(AsciiDocFileReference.class, blockMacro.getReferences()[0].getClass());
     assertEquals(2, blockMacro.getReferences()[0].getVariants().length);
   }
 
+  public void testIfdefBlockMacroWithReferences() {
+    PsiFile psiFile = configureByAsciiDoc(":hi: ho\nifdef::hi,ho+hu[]");
+    PsiElement[] children = psiFile.getChildren();
+    assertEquals(3, children.length);
+    AsciiDocBlockMacro blockMacro = (AsciiDocBlockMacro) children[2];
+    assertEquals(3, blockMacro.getReferences().length);
+    assertEquals(AsciiDocAttributeDeclarationReference.class, blockMacro.getReferences()[0].getClass());
+    assertEquals(1, blockMacro.getReferences()[0].getVariants().length);
+  }
+
   public void testIncompleteBlockMacroWithAttributesInNewLine() {
     PsiFile psiFile = configureByAsciiDoc("image::foo.png\n[hi]");
     PsiElement[] children = psiFile.getChildren();