Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update/kiama lsp #753

Merged
merged 6 commits into from
Dec 21, 2024
Merged

Update/kiama lsp #753

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7c554c1
Update kiama version to support notebooks in LSP
b-studios Dec 20, 2024
0126185
Also update LSP dependency
b-studios Dec 20, 2024
ede01b5
Apply kiama hotfix
b-studios Dec 20, 2024
3136709
Fix dependencies
b-studios Dec 20, 2024
b274a6b
Use munit for kiama
b-studios Dec 20, 2024
02b1f02
Move toURI to kiama
b-studios Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ lazy val replDependencies = Seq(
)

lazy val lspDependencies = Seq(
"org.eclipse.lsp4j" % "org.eclipse.lsp4j" % "0.12.0",
"com.google.code.gson" % "gson" % "2.8.9"
"org.eclipse.lsp4j" % "org.eclipse.lsp4j" % "0.23.1"
)

lazy val testingDependencies = Seq(
Expand All @@ -63,7 +62,8 @@ lazy val kiama: CrossProject = crossProject(JSPlatform, JVMPlatform).in(file("ki
name := "kiama"
)
.jvmSettings(
libraryDependencies ++= (replDependencies ++ lspDependencies)
libraryDependencies ++= (replDependencies ++ lspDependencies ++ testingDependencies),
testFrameworks += new TestFramework("utest.runner.Framework")
)

lazy val root = project.in(file("effekt"))
Expand Down Expand Up @@ -116,6 +116,15 @@ lazy val effekt: CrossProject = crossProject(JSPlatform, JVMPlatform).in(file("e

assembly / assemblyJarName := "effekt.jar",

// there is a conflict between the two transitive dependencies "gson:2.11.0"
// and "error_prone_annotations:2.27.0", so we need the merge strategy here for `sbt install`
assembly / assemblyMergeStrategy := {
case PathList("META-INF", "versions", "9", "module-info.class") => MergeStrategy.first
case x =>
val oldStrategy = (assembly / assemblyMergeStrategy).value
oldStrategy(x)
},

// we use the lib folder as resource directory to include it in the JAR
Compile / unmanagedResourceDirectories += (ThisBuild / baseDirectory).value / "libraries",

Expand Down
2 changes: 1 addition & 1 deletion kiama
Open in desktop
Submodule kiama updated 10 files
+35 −0 .github/workflows/ci.yml
+10 −3 build.sbt
+239 −16 jvm/src/main/scala/kiama/util/Server.scala
+236 −0 jvm/src/test/scala/kiama/util/GapBufferTests.scala
+190 −0 jvm/src/test/scala/kiama/util/RopeTests.scala
+1 −1 project/build.properties
+1 −1 project/plugins.sbt
+161 −0 shared/src/main/scala/kiama/util/GapBuffer.scala
+163 −0 shared/src/main/scala/kiama/util/Rope.scala
+7 −0 shared/src/main/scala/kiama/util/Source.scala
Loading