[ change ] Target GHC 9.2.8 instead

Author: banacorn

CHANGELOG.md

@@ -4,7 +4,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## v0.2.6.4.0 - unreleased
+## v0.2.6.4.0.3 - 2023-12-14
+
+### Fixed
+- #15: Add missing handlers for `lsp` methods.
+- #24: Fix the encoding of binaries built on GitHub Actions.
+- Patch path to the "data" directory when the executable is built on GitHub Actions.
+
+## v0.2.6.4.0.0 - 2023-12-12
 
 ### Changed
 - Embed Agda-2.6.4.

README.md

@@ -28,3 +28,15 @@ The version is _x.a.b.c.d.y_ where _a.b.c.d_ is the 4-digit Agda version (2.6.4.
 * for less impact on the Agda codebase
 * to help [decouple the Agda codebase](https://github.com/agda/agda/projects/5)
 * we can always merge it back to Agda later anyway
+
+## Hacking 
+
+This language server is co-developed alongside [agda-mode on VS Code](https://github.com/banacorn/agda-mode-vscode). 
+Enable `agdaMode.connection.agdaLanguageServer` in agda-mode's settings, and then hit *restart* <kbd>C-x</kbd> <kbd>C-r</kbd> to connect to the language server. 
+The editor extension will search for the language server in the following order:
+1. `localhost:4096` via TCP
+2. `als` executable on your machine
+3. Prebuilt binaries on GitHub
+
+To host the language server locally at `localhost:4096`, run `:main -p` in the REPL (`stack repl`). 
+This allows us to reload the language server in the REPL without having to recompile and reinstall the whole project on your system every time there is a change.

agda-language-server.cabal

@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.36.0.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           agda-language-server
-version:        0.2.6.4.0
+version:        0.2.6.4.3.0
 synopsis:       An implementation of language server protocal (LSP) for Agda 2.
 description:    Please see the README on GitHub at <https://github.com/agda/agda-language-server#readme>
 category:       Development
@@ -22,22 +22,32 @@ extra-source-files:
     CHANGELOG.md
     package.yaml
     stack.yaml
-    stack-8.10-Agda-2.6.2.2.yaml
-    stack-9.0-Agda-2.6.2.2.yaml
     stack-9.2-Agda-2.6.2.2.yaml
     stack-9.2-Agda-2.6.3.yaml
+    stack-9.2-Agda-2.6.4.yaml
+    stack-9.2-Agda-2.6.4.3.yaml
 
 source-repository head
   type: git
   location: https://github.com/banacorn/agda-language-server
 
 flag Agda-2-6-2-2
-  description: Embed Agda-2.6.2.2 (rather than 2.6.4)
+  description: Embed Agda-2.6.2.2
   manual: True
   default: False
 
 flag Agda-2-6-3
-  description: Embed Agda-2.6.3 (rather than 2.6.4)
+  description: Embed Agda-2.6.3
+  manual: True
+  default: False
+
+flag Agda-2-6-4
+  description: Embed Agda-2.6.4
+  manual: True
+  default: False
+
+flag Agda-2-6-4-3
+  description: Embed Agda-2.6.4.3
   manual: True
   default: False
 
@@ -84,6 +94,8 @@ library
     , base >=4.7 && <5
     , bytestring
     , containers
+    , directory
+    , filepath
     , lsp
     , lsp-types
     , mtl
@@ -94,19 +106,20 @@ library
     , stm
     , strict
     , text
+    , text-icu
   default-language: Haskell2010
-  if flag(Agda-2-6-2-2) && !flag(Agda-2-6-3)
+  if flag(Agda-2-6-2-2)
     build-depends:
         Agda ==2.6.2.2
-  if !flag(Agda-2-6-2-2) && flag(Agda-2-6-3)
+  if flag(Agda-2-6-3)
     build-depends:
         Agda ==2.6.3
-  if !flag(Agda-2-6-2-2) && !flag(Agda-2-6-3)
+  if flag(Agda-2-6-4)
     build-depends:
         Agda ==2.6.4
-  if flag(Agda-2-6-2-2) && flag(Agda-2-6-3)
+  if flag(Agda-2-6-4-3)
     build-depends:
-        Agda <0
+        Agda ==2.6.4.3
 
 executable als
   main-is: Main.hs
@@ -127,6 +140,8 @@ executable als
     , base >=4.7 && <5
     , bytestring
     , containers
+    , directory
+    , filepath
     , lsp
     , lsp-types
     , mtl
@@ -137,19 +152,20 @@ executable als
     , stm
     , strict
     , text
+    , text-icu
   default-language: Haskell2010
-  if flag(Agda-2-6-2-2) && !flag(Agda-2-6-3)
+  if flag(Agda-2-6-2-2)
     build-depends:
         Agda ==2.6.2.2
-  if !flag(Agda-2-6-2-2) && flag(Agda-2-6-3)
+  if flag(Agda-2-6-3)
     build-depends:
         Agda ==2.6.3
-  if !flag(Agda-2-6-2-2) && !flag(Agda-2-6-3)
+  if flag(Agda-2-6-4)
     build-depends:
         Agda ==2.6.4
-  if flag(Agda-2-6-2-2) && flag(Agda-2-6-3)
+  if flag(Agda-2-6-4-3)
     build-depends:
-        Agda <0
+        Agda ==2.6.4.3
 
 test-suite als-test
   type: exitcode-stdio-1.0
@@ -197,6 +213,8 @@ test-suite als-test
     , base >=4.7 && <5
     , bytestring
     , containers
+    , directory
+    , filepath
     , lsp
     , lsp-types
     , mtl
@@ -211,16 +229,17 @@ test-suite als-test
     , tasty-hunit
     , tasty-quickcheck
     , text
+    , text-icu
   default-language: Haskell2010
-  if flag(Agda-2-6-2-2) && !flag(Agda-2-6-3)
+  if flag(Agda-2-6-2-2)
     build-depends:
         Agda ==2.6.2.2
-  if !flag(Agda-2-6-2-2) && flag(Agda-2-6-3)
+  if flag(Agda-2-6-3)
     build-depends:
         Agda ==2.6.3
-  if !flag(Agda-2-6-2-2) && !flag(Agda-2-6-3)
+  if flag(Agda-2-6-4)
     build-depends:
         Agda ==2.6.4
-  if flag(Agda-2-6-2-2) && flag(Agda-2-6-3)
+  if flag(Agda-2-6-4-3)
     build-depends:
-        Agda <0
+        Agda ==2.6.4.3

app/Main.hs

@@ -1,13 +1,33 @@
 module Main where
 
-import           Options
-import           Server                         ( run )
-import           System.Console.GetOpt
-import           System.Environment             ( getArgs )
-import           Text.Read                      ( readMaybe )
+import Control.Monad (when)
+import Options
+import Server (run)
+import System.Console.GetOpt
+import System.Directory (doesDirectoryExist)
+import System.Environment
+import System.FilePath ((</>))
+import System.IO
+import Text.Read (readMaybe)
 
 main :: IO ()
 main = do
+  -- set locale to UTF-8
+  -- https://github.com/agda/agda-language-server/issues/24
+  hSetEncoding stdout utf8
+  hSetEncoding stdin utf8
+  hSetEncoding stderr utf8
+
+  -- The GitHub CI-built executable lacks the correct data directory path.
+  -- If there's directory named "data" in the executable's directory,
+  -- then we assume that the executable is built by GitHub CI
+  -- and we should set the $Agda_datadir environment variable to the correct directory.
+  executablePath <- getExecutablePath
+  let dataDir = executablePath </> "data"
+  isBuiltByCI <- doesDirectoryExist dataDir
+  when isBuiltByCI $ do
+    setEnv "Agda_datadir" dataDir
+
   options <- getOptionsFromArgv
   if optHelp options
     then putStrLn usageMessage

package.yaml

@@ -1,5 +1,5 @@
 name:                agda-language-server
-version:             0.2.6.4.0
+version:             0.2.6.4.3.0
 github:              "banacorn/agda-language-server"
 license:             MIT
 author:              "Ting-Gian LUA"
@@ -11,10 +11,10 @@ extra-source-files:
 - CHANGELOG.md
 - package.yaml
 - stack.yaml
-- stack-8.10-Agda-2.6.2.2.yaml
-- stack-9.0-Agda-2.6.2.2.yaml
 - stack-9.2-Agda-2.6.2.2.yaml
 - stack-9.2-Agda-2.6.3.yaml
+- stack-9.2-Agda-2.6.4.yaml
+- stack-9.2-Agda-2.6.4.3.yaml
 
 # Metadata used when publishing your package
 synopsis:            An implementation of language server protocal (LSP) for Agda 2.
@@ -27,34 +27,47 @@ description:         Please see the README on GitHub at <https://github.com/agda
 
 flags:
   Agda-2-6-2-2:
-    description: Embed Agda-2.6.2.2 (rather than 2.6.4)
+    description: Embed Agda-2.6.2.2
     manual: true
     default: false
   Agda-2-6-3:
-    description: Embed Agda-2.6.3 (rather than 2.6.4)
+    description: Embed Agda-2.6.3
+    manual: true
+    default: false
+  Agda-2-6-4:
+    description: Embed Agda-2.6.4
+    manual: true
+    default: false
+  Agda-2-6-4-3:
+    description: Embed Agda-2.6.4.3
     manual: true
     default: false
 
 when:
-- condition: "flag(Agda-2-6-2-2) && !flag(Agda-2-6-3)"
+- condition: "flag(Agda-2-6-2-2)"
   dependencies:
     - Agda == 2.6.2.2
-- condition: "!flag(Agda-2-6-2-2) && flag(Agda-2-6-3)"
+- condition: "flag(Agda-2-6-3)"
   dependencies:
     - Agda == 2.6.3
-- condition: "!flag(Agda-2-6-2-2) && !flag(Agda-2-6-3)"
+- condition: "flag(Agda-2-6-4)"
   dependencies:
     - Agda == 2.6.4
-- condition: "flag(Agda-2-6-2-2) && flag(Agda-2-6-3)"
+- condition: "flag(Agda-2-6-4-3)"
   dependencies:
-    - Agda < 0
+    - Agda == 2.6.4.3
+# - condition: "flag(Agda-2-6-2-2) && flag(Agda-2-6-3)"
+#   dependencies:
+#     - Agda < 0
 
 dependencies:
   - base >= 4.7 && < 5
   - Agda
   - aeson
   - bytestring
   - containers
+  - directory
+  - filepath
   - lsp-types
   - lsp
   - mtl
@@ -63,6 +76,7 @@ dependencies:
   - strict
   - stm
   - text
+  - text-icu
   - process
   - prettyprinter
 

src/Render/Concrete.hs

@@ -322,7 +322,7 @@ instance Render DoStmt where
       prCs [] = mempty
       prCs cs' = fsep ["where", vcat (fmap render cs')]
   render (DoThen e) = render e
-  render (DoLet _ ds) = "let" <+> vcat (fmap render $ toList ds)
+  render (DoLet _ ds) = "let" <+> vcat (render <$> toList ds)
 
 instance Render Declaration where
   render d =