lsp names renamed to roc_language_server

Correct gitignore case
This commit is contained in:
Brian Teague 2024-01-05 14:22:44 -05:00
parent 901e771424
commit 17fabb77b4
12 changed files with 25 additions and 24 deletions

View file

@ -25,7 +25,7 @@ jobs:
run: ./ci/write_version.sh run: ./ci/write_version.sh
- name: build release with lto - name: build release with lto
run: cargo build --profile=release-with-lto --locked --bin roc --bin roc_ls run: cargo build --profile=release-with-lto --locked --bin roc --bin roc_language_server
- name: get commit SHA - name: get commit SHA
run: echo "SHA=$(git rev-parse --short "$GITHUB_SHA")" >> $GITHUB_ENV run: echo "SHA=$(git rev-parse --short "$GITHUB_SHA")" >> $GITHUB_ENV

View file

@ -25,7 +25,7 @@ jobs:
run: ./ci/write_version.sh run: ./ci/write_version.sh
- name: build release with lto - name: build release with lto
run: RUSTFLAGS="-C target-cpu=x86-64" cargo build --profile=release-with-lto --locked --bin roc --bin roc_ls run: RUSTFLAGS="-C target-cpu=x86-64" cargo build --profile=release-with-lto --locked --bin roc --bin roc_language_server
# target-cpu=x86-64 -> For maximal compatibility for all CPU's. This was also faster in our tests: https://roc.zulipchat.com/#narrow/stream/231635-compiler-development/topic/.2Ecargo.2Fconfig.2Etoml/near/325726299 # target-cpu=x86-64 -> For maximal compatibility for all CPU's. This was also faster in our tests: https://roc.zulipchat.com/#narrow/stream/231635-compiler-development/topic/.2Ecargo.2Fconfig.2Etoml/near/325726299
- name: get commit SHA - name: get commit SHA

View file

@ -42,7 +42,7 @@ jobs:
run: ./ci/write_version.sh run: ./ci/write_version.sh
- name: build nightly release - name: build nightly release
run: cargo build --locked --profile=release-with-lto --bin roc --bin roc_ls run: cargo build --locked --profile=release-with-lto --bin roc --bin roc_language_server
- name: package release - name: package release
run: ./ci/package_release.sh ${{ env.RELEASE_FOLDER_NAME }} run: ./ci/package_release.sh ${{ env.RELEASE_FOLDER_NAME }}

View file

@ -32,7 +32,7 @@ jobs:
# this issue may be caused by using older versions of XCode # this issue may be caused by using older versions of XCode
- name: build release - name: build release
run: RUSTFLAGS="-C target-cpu=x86-64" cargo build --profile=release-with-lto --locked --bin roc --bin roc_ls run: RUSTFLAGS="-C target-cpu=x86-64" cargo build --profile=release-with-lto --locked --bin roc --bin roc_language_server
# target-cpu=x86-64 -> For maximal compatibility for all CPU's. # target-cpu=x86-64 -> For maximal compatibility for all CPU's.
- name: get commit SHA - name: get commit SHA

View file

@ -53,7 +53,7 @@ build-nightly-release:
COPY --dir .git LICENSE LEGAL_DETAILS ci ./ COPY --dir .git LICENSE LEGAL_DETAILS ci ./
# version.txt is used by the CLI: roc --version # version.txt is used by the CLI: roc --version
RUN ./ci/write_version.sh RUN ./ci/write_version.sh
RUN RUSTFLAGS=$RUSTFLAGS cargo build --profile=release-with-lto --locked --bin roc --bin roc_ls RUN RUSTFLAGS=$RUSTFLAGS cargo build --profile=release-with-lto --locked --bin roc --bin roc_language_server
RUN ./ci/package_release.sh $RELEASE_FOLDER_NAME RUN ./ci/package_release.sh $RELEASE_FOLDER_NAME
RUN ls RUN ls
SAVE ARTIFACT ./$RELEASE_FOLDER_NAME.tar.gz AS LOCAL $RELEASE_FOLDER_NAME.tar.gz SAVE ARTIFACT ./$RELEASE_FOLDER_NAME.tar.gz AS LOCAL $RELEASE_FOLDER_NAME.tar.gz

View file

