From 459dd024996f2324f107ac9b2b3607020a297c9a Mon Sep 17 00:00:00 2001
From: Marin Minnerly <dminnerly@roblox.com>
Date: Mon, 18 Jul 2022 09:17:26 -0700
Subject: [PATCH 1/2] Use luau-lsp for analysis

---
 .github/workflows/ci.yml | 13 +++++++------
 foreman.toml             |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1673289..3c0e74a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,23 +12,24 @@ on:
 jobs:
   analyze:
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v2
 
-    - name: install code quality tools
-      uses: Roblox/setup-foreman@v1
+    - uses: Roblox/setup-foreman@v1
       with:
-        version: "^1.0.1"
         token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Download global Roblox types
       shell: bash
-      run: curl -O https://raw.githubusercontent.com/JohnnyMorganz/luau-analyze-rojo/master/globalTypes.d.lua
+      run: curl -s -O https://raw.githubusercontent.com/JohnnyMorganz/luau-lsp/master/scripts/globalTypes.d.lua
+
+    - name: Generate sourcemap for LSP
+      shell: bash
+      run: rojo sourcemap default.project.json -o sourcemap.json
 
     - name: Analyze
       shell: bash
-      run: luau-analyze --project=default.project.json --defs=globalTypes.d.lua --defs=testez.d.lua src/
+      run: luau-lsp analyze --sourcemap=sourcemap.json --defs=globalTypes.d.lua --defs=testez.d.lua src/
 
 
   test:
diff --git a/foreman.toml b/foreman.toml
index 3ad2261..b6a16da 100644
--- a/foreman.toml
+++ b/foreman.toml
@@ -2,4 +2,4 @@
 rojo = { source = "rojo-rbx/rojo", version = "6.2.0" }
 selene = { source = "Kampfkarren/selene", version = "0.18.1" }
 stylua = { source = "JohnnyMorganz/StyLua", version = "0.13.1" }
-luau-analyze = { source = "JohnnyMorganz/luau-analyze-rojo", version = "0.527.0" }
+luau-lsp = { source = "JohnnyMorganz/luau-lsp", version = "*" }

From 36526876988e1e983771c5cf912929fef6aaac1b Mon Sep 17 00:00:00 2001
From: Marin Minnerly <dminnerly@roblox.com>
Date: Mon, 18 Jul 2022 14:40:21 -0700
Subject: [PATCH 2/2] Bump Rojo version

---
 foreman.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/foreman.toml b/foreman.toml
index b6a16da..a6a9718 100644
--- a/foreman.toml
+++ b/foreman.toml
@@ -1,5 +1,5 @@
 [tools]
-rojo = { source = "rojo-rbx/rojo", version = "6.2.0" }
+rojo = { source = "rojo-rbx/rojo", version = "7.2.0" }
 selene = { source = "Kampfkarren/selene", version = "0.18.1" }
 stylua = { source = "JohnnyMorganz/StyLua", version = "0.13.1" }
 luau-lsp = { source = "JohnnyMorganz/luau-lsp", version = "*" }