Merge pull request #2 from amitmiran137/patch-1

Upgrade to new dialect in scala.meta
kaplan-shaked · Aug 7, 2024 · f6c134b · f6c134b
2 parents a295730 + 64ae095
commit f6c134b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,4 +27,10 @@ jobs:
             exit 0
           fi
 
-      
+  run-scala-cli-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: VirtusLab/scala-cli-setup@main
+      - name: Run tests
+        run: scala-cli test .
diff --git a/resources/test.scala_test b/resources/test.scala_test
@@ -1,10 +1,11 @@
 
 
 import java.io.Serializable
+import scala.io.Source as src
 
 @Serializable
 case class TestClass1(field1: String, field2: Int){
-
+  src.DefaultBufSize.toString
 }
 
 @SomeAnnotation
@@ -21,4 +22,4 @@ case class TestClass4(field7: String, field8: Int)
 @deriving(SomeAnnotation, SomeOtherAnnotation, Reader, Writer)
 case class TestClass5(field9: Double, field10: Boolean = true){
 
-}
+}
diff --git a/src/FileParser.scala b/src/FileParser.scala
@@ -1,4 +1,5 @@
 import scala.meta._
+
 case class ScalaFile(
     imports: List[String],
     classes: List[ClassInfo],
@@ -45,7 +46,8 @@ object FileParser {
 
   def parse(content: String): ScalaFile = {
     val input = Input.String(content)
-    val exampleTree: Source = input.parse[Source].get
+    val dialect = dialects.Scala213Source3
+    val exampleTree: Source = dialect(input).parse[Source].get
 
     val tree =
       parseTreeClasses(exampleTree)

diff --git a/test/BreakingChangeDetector.test.scala b/test/BreakingChangeDetector.test.scala
@@ -3,7 +3,7 @@ class BreakingChangeDetectorTest extends munit.FunSuite {
     val oldFile = Thread
       .currentThread()
       .getContextClassLoader
-      .getResource("V1.scala_test")
+      .getResource("v1.scala_test")
       .getPath
     val oldFileParsed = FileParser.fromPathToClassDef(oldFile)
     val newFile = Thread
@@ -23,7 +23,7 @@ class BreakingChangeDetectorTest extends munit.FunSuite {
     val oldFile = Thread
       .currentThread()
       .getContextClassLoader
-      .getResource("V1.scala_test")
+      .getResource("v1.scala_test")
       .getPath
     val oldFileParsed = FileParser.fromPathToClassDef(oldFile)
     val newFile = Thread
@@ -84,7 +84,7 @@ class BreakingChangeDetectorTest extends munit.FunSuite {
     val oldFile = Thread
       .currentThread()
       .getContextClassLoader
-      .getResource("V1.scala_test")
+      .getResource("v1.scala_test")
       .getPath
     val oldFileParsed = FileParser.fromPathToClassDef(oldFile)
     val newFile = Thread