Language server

.gitignore

@@ -4,7 +4,6 @@
 .DS_Store
 .vs/
 .vscode/
-.koka/
 node_modules/
 out/
 bundle/
@@ -30,3 +29,5 @@ test.kk
 /*.cmake
 bench
 test/bench
+.koka
+scratch

koka.cabal

@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.0.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -21,9 +21,8 @@ source-repository head
   type: git
   location: https://github.com/koka-lang/koka
 
-executable koka
-  main-is: Main.hs
-  other-modules:
+library
+  exposed-modules:
       Backend.C.Box
       Backend.C.FromCore
       Backend.C.Parc
@@ -125,14 +124,15 @@ executable koka
       Platform.ReadLine
       Platform.Runtime
       Platform.Var
+  other-modules:
       Paths_koka
   hs-source-dirs:
       src
       src/Platform/cpp
   other-extensions:
       CPP
       OverloadedStrings
-  ghc-options: -rtsopts -j8
+  ghc-options: -j8 -O2
   cpp-options: -DKOKA_MAIN="koka" -DKOKA_VARIANT="release" -DKOKA_VERSION="2.4.3" -DREADLINE=0
   include-dirs:
       src/Platform/cpp/Platform
@@ -158,6 +158,71 @@ executable koka
   if os(darwin)
     cpp-options: -DDARWIN
 
+executable koka
+  main-is: Main.hs
+  other-modules:
+      LanguageServer.Conversions
+      LanguageServer.Handler.Commands
+      LanguageServer.Handler.Completion
+      LanguageServer.Handler.Definition
+      LanguageServer.Handler.DocumentSymbol
+      LanguageServer.Handler.Folding
+      LanguageServer.Handler.Hover
+      LanguageServer.Handler.InlayHints
+      LanguageServer.Handler.TextDocument
+      LanguageServer.Handlers
+      LanguageServer.Monad
+      LanguageServer.Run
+      Paths_koka
+  hs-source-dirs:
+      src/Main/langserver
+  ghc-options: -rtsopts -j8 -O2 -threaded "-with-rtsopts=-N8"
+  build-depends:
+      aeson
+    , array
+    , async
+    , base >=4.9
+    , bytestring
+    , co-log-core
+    , containers
+    , directory
+    , isocline >=1.0.6
+    , koka
+    , lens
+    , lsp
+    , mtl
+    , network
+    , network-simple
+    , parsec
+    , process
+    , stm
+    , text
+    , text-rope
+    , time
+  default-language: Haskell2010
+
+executable koka-plain
+  main-is: Main.hs
+  other-modules:
+      Paths_koka
+  hs-source-dirs:
+      src/Main/plain
+  ghc-options: -rtsopts -j8 -O2 -threaded "-with-rtsopts=-N8"
+  build-depends:
+      array
+    , base >=4.9
+    , bytestring
+    , containers
+    , directory
+    , isocline >=1.0.6
+    , koka
+    , mtl
+    , parsec
+    , process
+    , text
+    , time
+  default-language: Haskell2010
+
 test-suite koka-test
   type: exitcode-stdio-1.0
   main-is: Spec.hs

package.yaml

@@ -4,6 +4,8 @@
 # - util/install.bat
 # - util/Dockerfile
 # - util/minbuild
+# - support/vscode/koka.language-koka/src/workspace.ts
+# - support/vscode/koka.language-koka/package.json
 
 name:       koka
 version:    2.4.3
@@ -29,37 +31,66 @@ dependencies:
   - text
   - time
   - isocline >= 1.0.6
-
+
+library:
+  other-extensions:
+    - CPP
+    - OverloadedStrings
+  source-dirs:
+    - src
+    - src/Platform/cpp
+  c-sources:
+    - src/Platform/cpp/Platform/cconsole.c
+  include-dirs:
+    - src/Platform/cpp/Platform
+  build-tools:
+    - alex
+  ghc-options:
+    - -j8
+    - -O2
+  cpp-options:
+    - -DKOKA_MAIN="koka"
+    - -DKOKA_VARIANT="release"
+    - -DKOKA_VERSION="2.4.3"
+    - -DREADLINE=0   # 1:getline, 2:readline, 3:haskeline, or 0:isocline
+  when:
+    - condition: os(windows)
+      cpp-options: -DWINDOWS
+    - condition: os(darwin)
+      cpp-options: -DDARWIN
+
 executables:
   koka:
     main: Main.hs
-    # source-dirs: app
-    # dependencies: koka
-    other-extensions:
-      - CPP
-      - OverloadedStrings
-    source-dirs:
-      - src
-      - src/Platform/cpp
-    c-sources:
-      - src/Platform/cpp/Platform/cconsole.c
-    include-dirs:
-      - src/Platform/cpp/Platform
-    build-tools:
-      - alex
+    source-dirs: src/Main/langserver
+    dependencies:
+      - aeson
+      - async
+      - co-log-core
+      - koka
+      - lens
+      - lsp
+      - network-simple
+      - network
+      - text-rope
+      - stm
     ghc-options:
-      - -rtsopts 
+      - -rtsopts
       - -j8
-    cpp-options:
-      - -DKOKA_MAIN="koka"      
-      - -DKOKA_VARIANT="release"
-      - -DKOKA_VERSION="2.4.3"
-      - -DREADLINE=0   # 1:getline, 2:readline, 3:haskeline, or 0:isocline
-    when:
-      - condition: os(windows)
-        cpp-options: -DWINDOWS
-      - condition: os(darwin)
-        cpp-options: -DDARWIN
+      - -O2
+      - -threaded
+      - '"-with-rtsopts=-N8"'
+
+  koka-plain:
+    main: Main.hs
+    source-dirs: src/Main/plain
+    dependencies: koka
+    ghc-options:
+      - -rtsopts
+      - -j8
+      - -O2
+      - -threaded
+      - '"-with-rtsopts=-N8"'
 
 tests:
   koka-test:

readme.md

@@ -279,9 +279,6 @@ More advanced projects:
 * [x] Update the JavaScript backend to 1) use modern modules instead of amdefine, 2) use the new bigints instead of
   bigint.js, and 3) add support for int64. (landed in the `dev` branch)
 * [x] Port `std/text/regex` from v1 (using PCRE)
-* [ ] A language server for Visual Studio Code and Atom. Koka can already generate a
-  typed [range map](src/Syntax/RangeMap.hs) so this should be managable. Partially done: see PR #100 (by @fwcd) -- it just
-  needs work on packaging it to make it easy to build and install as part of the Koka installer.
 * [ ] Package management of Koka modules.
 * [x] Compile to WASM (using emscripten on the current C backend)
 * [ ] Improve compilation of local state to use local variables directly (in C) without allocation. Tricky though due to multiple resumptions.
@@ -318,6 +315,17 @@ The following is the immediate todo list to be completed in the coming months:
 * [ ] Port `std/async` (using `libuv`).
 * [ ] Proper overloading with (a form of) type classes. (in design phase).
 
+LSP Related Tasks:
+* [ ] Generate completions for effect handlers (with empty bodies of all the functions)
+* [ ] Generate show / (==) for datatypes
+* [ ] Find References
+* [ ] Generate Type Annotations
+
+Extension Related Tasks:
+
+VSCode:
+* [ ] Add support for debugging an executable
+
 Contact me if you are interested in tackling some of these :-)
 
 # Build Notes
@@ -460,6 +468,51 @@ $ out\v2.0.5\cl-release\test_bench_koka_rbtree --kktime
 info: elapsed: 1.483s, user: 1.484s, sys: 0.000s, rss: 164mb
 ```
 
+## Language Server
+
+The language server is started by running the koka compilter with the --language-server flag
+and then connecting to it with a client that supports the Language Server Protocol (LSP)
+
+For example, using VSCode, install the Koka extension or run the extension debug configuration in the project.
+Open up a folder and start editing `.kk` files. (The extension finds the koka executable and then automatically starts the language server for you).
+
+The VSCode extension searches in the following locations for the koka executable:
+- A koka development environment in ~/koka
+- A local install ~/.local/bin
+- The PATH environment variable
+
+To specify the command to start the language server manually, such as to provide additional flags to the koka compiler override the `koka.languageServer.command` VSCode setting.
+To specify the current working directory to run the compiler from use the `koka.languageServer.cwd` setting. If there are problems with the language server, you can enable the `koka.languageServer.trace.server` setting to see the language server logs, or turn off the language server by setting the `koka.languageServer.enable` setting to `false`.
+
+To develop the language server, you can use this VSCode debug configuration (add the configuration to .vscode/launch.json).
+
+```json
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+        "name": "Launch Extension",
+        "request": "launch",
+        "type": "extensionHost",
+        "args": [
+            "--extensionDevelopmentPath=${workspaceFolder}/support/vscode/koka.language-koka"
+        ],
+        "outFiles": [
+            "${workspaceFolder}/support/vscode/koka.language-koka/out/**/*.js"
+        ]
+    }
+]
+}
+```
+
+- Run `npm install && npm run build` in the `support/vscode/koka.language-koka` directory 
+- Update the LSP server in the `src/LanguageServer` directory with your changes
+- Run `stack build` 
+- Restart the debug configuration and make sure a notification pops up that you are using the development version of the koka sdk
+
 ## Older Release Notes
 
 * `v2.1.9`, 2021-06-23: initial support for cross-module specialization (by Steven Fontanella).

samples/basic/fibonacci.kk

@@ -1,14 +1,20 @@
 module fibonacci
 
-pub fun main() 
+pub fun mainx()
   val n = 10000
   println("The " ++ n.show ++ "th fibonacci number is " ++ fibonacci(10000).show)
 
 
-fun fibonacci(n : int) : div int 
+fun fibonacci(n : int) : div int
   fib(n, 0, 1)
 
 
-fun fib(n : int, x1 : int, x2 : int) : div int 
+fun fib(n : int, x1 : int, x2 : int) : div int
   if n<=0 then x1 else fib(n - 1, x2, x1+x2)
 
+pub fun testx()
+  fibonacci(100).println
+
+
+pub fun test2()
+  fibonacci(1000).println

samples/basic/rbtree.kk

@@ -15,7 +15,7 @@ type color
 type tree<a>
   Node(color : color, left : tree<a>, key : int, value : a, right : tree<a>)
   Leaf
-  
+
 
 fun is-red(t : tree<a>) : bool
   match t
@@ -32,7 +32,7 @@ fun balance-left(l :tree<a>, k : int, v : a, r : tree<a>) : tree<a>
     Node(_, lx, kx, vx, rx)
       -> Node(Black, Node(Red, lx, kx, vx, rx), k, v, r)
     Leaf -> Leaf
-    
+
 
 
 fun balance-right(l : tree<a>, k : int, v : a, r : tree<a>) : tree<a>
@@ -44,7 +44,7 @@ fun balance-right(l : tree<a>, k : int, v : a, r : tree<a>) : tree<a>
     Node(_, lx, kx, vx, rx)
       -> Node(Black, l, k, v, Node(Red, lx, kx, vx, rx))
     Leaf -> Leaf
-    
+
 
 fun ins(t : tree<a>, k : int, v : a) : tree<a>
   match t
@@ -88,7 +88,7 @@ fun make-tree(n : int) : tree<bool>
 
 
 // Count the nodes with `True` values.
-fun count( t : tree<bool> ) : int 
+fun count( t : tree<bool> ) : int
   t.fold(0) fn(k,v,r)
     if v then r + 1 else r
 

src/Backend/C/FromCore.hs

@@ -2663,6 +2663,7 @@ reserved
     , "instanceof"
     , "new"
     , "return"
+    , "register"
     , "switch"
     , "this"
     , "throw"