Update type folding / Test not working

giraud · Sep 20, 2018 · 7e08000 · 7e08000
1 parent 71472e5
commit 7e08000
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 7 deletions.
diff --git a/src/main/java/com/reason/ide/folding/FoldingBuilder.java b/src/main/java/com/reason/ide/folding/FoldingBuilder.java
@@ -8,10 +8,13 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
+import com.reason.lang.core.PsiUtil;
 import com.reason.lang.core.psi.PsiLet;
 import com.reason.lang.core.psi.PsiModule;
 import com.reason.lang.core.psi.PsiType;
+import com.reason.lang.core.psi.PsiTypeConstrName;
 import com.reason.lang.core.psi.type.MlTypes;
+import com.reason.lang.core.psi.type.ORTypesUtil;
 import com.reason.lang.ocaml.OclTypes;
 import com.reason.lang.reason.RmlLanguage;
 import com.reason.lang.reason.RmlTypes;
@@ -58,9 +61,18 @@ private void foldLet(List<FoldingDescriptor> descriptors, PsiLet letExpression)
     }
 
     private void foldType(List<FoldingDescriptor> descriptors, PsiType typeExpression) {
-        FoldingDescriptor fold = fold(typeExpression.getBinding());
-        if (fold != null) {
-            descriptors.add(fold);
+        PsiElement constrName = PsiTreeUtil.findChildOfType(typeExpression, PsiTypeConstrName.class);
+        if (constrName != null) {
+            MlTypes types = ORTypesUtil.getInstance(typeExpression.getLanguage());
+            PsiElement eqElement = PsiUtil.nextSiblingWithTokenType(constrName, types.EQ);
+            if (eqElement != null) {
+                TextRange eqRange = eqElement.getTextRange();
+                TextRange typeRange = typeExpression.getTextRange();
+                TextRange textRange = TextRange.create(eqRange.getStartOffset(), typeRange.getEndOffset());
+                if (textRange.getLength() > 5) {
+                    descriptors.add(new FoldingDescriptor(typeExpression, textRange));
+                }
+            }
         }
     }
 

diff --git a/src/main/java/com/reason/lang/core/psi/type/MlTypes.java b/src/main/java/com/reason/lang/core/psi/type/MlTypes.java
@@ -1,6 +1,8 @@
 package com.reason.lang.core.psi.type;
 
+import com.intellij.lang.Language;
 import com.intellij.psi.tree.IElementType;
+import org.jetbrains.annotations.NotNull;
 
 public abstract class MlTypes {
 

diff --git a/src/main/java/com/reason/lang/core/psi/type/ORTypesUtil.java b/src/main/java/com/reason/lang/core/psi/type/ORTypesUtil.java
@@ -0,0 +1,16 @@
+package com.reason.lang.core.psi.type;
+
+import com.intellij.lang.Language;
+import com.reason.lang.ocaml.OclLanguage;
+import com.reason.lang.ocaml.OclTypes;
+import com.reason.lang.reason.RmlLanguage;
+import com.reason.lang.reason.RmlTypes;
+import org.jetbrains.annotations.NotNull;
+
+public final class ORTypesUtil {
+
+    public static MlTypes getInstance(@NotNull Language language) {
+        return language instanceof RmlLanguage || language instanceof OclLanguage ? RmlTypes.INSTANCE : OclTypes.INSTANCE;
+    }
+
+}
diff --git a/testData/com/reason/ide/folding/TypeFolding.re b/testData/com/reason/ide/folding/TypeFolding.re
@@ -0,0 +1,3 @@
+type variant <fold>=
+  | B
+  | C</fold>;
diff --git a/tests/com/reason/ide/completion/BasicCompletionTest.java b/tests/com/reason/ide/completion/BasicCompletionTest.java
@@ -1,11 +1,7 @@
 package com.reason.ide.completion;
 
 import com.intellij.codeInsight.completion.CompletionType;
-import com.intellij.codeInsight.lookup.LookupElement;
-import com.intellij.psi.PsiElement;
 import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
-import com.reason.Joiner;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 

diff --git a/tests/com/reason/ide/folding/TypeFoldingTest.java b/tests/com/reason/ide/folding/TypeFoldingTest.java
@@ -0,0 +1,20 @@
+package com.reason.ide.folding;
+
+import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+
+public class TypeFoldingTest extends LightPlatformCodeInsightFixtureTestCase {
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    @Override
+    protected String getTestDataPath() {
+        return "testData/com/reason/ide/folding";
+    }
+
+    public void testModuleLetCompletion() {
+        // NOT WORKING
+        // myFixture.testFolding(getTestDataPath() + "/TypeFolding.re");
+    }
+}