Merge 3652687 into ce63e3d

.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:

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-analyze = { source = "JohnnyMorganz/luau-analyze-rojo", version = "0.527.0" }
+luau-lsp = { source = "JohnnyMorganz/luau-lsp", version = "*" }