chore: combine the linter and language server in one workspace

.gitattributes

@@ -1,4 +1,5 @@
 * text=auto eol=lf
 *.tsv text eol=lf
+*.lua text eol=lf
 **/escrowed.lua binary
 **/encrypted.lua binary

.github/workflows/release.yml

@@ -25,31 +25,42 @@ jobs:
       - run: rustup default stable
       - if: contains(matrix.target, 'musl')
         run: sudo apt-get update && sudo apt-get install -y musl-tools
-      - run: cargo build --release --locked -p qbx_lint --target ${{ matrix.target }}
+      # Build separately to keep server-only documentation out of the CLI.
+      - run: cargo build --profile lint-release --locked -p qbx_lint --target ${{ matrix.target }}
+      - run: cargo build --release --locked -p qbx_lua_ls --target ${{ matrix.target }}
       - name: Check version and package
         shell: bash
         run: |
           set -euo pipefail
-          cd target/${{ matrix.target }}/release
-          binary="qbx-lint"
-          if [ "${{ runner.os }}" = "Windows" ]; then binary="${binary}.exe"; fi
-          actual="$(./"${binary}" --version)"
-          expected="qbx-lint ${GITHUB_REF_NAME#v}"
-          if [ "${actual}" != "${expected}" ]; then
-            echo "Tag ${GITHUB_REF_NAME} does not match built version: ${actual}" >&2
-            exit 1
-          fi
-          cp ../../../LICENSE LICENSE
-          name="qbx-lint-${{ matrix.target }}"
-          if [ "${{ matrix.archive }}" = "zip" ]; then
-            7z a "../../../${name}.zip" "${binary}" LICENSE
-          else
-            tar -czf "../../../${name}.tar.gz" "${binary}" LICENSE
-          fi
+          root="$PWD"
+          for tool in qbx-lint qbx-lua-ls; do
+            profile=release
+            if [ "$tool" = qbx-lint ]; then profile=lint-release; fi
+            (
+              cd "target/${{ matrix.target }}/${profile}"
+              binary="$tool"
+              if [ "${{ runner.os }}" = "Windows" ]; then binary="${binary}.exe"; fi
+              actual="$(./"${binary}" --version)"
+              expected="$tool ${GITHUB_REF_NAME#v}"
+              if [ "$actual" != "$expected" ]; then
+                echo "Tag ${GITHUB_REF_NAME} does not match built version: ${actual}" >&2
+                exit 1
+              fi
+              cp "$root/LICENSE" LICENSE
+              name="$tool-${{ matrix.target }}"
+              if [ "${{ matrix.archive }}" = "zip" ]; then
+                7z a "$root/${name}.zip" "$binary" LICENSE
+              else
+                tar -czf "$root/${name}.tar.gz" "$binary" LICENSE
+              fi
+            )
+          done
       - uses: actions/upload-artifact@v4
         with:
           name: binary-${{ matrix.target }}
-          path: qbx-lint-${{ matrix.target }}.${{ matrix.archive }}
+          path: |
+            qbx-lint-${{ matrix.target }}.${{ matrix.archive }}
+            qbx-lua-ls-${{ matrix.target }}.${{ matrix.archive }}
           if-no-files-found: error
 
   publish:

.gitignore

@@ -7,3 +7,5 @@
 Thumbs.db
 /qbx-lint-*.zip
 /qbx-lint-*.tar.gz
+/qbx-lua-ls-*.zip
+/qbx-lua-ls-*.tar.gz

CONTRIBUTING.md

@@ -25,11 +25,22 @@ cargo run --locked -p qbx_lint -- fmt --check path/to/resource
 | `qbx_fivem_data` | Native data, runtime stubs, and known manifest imports. |
 | `qbx_lua_analysis` | Scopes, resource models, rules, configuration, and suppressions. |
 | `qbx_lint` | Command-line interface and report formats. |
+| `qbx_lua_ls` | Language server, editor features, and LSP protocol. |
 | `xtask` | Native data generation. |
 
