[ acore, minitt, mlpolyr, redprl, agda ] Extract folding function

Author: ice1000

res/META-INF/change-notes.html

@@ -1,6 +1,7 @@
 0.5.0<br/>
 <ul>
 	<li>IntelliJ Platform 2019.2 compatibility</li>
+	<li>Tons of internal refactorings: generate more codes</li>
 </ul>
 0.4.2<br/>
 <ul>

src/org/ice1000/tt/editing/acore/folding.kt

@@ -6,7 +6,6 @@ import com.intellij.lang.folding.FoldingDescriptor
 import com.intellij.openapi.editor.Document
 import com.intellij.openapi.project.DumbAware
 import com.intellij.psi.PsiElement
-import com.intellij.psi.util.PsiTreeUtil
 import org.ice1000.tt.ACoreFile
 import org.ice1000.tt.FOLDING_PLACEHOLDER
 import org.ice1000.tt.editing.*
@@ -33,17 +32,11 @@ class ACoreFoldingBuilder : FoldingBuilderEx(), DumbAware {
 
 	override fun buildFoldRegions(root: PsiElement, document: Document, quick: Boolean): Array<FoldingDescriptor> {
 		if (root !is ACoreFile) return emptyArray()
-		val descriptors = mutableListOf<FoldingDescriptor>()
-		val visitor = FoldingVisitor(descriptors, document)
-		PsiTreeUtil.processElements(root) {
-			it.accept(visitor)
-			true
-		}
-		return descriptors.toTypedArray()
+		return collectFoldRegions(root) { FoldingVisitor(it, document) }
 	}
 }
 
