collapse list of ranges

Author: xepozz

src/main/gen/com/github/xepozz/crontab/language/parser/CrontabParser.java

@@ -0,0 +1,81 @@
+package com.github.xepozz.crontab.ide
+
+import com.github.xepozz.crontab.language.psi.CrontabTimeList
+
+object CrontabTimeRangeUtil {
+    fun expandRanges(element: CrontabTimeList): Set<Int> {
+        val input = element.timeListItemList
+            .map {
+                when {
+                    it.timeRange != null -> "${it.timeRange!!.text}"
+                    it.timeExact != null -> "${it.timeExact!!.text}"
+                    else -> "0"
+                }
+            }
+        return expandRanges(input)
+    }
+
+    fun collapseRanges(element: CrontabTimeList): List<String> {
+        val input = element.timeListItemList
+            .map {
+                when {
+                    it.timeRange != null -> "${it.timeRange!!.text}"
+                    it.timeExact != null -> "${it.timeExact!!.text}"
+                    else -> "0"
+                }
+            }
+        return collapseRanges(input)
+    }
+
+    fun collapseRanges(input: List<String>): List<String> {
+        val numbers = expandRanges(input)
+
+        // Sort the numbers and then collapse ranges
+        val sortedNumbers = numbers.sorted()
+        val result = mutableListOf<String>()
+        var rangeStart = sortedNumbers[0]
+        var rangeEnd = sortedNumbers[0]
+
+        for (i in 1 until sortedNumbers.size) {
+            if (sortedNumbers[i] == rangeEnd + 1) {
+                rangeEnd = sortedNumbers[i]
+            } else {
+                if (rangeStart == rangeEnd) {
+                    result.add("$rangeStart")
+                } else {
+                    result.add("$rangeStart-$rangeEnd")
+                }
+                rangeStart = sortedNumbers[i]
+                rangeEnd = sortedNumbers[i]
+            }
+        }
+
+        // Add the last range
+        if (rangeStart == rangeEnd) {
+            result.add("$rangeStart")
+        } else {
+            result.add("$rangeStart-$rangeEnd")
+        }
+
+        return result
+    }
+
+    fun expandRanges(input: List<String>): Set<Int> {
+        val numbers = mutableSetOf<Int>()
+
+        // Parse the input and collect all individual numbers and ranges
+        for (item in input) {
+            if (item.contains("-")) {
+                // Handle range
+                val parts = item.split("-")
+                val start = parts[0].toInt()
+                val end = parts[1].toInt()
+                numbers.addAll(start..end)
+            } else {
+                // Handle individual number
+                numbers.add(item.toInt())
+            }
+        }
+        return numbers
+    }
+}

src/main/gen/com/github/xepozz/crontab/language/psi/CrontabTimeListItem.java

@@ -1,8 +1,11 @@
 package com.github.xepozz.crontab.ide.inspections
 
+import com.github.xepozz.crontab.ide.CrontabTimeRangeUtil
 import com.github.xepozz.crontab.language.psi.CrontabElementFactory
+import com.github.xepozz.crontab.language.psi.CrontabTimeList
 import com.github.xepozz.crontab.language.psi.CrontabTimeRange
 import com.intellij.codeInspection.ProblemDescriptor
+import com.intellij.codeInspection.ProblemHighlightType
 import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.openapi.project.Project
 
@@ -55,4 +58,27 @@ object CrontabInspectionUtil {
             }
         )
     }
+
+    fun registerCollapseRangeList(holder: ProblemsHolder, element: CrontabTimeList) {
+        holder.registerProblem(
+            element,
+            "List of intervals can be collapsed.",
+            ProblemHighlightType.WARNING,
+            object : CrontabScheduleQuickFix() {
+                override fun getName() = "Collapse list"
+
+                override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
+                    val psiElement = descriptor.psiElement as? CrontabTimeList ?: return
+                    if (psiElement.isWritable) {
+                        psiElement.replace(
+                            CrontabElementFactory.createCrontabTimeList(
+                                project,
+                                CrontabTimeRangeUtil.collapseRanges(psiElement),
+                            )
+                        )
+                    }
+                }
+            }
+        )
+    }
 }

src/main/gen/com/github/xepozz/crontab/language/psi/CrontabTimePointer.java

@@ -1,6 +1,8 @@
 package com.github.xepozz.crontab.ide.inspections
 
+import com.github.xepozz.crontab.ide.CrontabTimeRangeUtil
 import com.github.xepozz.crontab.language.CrontabFile
+import com.github.xepozz.crontab.language.psi.CrontabTimeList
 import com.github.xepozz.crontab.language.psi.CrontabTimeRange
 import com.github.xepozz.crontab.language.psi.CrontabVisitor
 import com.intellij.codeInspection.LocalInspectionTool
@@ -24,6 +26,19 @@ class CrontabScheduleTimeRangeInspection : LocalInspectionTool() {
                 }
                 super.visitTimeRange(element)
             }
+
+            override fun visitTimeList(element: CrontabTimeList) {
+                val before = element.text
+                val after = CrontabTimeRangeUtil.collapseRanges(element).joinToString(",")
+
+                println("before $before")
+                println("after $after")
+
+                if (before != after) {
+                    CrontabInspectionUtil.registerCollapseRangeList(holder, element)
+                }
+                super.visitTimeList(element)
+            }
         }
     }
 

src/main/gen/com/github/xepozz/crontab/language/psi/impl/CrontabTimeListItemImpl.java

@@ -29,7 +29,7 @@ SCHEDULE ::= TIME_POINTER TIME_POINTER TIME_POINTER TIME_POINTER TIME_POINTER
     pin=1
 }
 
-TIME_POINTER ::= TIME_PERIODIC | TIME_RANGE | TIME_RANGE_STEP | TIME_LIST | TIME_ANY | TIME_EXACT
+TIME_POINTER ::= TIME_PERIODIC | TIME_RANGE_STEP | TIME_LIST | TIME_ANY
 TIME_PERIODIC ::= (STAR SLASH NUMBER)
 {
     pin=2
@@ -44,11 +44,11 @@ TIME_RANGE_STEP ::= NUMBER SLASH NUMBER
 {
     pin=2
 }
-TIME_LIST ::= NUMBER COMMA TIME_LIST_ITEM (COMMA TIME_LIST_ITEM)*
+TIME_LIST ::= TIME_LIST_ITEM (COMMA TIME_LIST_ITEM)*
 {
     pin=2
 }
-TIME_LIST_ITEM ::= TIME_RANGE | NUMBER
+TIME_LIST_ITEM ::= TIME_RANGE | TIME_EXACT
 
 TIME_ANY ::= STAR
 TIME_EXACT ::= NUMBER

src/main/gen/com/github/xepozz/crontab/language/psi/impl/CrontabTimePointerImpl.java

@@ -6,6 +6,12 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.util.PsiTreeUtil
 
 object CrontabElementFactory {
+    fun createCrontabTimeList(project: Project, values: List<String>): CrontabTimeList {
+        val file = createFile(project, values.joinToString(","))
+
+        return PsiTreeUtil.findChildOfType(file, CrontabTimeList::class.java) as CrontabTimeList
+    }
+
     fun createCrontabTimeRange(project: Project, first: Int, last: Int): CrontabTimeRange {
         val file = createFile(project, "$first-$last")