Updates and ci (#1)

* Upgrades and CI

* sgh

Author: keynmol

.github/workflows/ci.yml

@@ -0,0 +1,20 @@
+name: CI
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin' 
+          java-version: '17'
+
+      - uses: VirtusLab/scala-cli-setup@main
+
+      - name: CI
+        run: make all
+

.scalafmt.conf

@@ -0,0 +1,16 @@
+version = "3.5.8"
+runner.dialect = scala3
+rewrite.scala3.insertEndMarkerMinLines = 10
+rewrite.scala3.removeOptionalBraces = true
+rewrite.scala3.convertToNewSyntax = true
+align.preset = more
+
+fileOverride {
+  "glob:**.sbt" {
+    runner.dialect = scala212source3
+  }
+
+  "glob:**/project/**.*" {
+    runner.dialect = scala212source3
+  }
+}

lsp.server.scala LSP.scalalsp.server.scala renamed to LSP.scala

@@ -1,16 +1,5 @@
-//> using lib "tech.neander::langoustine-lsp::0.0.6"
-//> using lib "tech.neander::jsonrpclib-fs2::0.0.2"
-//> using lib "co.fs2::fs2-io::3.2.11"
-
 import langoustine.lsp.*
 
-import requests.*
-import notifications as nt
-import structures.*
-import aliases.*
-import enumerations.*
-import json.*
-
 import cats.effect.*
 import jsonrpclib.fs2.*
 
@@ -27,27 +16,44 @@ import cats.syntax.all.*
 
 object LSP extends IOApp.Simple:
   import QuickmaffsLSP.{server, State}
+
   def run =
-    FS2Channel
-      .lspCompliant[IO](
-        byteStream = fs2.io.stdin(256),
-        byteSink = fs2.io.stdout
-      )
+    FS2Channel[IO](2048, None)
       .evalTap { channel =>
         IO.ref(Map.empty[DocumentUri, State])
           .flatMap { state =>
             server(state).bind(channel)
           }
       }
-      .flatMap(_.openStream)
-      .evalMap(_ => IO.never)
+      .flatMap(channel =>
+        fs2.Stream
+          .eval(IO.never) // running the server forever
+          .concurrently(
+            fs2.io
+              .stdin[IO](512)
+              .through(lsp.decodePayloads)
+              .through(channel.input)
+          )
+          .concurrently(
+            channel.output
+              .through(lsp.encodePayloads)
+              .through(fs2.io.stdout[IO])
+          )
+      )
       .compile
       .drain
+      .guarantee(IO.consoleForIO.errorln("Terminating server"))
   end run
 
 end LSP
 
 object QuickmaffsLSP:
+  import requests.*
+  import structures.*
+  import aliases.*
+  import enumerations.*
+  import json.*
+
   enum State:
     case Empty
     case InvalidCode(err: QuickmaffsParser.ParsingError)
@@ -107,7 +113,7 @@ object QuickmaffsLSP:
     def recompile(uri: DocumentUri, back: Communicate[IO]) =
       def publish(vec: Vector[Diagnostic]) =
         back.notification(
-          nt.textDocument.publishDiagnostics,
+          textDocument.publishDiagnostics,
           PublishDiagnosticsParams(uri, diagnostics = vec)
         )
 
@@ -161,11 +167,11 @@ object QuickmaffsLSP:
         case _ => None
       }
 
-    ImmutableLSPBuilder
+    LSPBuilder
       .create[IO]
       .handleRequest(initialize) { (in, back) =>
         back.notification(
-          nt.window.showMessage,
+          window.showMessage,
           ShowMessageParams(
             message = "Hello from Quickmaffs",
             `type` = enumerations.MessageType.Info
@@ -192,10 +198,10 @@ object QuickmaffsLSP:
             )
           }
       }
-      .handleNotification(nt.textDocument.didOpen) { (in, back) =>
+      .handleNotification(textDocument.didOpen) { (in, back) =>
         recompile(in.textDocument.uri, back)
       }
-      .handleNotification(nt.textDocument.didSave) { (in, back) =>
+      .handleNotification(textDocument.didSave) { (in, back) =>
         recompile(in.textDocument.uri, back)
       }
       .handleRequest(textDocument.definition) { (in, back) =>

build.dependencies.scala

@@ -0,0 +1,5 @@
+//> using lib "tech.neander::langoustine-lsp::0.0.7"
+//> using lib "tech.neander::jsonrpclib-fs2::0.0.3"
+//> using lib "co.fs2::fs2-io::3.2.11"
+//> using scala "3.1.3"
+//> using lib "org.typelevel::cats-parse::0.3.8"

examples/test.qmf

@@ -0,0 +1,9 @@
+worsts = (5 + 1)
+x = (worsts + 11)
+z = 17
+t = (x * 1)
+h = (x * (11 + worsts))
+hs = (x * (z + worsts))
+a = 11
+r = (x + a)
+

test2.qmf examples/test2.qmftest2.qmf renamed to examples/test2.qmf

@@ -1,7 +1,3 @@
-//> using scala "3.1.2"
-//> using lib "org.typelevel::cats-parse::0.3.8"
-//> using plugin "org.polyvariant:::better-tostring:0.3.15"
-
 import cats.parse.Parser as P
 import cats.parse.Parser0 as P0
 import cats.parse.Caret