chore: fix ci tests for 2.13.13

scalameta · Nov 2, 2023 · 37aac9a · 37aac9a
1 parent f238eb5
commit 37aac9a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 23 deletions.
diff --git a/build.sbt b/build.sbt
@@ -351,10 +351,10 @@ val mtagsSettings = List(
     val current = (Compile / unmanagedSourceDirectories).value
     val base = (Compile / sourceDirectory).value
     val regex = "(\\d+)\\.(\\d+)\\.(\\d+).*".r
-    // For scala +2.13.9 we need to have a special Compat.scala
+    // For scala -2.13.9 we need to have a special Compat.scala
     // For this case filter out `scala-2.13` directory that comes by default
     val scalaVersionsWithSpecialCompat =
-      Set("2.13.9", "2.13.10", "2.13.11", "2.13.12")
+      Set("2.13.5", "2.13.6", "2.13.7", "2.13.8")
     if (scalaVersionsWithSpecialCompat(scalaVersion.value))
       current.filter(f => f.getName() != "scala-2.13")
     else if (isScala3WithPresentationCompiler(scalaVersion.value))

diff --git a/...ala-2.13.10/meta/internal/pc/Compat.scala → ...cala-2.13.5/meta/internal/pc/Compat.scala b/...ala-2.13.10/meta/internal/pc/Compat.scala → ...cala-2.13.5/meta/internal/pc/Compat.scala
@@ -15,11 +15,7 @@ trait Compat { this: MetalsGlobal =>
       case _ => None
     }
 
-  def isAliasCompletion(m: Member): Boolean = m match {
-    case tm: TypeMember => tm.aliasInfo.nonEmpty
-    case sm: ScopeMember => sm.aliasInfo.nonEmpty
-    case _ => false
-  }
+  def isAliasCompletion(m: Member): Boolean = false
 
   def constantType(c: ConstantType): ConstantType =
     if (c.value.isSuitableLiteralType) LiteralType(c.value) else c

diff --git a/...ala-2.13.11/meta/internal/pc/Compat.scala → ...cala-2.13.6/meta/internal/pc/Compat.scala b/...ala-2.13.11/meta/internal/pc/Compat.scala → ...cala-2.13.6/meta/internal/pc/Compat.scala
@@ -15,11 +15,7 @@ trait Compat { this: MetalsGlobal =>
       case _ => None
     }
 
-  def isAliasCompletion(m: Member): Boolean = m match {
-    case tm: TypeMember => tm.aliasInfo.nonEmpty
-    case sm: ScopeMember => sm.aliasInfo.nonEmpty
-    case _ => false
-  }
+  def isAliasCompletion(m: Member): Boolean = false
 
   def constantType(c: ConstantType): ConstantType =
     if (c.value.isSuitableLiteralType) LiteralType(c.value) else c

diff --git a/...ala-2.13.12/meta/internal/pc/Compat.scala → ...cala-2.13.7/meta/internal/pc/Compat.scala b/...ala-2.13.12/meta/internal/pc/Compat.scala → ...cala-2.13.7/meta/internal/pc/Compat.scala
@@ -15,11 +15,7 @@ trait Compat { this: MetalsGlobal =>
       case _ => None
     }
 
-  def isAliasCompletion(m: Member): Boolean = m match {
-    case tm: TypeMember => tm.aliasInfo.nonEmpty
-    case sm: ScopeMember => sm.aliasInfo.nonEmpty
-    case _ => false
-  }
+  def isAliasCompletion(m: Member): Boolean = false
 
   def constantType(c: ConstantType): ConstantType =
     if (c.value.isSuitableLiteralType) LiteralType(c.value) else c

diff --git a/...cala-2.13.9/meta/internal/pc/Compat.scala → ...cala-2.13.8/meta/internal/pc/Compat.scala b/...cala-2.13.9/meta/internal/pc/Compat.scala → ...cala-2.13.8/meta/internal/pc/Compat.scala
@@ -15,11 +15,7 @@ trait Compat { this: MetalsGlobal =>
       case _ => None
     }
 
-  def isAliasCompletion(m: Member): Boolean = m match {
-    case tm: TypeMember => tm.aliasInfo.nonEmpty
-    case sm: ScopeMember => sm.aliasInfo.nonEmpty
-    case _ => false
-  }
+  def isAliasCompletion(m: Member): Boolean = false
 
   def constantType(c: ConstantType): ConstantType =
     if (c.value.isSuitableLiteralType) LiteralType(c.value) else c

diff --git a/mtags/src/main/scala-2.13/scala/meta/internal/pc/Compat.scala b/mtags/src/main/scala-2.13/scala/meta/internal/pc/Compat.scala
@@ -15,7 +15,11 @@ trait Compat { this: MetalsGlobal =>
       case _ => None
     }
 
-  def isAliasCompletion(m: Member): Boolean = false
+  def isAliasCompletion(m: Member): Boolean = m match {
+    case tm: TypeMember => tm.aliasInfo.nonEmpty
+    case sm: ScopeMember => sm.aliasInfo.nonEmpty
+    case _ => false
+  }
 
   def constantType(c: ConstantType): ConstantType =
     if (c.value.isSuitableLiteralType) LiteralType(c.value) else c