-The [language server](https://github.com/Qbox-project/qbx-lua-ls) uses sibling path dependencies
-on these crates. When changing a shared API, keep the two repositories side by side and run the
-language server's tests too.
+The [language server](crates/qbx_lua_ls) shares the workspace's parser, formatter, analysis and
+FiveM data crates. `cargo test --workspace --locked` checks both tools; shared API changes belong
+in the same pull request. See its [contribution guide](crates/qbx_lua_ls/CONTRIBUTING.md) for LSP
+checks and manual probes. Editor adapters live in [qbx-editor](https://github.com/Qbox-project/qbx-editor).
+
+Release builds use separate Cargo invocations so the linter does not enable the server's `docs`
+features. The server uses the `release` profile with panic unwinding for request recovery;
+the CLI keeps its abort-on-panic behavior in `lint-release`:
+
+```sh
+cargo build --profile lint-release --locked -p qbx_lint
+cargo build --release --locked -p qbx_lua_ls
+```
 
 ## Tests and fixtures
 

Cargo.toml

@@ -6,6 +6,7 @@ members = [
     "crates/qbx_lua_analysis",
     "crates/qbx_fivem_data",
     "crates/qbx_lint",
+    "crates/qbx_lua_ls",
     "xtask",
 ]
 default-members = [
@@ -14,6 +15,7 @@ default-members = [
     "crates/qbx_lua_analysis",
     "crates/qbx_fivem_data",
     "crates/qbx_lint",
+    "crates/qbx_lua_ls",
 ]
 
 [workspace.package]
@@ -35,4 +37,8 @@ opt-level = 3
 lto = "fat"
 codegen-units = 1
 strip = true
+
+# LSP requests recover from panics, so the server must keep unwinding enabled.
+[profile.lint-release]
+inherits = "release"
 panic = "abort"

README.md

@@ -4,24 +4,28 @@ A Lua linter and formatter for FiveM resources. It parses CfxLua syntax, reads r
 and checks code against bundled native definitions, runtime globals, and client/server context.
 
 It reports Lua mistakes, missing manifest imports, event and export mismatches, and common Qbox
-patterns. The parser and analysis crates are also used by
-[qbx-lua-ls](https://github.com/Qbox-project/qbx-lua-ls), the server behind the
+patterns. The same workspace contains the parser, formatter, analysis crates and
+[qbx-lua-ls](crates/qbx_lua_ls), the server behind the
 [Qbox Lua editor integrations](https://github.com/Qbox-project/qbx-editor).
 
+Shared analysis and language-server changes can be developed and tested in one pull request.
+See the [language-server guide](crates/qbx_lua_ls/README.md) for features and setup, and the
+[migration notes](docs/repository-migration.md) for Git history and release compatibility.
+
 ## Install
 
 Build from a checkout with a stable Rust toolchain and Cargo:
 
 ```sh
 git clone https://github.com/Qbox-project/qbx-lint.git
 cd qbx-lint
-cargo install --path crates/qbx_lint --locked
+cargo install --path crates/qbx_lint --locked --profile lint-release
 qbx-lint --version
 ```
 
 Cargo installs the executable into its `bin` directory, which must be on your `PATH`.
-For a local build without installation, run `cargo build --release --locked -p qbx_lint`.
-The executable is then in `target/release` (`qbx-lint.exe` on Windows).
+For a local build without installation, run `cargo build --profile lint-release --locked -p qbx_lint`.
+The executable is then in `target/lint-release` (`qbx-lint.exe` on Windows).
 
 Download the archive for your platform from the
 [releases page](https://github.com/Qbox-project/qbx-lint/releases), extract it, and put the

crates/qbx_lua_ls/CONTRIBUTING.md

@@ -0,0 +1,73 @@
+# Contributing
+
+## Set up
+
+Install stable Rust and clone [qbx-lint](https://github.com/Qbox-project/qbx-lint). The language
+server is a member of the same Cargo workspace as the parser, formatter, analysis and FiveM data
+crates:
+
+```text
+qbx-lint/
+  Cargo.toml
+  crates/
+    qbx_lua_ls/
+    qbx_lua_analysis/
+    ...
+```
+
+From the workspace root, build with `cargo build --locked -p qbx_lua_ls`. If a change needs shared
+parser or lint behavior, include those crate changes in the same pull request.
+
+## Check changes
+
+Run these commands from the workspace root before submitting a pull request:
+
+```sh
+cargo fmt --all --check
+cargo clippy --workspace --locked --all-targets -- -D warnings
+cargo test --workspace --locked
+```
+
+Use `cargo fmt` to apply formatting. Add a regression test when fixing a bug, using a small Lua
+example and the manifest needed to reproduce it. The tests in `tests/lsp.rs` run the server
+through an in-memory LSP connection. `tests/workspace_refresh.rs` covers event-side behavior
+and index refreshes with temporary files.
+
+Check both minimal LSP clients and clients that advertise the relevant capability when changing
+protocol behavior. Editor integration code belongs in
+[qbx-editor](https://github.com/Qbox-project/qbx-editor).
+
+For manual inspection, build the executable and use the probe script:
+
+```sh
+cargo build --release --locked -p qbx_lua_ls
+node crates/qbx_lua_ls/scripts/probe.mjs <workspace> <virtual-file> <server-executable> < snippet.lua
+```
+
+`probe.mjs` requires Node.js. It opens the supplied text as a document and prints completions
+for lines marked with `--^` and hovers for `--?<column>` markers. Use the `.exe` executable on
+Windows. Run the command in a shell that supports input redirection.
+
+## Code layout
+
+| Location | Purpose |
+| --- | --- |
+| `src/types.rs`, `src/luacats.rs` | Type representation and LuaCATS annotations. |
+| `src/indexer.rs`, `src/index.rs` | File summaries, symbols and visibility between resources. |
+| `src/infer.rs` | Type inference used by editor features. |
+| `src/workspace.rs` | Resource discovery, manifests, dependencies and index refreshes. |
+| `src/features/` | LSP feature implementations. |
+| `src/server.rs` | Protocol dispatch, settings and diagnostics publication. |
+
+Closed files retain summaries rather than full syntax trees. Reference searches may parse them
+again. Keep that distinction in mind when adding data to the index or handling unsaved text.
+
+## Issues and pull requests
+
+For a bug report, include the server version, operating system, editor/LSP client, relevant
+settings, expected behavior and a small Lua/manifest example. For crashes, include server logs
+and the last action that triggered the problem.
+
+Describe the behavior changed by a pull request and list the checks you ran. State any editor
+or platform behavior you could not test. Update the docs when the user-facing
+behavior changes. Release notes are generated from commit messages, so write them as [Conventional Commits](https://www.conventionalcommits.org).

crates/qbx_lua_ls/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "qbx_lua_ls"
+description = "Language server for FiveM Lua"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+
+[[bin]]
+name = "qbx-lua-ls"
+path = "src/main.rs"
+
+[dependencies]
+qbx_lua_syntax.workspace = true
+qbx_lua_fmt.workspace = true
+qbx_lua_analysis = { workspace = true, features = ["docs"] }
+qbx_fivem_data = { workspace = true, features = ["docs"] }
+lsp-server = "0.7"
+lsp-types = "0.95"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+crossbeam-channel = "0.5"
+rustc-hash.workspace = true
+smol_str.workspace = true
+walkdir = "2"