-class FoldingVisitor(
+private class FoldingVisitor(
 	private val descriptors: MutableList<FoldingDescriptor>,
 	private val document: Document
 ) : ACoreVisitor() {

src/org/ice1000/tt/editing/agda/folding.kt

@@ -7,9 +7,9 @@ import com.intellij.openapi.editor.Document
 import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
-import com.intellij.psi.util.PsiTreeUtil
 import org.ice1000.tt.AgdaFile
 import org.ice1000.tt.FOLDING_PLACEHOLDER
+import org.ice1000.tt.editing.collectFoldRegions
 import org.ice1000.tt.psi.*
 import org.ice1000.tt.psi.agda.*
 
@@ -23,17 +23,11 @@ class AgdaFoldingBuilder : FoldingBuilderEx(), DumbAware {
 
 	override fun buildFoldRegions(root: PsiElement, document: Document, quick: Boolean): Array<FoldingDescriptor> {
 		if (root !is AgdaFile) return emptyArray()
-		val descriptors = mutableListOf<FoldingDescriptor>()
-		val visitor = FoldingVisitor(descriptors, document)
-		PsiTreeUtil.processElements(root) {
-			it.accept(visitor)
-			true
-		}
-		return descriptors.toTypedArray()
+		return collectFoldRegions(root) { FoldingVisitor(it, document) }
 	}
 }
 
-class FoldingVisitor(
+private class FoldingVisitor(
 	private val descriptors: MutableList<FoldingDescriptor>,
 	private val document: Document
 ) : AgdaVisitor() {

src/org/ice1000/tt/editing/editing.kt

@@ -2,10 +2,13 @@ package org.ice1000.tt.editing
 
 import com.intellij.lang.Commenter
 import com.intellij.lang.findUsages.FindUsagesProvider
+import com.intellij.lang.folding.FoldingDescriptor
 import com.intellij.lang.refactoring.RefactoringSupportProvider
 import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiElementVisitor
 import com.intellij.psi.PsiNameIdentifierOwner
 import com.intellij.psi.PsiNamedElement
+import com.intellij.psi.util.PsiTreeUtil
 
 abstract class TTFindUsagesProvider : FindUsagesProvider {
 	override fun canFindUsagesFor(element: PsiElement) = element is PsiNameIdentifierOwner
@@ -37,3 +40,13 @@ class CxxCommenter : TTCommenter() {
 	override fun getBlockCommentPrefix() = "/*"
 	override fun getBlockCommentSuffix() = "*/"
 }
+
+inline fun collectFoldRegions(root: PsiElement, visitorFactory: (MutableList<FoldingDescriptor>) -> PsiElementVisitor): Array<FoldingDescriptor> {
+	val descriptors = mutableListOf<FoldingDescriptor>()
+	val visitor = visitorFactory(descriptors)
+	PsiTreeUtil.processElements(root) {
+		it.accept(visitor)
+		true
+	}
+	return descriptors.toTypedArray()
+}

src/org/ice1000/tt/editing/minitt/folding.kt

@@ -6,7 +6,6 @@ import com.intellij.lang.folding.FoldingDescriptor
 import com.intellij.openapi.editor.Document
 import com.intellij.openapi.project.DumbAware
 import com.intellij.psi.PsiElement
-import com.intellij.psi.util.PsiTreeUtil
 import org.ice1000.tt.FOLDING_PLACEHOLDER
 import org.ice1000.tt.MiniTTFile
 import org.ice1000.tt.editing.*
@@ -32,15 +31,8 @@ class MiniTTFoldingBuilder : FoldingBuilderEx(), DumbAware {
 
 	override fun buildFoldRegions(root: PsiElement, document: Document, quick: Boolean): Array<FoldingDescriptor> {
 		if (root !is MiniTTFile) return emptyArray()
-		val descriptors = mutableListOf<FoldingDescriptor>()
-		val visitor = FoldingVisitor(descriptors, document)
-		PsiTreeUtil.processElements(root) {
-			it.accept(visitor)
-			true
-		}
-		return descriptors.toTypedArray()
+		return collectFoldRegions(root) { FoldingVisitor(it, document) }
 	}
-
 }
 
 private class FoldingVisitor(

src/org/ice1000/tt/editing/mlpolyr/folding.kt

@@ -8,9 +8,9 @@ import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiComment
 import com.intellij.psi.PsiElement
-import com.intellij.psi.util.PsiTreeUtil
 import org.ice1000.tt.FOLDING_PLACEHOLDER
 import org.ice1000.tt.MLPolyRFile
+import org.ice1000.tt.editing.collectFoldRegions
 import org.ice1000.tt.psi.childrenWithLeaves
 import org.ice1000.tt.psi.elementType
 import org.ice1000.tt.psi.mlpolyr.*
@@ -29,15 +29,8 @@ class MLPolyRFoldingBuilder : FoldingBuilderEx(), DumbAware {
 
 	override fun buildFoldRegions(root: PsiElement, document: Document, quick: Boolean): Array<FoldingDescriptor> {
 		if (root !is MLPolyRFile) return emptyArray()
-		val descriptors = mutableListOf<FoldingDescriptor>()
-		val visitor = FoldingVisitor(descriptors, document)
-		PsiTreeUtil.processElements(root) {
-			it.accept(visitor)
-			true
-		}
-		return descriptors.toTypedArray()
+		return collectFoldRegions(root) { FoldingVisitor(it, document) }
 	}
-
 }
 
 private class FoldingVisitor(

src/org/ice1000/tt/editing/redprl/folding.kt

@@ -10,6 +10,7 @@ import com.intellij.psi.PsiComment
 import com.intellij.psi.PsiElement
 import com.intellij.psi.util.PsiTreeUtil
 import org.ice1000.tt.FOLDING_PLACEHOLDER
+import org.ice1000.tt.editing.collectFoldRegions
 import org.ice1000.tt.psi.*
 import org.ice1000.tt.psi.redprl.*
 
@@ -27,13 +28,7 @@ class RedPrlFoldingBuilder : FoldingBuilderEx(), DumbAware {
 
 	override fun buildFoldRegions(root: PsiElement, document: Document, quick: Boolean): Array<FoldingDescriptor> {
 		if (root !is RedPrlFileImpl) return emptyArray()
-		val descriptors = mutableListOf<FoldingDescriptor>()
-		val visitor = FoldingVisitor(descriptors, document)
-		PsiTreeUtil.processElements(root) {
-			it.accept(visitor)
-			true
-		}
-		return descriptors.toTypedArray()
+		return collectFoldRegions(root) { FoldingVisitor(it, document) }
 	}
 }