@ -5,19 +5,19 @@ set -euxo pipefail
# this makes the binaries a lot smaller # this makes the binaries a lot smaller
strip ./target/release-with-lto/roc strip ./target/release-with-lto/roc
strip ./target/release-with-lto/roc_ls strip ./target/release-with-lto/roc_language_server
# to be able to delete "target" later # to be able to delete "target" later
cp target/release-with-lto/roc ./roc cp target/release-with-lto/roc ./roc
cp target/release-with-lto/roc_ls ./roc_lang_server cp target/release-with-lto/roc_language_server ./roc_language_server
# delete unnecessary files and folders # delete unnecessary files and folders
git clean -fdx --exclude roc --exclude roc_lang_server git clean -fdx --exclude roc --exclude roc_language_server
mkdir $1 mkdir $1
mv roc roc_lang_server LICENSE LEGAL_DETAILS $1 mv roc roc_language_server LICENSE LEGAL_DETAILS $1
mkdir $1/examples mkdir $1/examples
mv examples/helloWorld.roc examples/platform-switching examples/cli $1/examples mv examples/helloWorld.roc examples/platform-switching examples/cli $1/examples

View file

@ -1,9 +1,10 @@
cfold CFold
closure Closure
deriv Deriv
issue2279 Issue2279
nqueens NQueens
quicksortapp Quicksort
QuicksortApp
RBTreeCk RBTreeCk
RBTreeDel RBTreeDel
RBTreeInsert RBTreeInsert

View file

@ -4,7 +4,7 @@ version = "0.0.1"
edition = "2021" edition = "2021"
[[bin]] [[bin]]
name = "roc_ls" name = "roc_language_server"
path = "src/server.rs" path = "src/server.rs"
[dependencies] [dependencies]

View file

@ -1,4 +1,4 @@
# roc_ls # roc_language_server
This is a basic language server for Roc. This is a basic language server for Roc.
@ -36,7 +36,7 @@ Note that the language server is a bit naïve:
## Installing ## Installing
The roc_lang_server binary is included with the [nightly releases](https://github.com/roc-lang/roc/releases). We recommend using the same version of roc and roc_lang_server. The roc_language_server binary is included with the [nightly releases](https://github.com/roc-lang/roc/releases). We recommend using the same version of roc and roc_language_server.
### Building from source ### Building from source
@ -44,13 +44,13 @@ Follow the [building from source](https://github.com/roc-lang/roc/blob/main/BUIL
``` ```
# do `nix develop` first if you're using nix! # do `nix develop` first if you're using nix!
cargo build -p roc_lang_srv --release cargo build -p roc_language_server --release
``` ```
This will give you the language server binary at: This will give you the language server binary at:
``` ```
target/release/roc_ls target/release/roc_language_server
``` ```
### Configuring in your editor ### Configuring in your editor
@ -65,7 +65,7 @@ Add the following to your coc JSON configuration file:
{ {
"languageserver": { "languageserver": {
"roc": { "roc": {
"command": "<path to binary folder>/roc_ls", "command": "<path to binary folder>/roc_language_server",
"filetypes": ["roc"] "filetypes": ["roc"]
} }
} }

View file

@ -1,4 +1,4 @@
#!/usr/bin/bash #!/usr/bin/bash
SCRIPT_DIR=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd) SCRIPT_DIR=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)
${SCRIPT_DIR}/../../target/debug/roc_ls "$@" 2> /tmp/roc_ls.err ${SCRIPT_DIR}/../../target/debug/roc_language_server "$@" 2> /tmp/roc_language_server.err

View file

@ -3,7 +3,7 @@ let
inherit (compile-deps) zigPkg llvmPkgs llvmVersion llvmMajorMinorStr glibcPath libGccSPath; inherit (compile-deps) zigPkg llvmPkgs llvmVersion llvmMajorMinorStr glibcPath libGccSPath;
subPackagePath = if subPackage != null then "crates/${subPackage}" else null; subPackagePath = if subPackage != null then "crates/${subPackage}" else null;
mainBin = if subPackage == "lang_srv" then "roc_ls" else "roc"; mainBin = if subPackage == "lang_srv" then "roc_language_server" else "roc";
filteredSource = pkgs.callPackage ./fileFilter.nix { }; filteredSource = pkgs.callPackage ./fileFilter.nix { };
in in
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {

View file

@ -30,7 +30,7 @@
# For vscode plugin https://github.com/ivan-demchenko/roc-vscode-unofficial # For vscode plugin https://github.com/ivan-demchenko/roc-vscode-unofficial
shellHook = '' shellHook = ''
export ROC_LSP_PATH=${rocFull}/bin/roc_ls export ROC_LANGUAGE_SERVER_PATH=${rocFull}/bin/roc_language_server
''; '';
}; };
}; };