Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace twig-language-server with twiggy-language-server #6

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

replace twig-language-server with twiggy-language-server #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/target

# zed-twig
*.wasm
/grammars

# Added by cargo
#
# already existing elements were commented out

#/target
# Rust
/target
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ This is a zed extension that enables intellisense and syntax highlighting for th

## Credits

This extension is based on:
This extension uses:

- https://github.com/gbprod/tree-sitter-twig for the syntax highlighting
- https://github.com/kaermorchen/twig-language-server for the intellisense
- https://github.com/gbprod/tree-sitter-twig for syntax highlighting
- https://github.com/moetelo/twiggy for the language-server

Contributions are welcome!
7 changes: 3 additions & 4 deletions extension.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
id = "twig"
name = "Twig"
version = "0.1.1"
version = "0.2.0"
schema_version = 1
authors = ["Yussuf Sassi <[email protected]>"]
description = "Syntax highlighting and Intellisense for Twig in Zed"
Expand All @@ -10,7 +10,6 @@ repository = "https://github.com/YussufSassi/zed-twig"
repository = "https://github.com/gbprod/tree-sitter-twig"
commit = "eaf80e6af969e25993576477a9dbdba3e48c1305"


[language_servers.twig-language-server]
name = "Twig Language Server"
[language_servers.twiggy-language-server]
name = "Twiggy Language Server"
language = "Twig"
2 changes: 0 additions & 2 deletions grammars/twig.toml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use std::{env, fs};
use zed_extension_api::{self as zed, Result};

const SERVER_PATH: &str = "node_modules/twig-language-server/out/index.js";
const PACKAGE_NAME: &str = "twig-language-server";
const SERVER_PATH: &str = "node_modules/twiggy-language-server/dist/server.js";
const PACKAGE_NAME: &str = "twiggy-language-server";

struct TwigExtension {
did_find_server: bool,
Expand Down