Merged branch idea243.release into idea243.x

JetBrains · Jan 9, 2025 · fbd58b7 · fbd58b7
2 parents d42c8ed + 5b06cfb
commit fbd58b7
Show file tree

Hide file tree

Showing 48 changed files with 15 additions and 1,809 deletions.
diff --git a/build.sbt b/build.sbt
@@ -37,6 +37,8 @@ ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml"
 
 (Global / scalacOptions) := globalScalacOptions
 
+Global / intellijAttachSources := true
+
 // Muted lint warnings for keys used by the IDE, but not by sbt (coming from sbt-ide-settings)
 Global / excludeLintKeys ++= Set(idePackagePrefix, ideSkipProject, ideExcludedDirectories, ideaConfigOptions)
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,7 +2,7 @@ ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml"
 
 //NOTE: KEEP VERSIONS IN SYNC WITH ultimate/project/plugins.sbt
 addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.2")
-addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "4.0.2")
+addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "4.0.3")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
 addSbtPlugin("org.jetbrains.scala" % "sbt-kotlin-plugin" % "3.1.4")
 addSbtPlugin("com.github.sbt.junit" % "sbt-jupiter-interface" % "0.13.3")

diff --git a/...s/plugins/scala/projectHighlighting/downloaded/ScalaPetStoreProjectHighlightingTest.scala b/...s/plugins/scala/projectHighlighting/downloaded/ScalaPetStoreProjectHighlightingTest.scala
@@ -0,0 +1,12 @@
+package org.jetbrains.plugins.scala.projectHighlighting.downloaded
+
+import com.intellij.pom.java.LanguageLevel
+import org.jetbrains.plugins.scala.projectHighlighting.base.{GithubRepositoryWithRevision, SbtProjectHighlightingLocalProjectsTestBase}
+
+class ScalaPetStoreProjectHighlightingTest  extends GithubSbtAllProjectHighlightingTest  {
+
+  override def projectJdkLanguageLevel: LanguageLevel = LanguageLevel.JDK_1_8
+
+  def githubRepositoryWithRevision: GithubRepositoryWithRevision =
+    GithubRepositoryWithRevision("pauljamescleary", "scala-pet-store", "a4391027771146daaa4b5a6599d36e6462d645b3")
+}
diff --git a/...t-impl/test/org/jetbrains/plugins/scala/projectHighlighting/local/ScalaPetStoreTest.scala b/...t-impl/test/org/jetbrains/plugins/scala/projectHighlighting/local/ScalaPetStoreTest.scala
diff --git a/scala/scala-impl/testdata/projectsForHighlightingTests/local/scala-pet-store/.gitignore b/scala/scala-impl/testdata/projectsForHighlightingTests/local/scala-pet-store/.gitignore
diff --git a/scala/scala-impl/testdata/projectsForHighlightingTests/local/scala-pet-store/.scalafmt.conf b/scala/scala-impl/testdata/projectsForHighlightingTests/local/scala-pet-store/.scalafmt.conf
diff --git a/scala/scala-impl/testdata/projectsForHighlightingTests/local/scala-pet-store/.travis.yml b/scala/scala-impl/testdata/projectsForHighlightingTests/local/scala-pet-store/.travis.yml
diff --git a/scala/scala-impl/testdata/projectsForHighlightingTests/local/scala-pet-store/LICENSE b/scala/scala-impl/testdata/projectsForHighlightingTests/local/scala-pet-store/LICENSE
diff --git a/...cala-impl/testdata/projectsForHighlightingTests/local/scala-pet-store/README.md b/...cala-impl/testdata/projectsForHighlightingTests/local/scala-pet-store/README.md