From 5ec6da2c40f09e8bc10431da7b6467d1f36a56f9 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 4 Nov 2022 10:40:35 +0100
Subject: [PATCH] Switched to split package; updated stuff

---
 .SRCINFO | 19 ++++++++++++-------
 PKGBUILD | 43 ++++++++++++++++++++++++-------------------
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index b0c9abb..1c712d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,20 @@
-pkgbase = vieter-vls
-	pkgdesc = Language server for the V programming language; synced with the vieter-v compiler.
-	pkgver = r582.5ad842f
+pkgbase = vlang-ls-git
+	pkgver = r783.66b92a8
 	pkgrel = 1
 	url = https://github.com/vlang/vls
 	arch = x86_64
 	arch = aarch64
 	license = MIT
 	makedepends = git
-	depends = glibc
-	depends = vieter-v
-	source = vieter-vls::git+https://github.com/vlang/vls
+	makedepends = vlang
+	source = vls::git+https://github.com/vlang/vls
 	md5sums = SKIP
 
-pkgname = vieter-vls
+pkgname = vlang-ls-git
+	pkgdesc = Language server for the V programming language
+	depends = glibc
+	depends = vlang
+
+pkgname = vlang-ls-git-nvim-ts
+	pkgdesc = Treesitter grammar for V for the Neovim treesitter plugin
+	depends = glibc
diff --git a/PKGBUILD b/PKGBUILD
index 3ea10cd..5a94264 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,53 @@
 # Maintainer: Jef Roosens
 
-pkgname=vieter-vls
-pkgver=r582.5ad842f
+_pkgname='vls'
+pkgbase=vlang-ls-git
+pkgname=('vlang-ls-git' 'vlang-ls-git-nvim-ts')
+pkgver=r783.66b92a8
 pkgrel=1
-pkgdesc='Language server for the V programming language; synced with the vieter-v compiler.'
 arch=('x86_64' 'aarch64')
 
 url='https://github.com/vlang/vls'
 license=('MIT')
 
-depends=('glibc' 'vieter-v')
-makedepends=('git')
+makedepends=('git' 'vlang')
 
-source=("${pkgname}::git+https://github.com/vlang/vls")
+source=("${_pkgname}::git+https://github.com/vlang/vls")
 md5sums=('SKIP')
 
 pkgver() {
-    cd "${pkgname}"
+    cd "${_pkgname}"
 
     echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 build() {
-    cd "${pkgname}"
+    cd "${_pkgname}"
 
-    v run build.vsh gcc
+    v run build.vsh "${CC:-gcc}"
 
     msg "Building treesitter grammar..."
 
     # Building with -prod is required because otherwise, the binary contains
     # tcc symbols which isn't usually installed on the user's system.
-    v -cc gcc -shared -prod tree_sitter_v
+    v -cc "${CC:-gcc}" -shared -prod tree_sitter_v
 }
 
-package() {
-    # Install vls
-    install -dm755 "${pkgdir}/usr/bin"
-    install -Dm755 "${pkgname}/bin/vls" "${pkgdir}/usr/bin/vls"
-    install -Dm644 "${pkgname}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+package_vlang-ls-git() {
+    pkgdesc='Language server for the V programming language'
+    depends=('glibc' 'vlang')
+
+    install -dm755 "${pkgdir}/usr/bin"
+    install -Dm755 "${_pkgname}/bin/vls" "${pkgdir}/usr/bin/vls"
+    install -Dm644 "${_pkgname}/LICENSE" -t "${pkgdir}/usr/share/licenses/${_pkgname}"
+}
+
+package_vlang-ls-git-nvim-ts() {
+    pkgdesc="Treesitter grammar for V for the Neovim treesitter plugin"
+    depends=('glibc')
 
-    # Install treesitter grammar
-    # This package installs the parser & queries for Neovim in its runtimepath
     install -dm755 "${pkgdir}/usr/share/nvim/runtime/parser"
     install -dm755 "${pkgdir}/usr/share/nvim/runtime/queries/v"
-    install -Dm755 "${pkgname}/tree_sitter_v/tree_sitter_v.so" "${pkgdir}/usr/share/nvim/runtime/parser/v.so"
-    install -m644 "${pkgname}/tree_sitter_v/queries"/* "${pkgdir}/usr/share/nvim/runtime/queries/v"
+    install -Dm755 "${_pkgname}/tree_sitter_v/tree_sitter_v.so" "${pkgdir}/usr/share/nvim/runtime/parser/v.so"
+    install -m644 "${_pkgname}/tree_sitter_v/queries"/* "${pkgdir}/usr/share/nvim/runtime/queries/v"
 }