Compare commits
3 Commits
d21237cfdc
..
v0.5.0
| Author | SHA1 | Date | |
|---|---|---|---|
| 7da13ffc5c | |||
| 31f41315b2 | |||
| caaafd3cf3 |
Generated
+3
-3
@@ -376,11 +376,11 @@ checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nuwiki-core"
|
name = "nuwiki-core"
|
||||||
version = "0.4.1"
|
version = "0.5.0"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nuwiki-ls"
|
name = "nuwiki-ls"
|
||||||
version = "0.4.1"
|
version = "0.5.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"nuwiki-lsp",
|
"nuwiki-lsp",
|
||||||
"tokio",
|
"tokio",
|
||||||
@@ -388,7 +388,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nuwiki-lsp"
|
name = "nuwiki-lsp"
|
||||||
version = "0.4.1"
|
version = "0.5.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"dashmap 6.1.0",
|
"dashmap 6.1.0",
|
||||||
|
|||||||
+1
-1
@@ -3,7 +3,7 @@ resolver = "2"
|
|||||||
members = ["crates/*"]
|
members = ["crates/*"]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "0.4.1"
|
version = "0.5.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
rust-version = "1.83"
|
rust-version = "1.83"
|
||||||
authors = ["Gabriel Fróes Franco <gffranco@gmail.com>"]
|
authors = ["Gabriel Fróes Franco <gffranco@gmail.com>"]
|
||||||
|
|||||||
@@ -1,6 +1,14 @@
|
|||||||
# nuwiki-rs
|
# nuwiki-rs
|
||||||
|
|
||||||
Rust crates powering [nuwiki](https://code.gfran.co/gffranco/nuwiki): the vimwiki-compatible language server and editor plugin for Vim/Neovim.
|
The Rust language server (`nuwiki-ls`) behind [nuwiki](https://code.gfran.co/gffranco/nuwiki), the vimwiki-compatible Vim/Neovim plugin.
|
||||||
|
|
||||||
|
> [!NOTE]
|
||||||
|
> **This repo is the server only.** If you just want to *use* nuwiki in
|
||||||
|
> Vim/Neovim, install the plugin from
|
||||||
|
> **[gffranco/nuwiki](https://code.gfran.co/gffranco/nuwiki)** — it downloads
|
||||||
|
> a prebuilt `nuwiki-ls` binary from this repo's releases automatically, so
|
||||||
|
> you don't need this repo or a Rust toolchain. Work here only to develop the
|
||||||
|
> parser / LSP / HTML renderer.
|
||||||
|
|
||||||
## Crates
|
## Crates
|
||||||
|
|
||||||
|
|||||||
@@ -526,10 +526,9 @@ impl<'src> LexState<'src> {
|
|||||||
if level == 0 {
|
if level == 0 {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
// Must be followed by at least one space.
|
// vimwiki accepts both spaced (`== H ==`) and spaceless (`==H==`)
|
||||||
if leading_ws + level >= bytes.len() || bytes[leading_ws + level] != b' ' {
|
// headings, so we don't require a space after the opening `=`s. The
|
||||||
return false;
|
// title is still trimmed of one optional space per side below.
|
||||||
}
|
|
||||||
|
|
||||||
// Trailing `=`s of the same level.
|
// Trailing `=`s of the same level.
|
||||||
let trimmed_end = line.trim_end_matches([' ', '\t']);
|
let trimmed_end = line.trim_end_matches([' ', '\t']);
|
||||||
|
|||||||
@@ -77,6 +77,27 @@ fn centered_heading_gets_centered_class() {
|
|||||||
assert!(out.contains("<h1 class=\"centered\" id=\"T\">T</h1>"));
|
assert!(out.contains("<h1 class=\"centered\" id=\"T\">T</h1>"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn spaceless_heading_renders_as_heading() {
|
||||||
|
// `==Heading==` (no surrounding spaces) is a heading, like vimwiki — not a
|
||||||
|
// literal `<p>==Heading==</p>`.
|
||||||
|
let out = render("==Plain==\n");
|
||||||
|
assert!(
|
||||||
|
out.contains(
|
||||||
|
"<div id=\"Plain\"><h2 id=\"Plain\" class=\"header\">\
|
||||||
|
<a href=\"#Plain\">Plain</a></h2></div>"
|
||||||
|
),
|
||||||
|
"got: {out}"
|
||||||
|
);
|
||||||
|
// The spaceless + keyword combo from the report: a header, not a badge.
|
||||||
|
let out2 = render("==TODO==\n");
|
||||||
|
assert!(
|
||||||
|
out2.contains("<h2 id=\"TODO\" class=\"header\">"),
|
||||||
|
"got: {out2}"
|
||||||
|
);
|
||||||
|
assert!(!out2.contains("<p>"), "not a paragraph: {out2}");
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn heading_keyword_renders_as_plain_text_not_badge() {
|
fn heading_keyword_renders_as_plain_text_not_badge() {
|
||||||
// `== TODO ==` is a section title, not an inline keyword: it must render as
|
// `== TODO ==` is a section title, not an inline keyword: it must render as
|
||||||
|
|||||||
@@ -85,6 +85,32 @@ fn centered_heading_is_marked_centered() {
|
|||||||
assert!(matches!(lexed[2], HeadingClose));
|
assert!(matches!(lexed[2], HeadingClose));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn spaceless_heading_is_a_heading() {
|
||||||
|
// vimwiki accepts `==Heading==` with no spaces around the text.
|
||||||
|
let lexed = lex("==Plain==\n");
|
||||||
|
assert_eq!(
|
||||||
|
lexed,
|
||||||
|
vec![
|
||||||
|
HeadingOpen {
|
||||||
|
level: 2,
|
||||||
|
centered: false
|
||||||
|
},
|
||||||
|
text("Plain"),
|
||||||
|
HeadingClose,
|
||||||
|
Newline,
|
||||||
|
]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn marker_only_or_unbalanced_lines_are_not_headings() {
|
||||||
|
// No title between markers, and trailing `=` not at line end → plain text.
|
||||||
|
assert!(!matches!(lex("======\n")[0], HeadingOpen { .. }));
|
||||||
|
assert!(!matches!(lex("==> arrow\n")[0], HeadingOpen { .. }));
|
||||||
|
assert!(!matches!(lex("==a==b\n")[0], HeadingOpen { .. }));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn heading_with_inline_bold() {
|
fn heading_with_inline_bold() {
|
||||||
let lexed = lex("== Hello *world* ==\n");
|
let lexed = lex("== Hello *world* ==\n");
|
||||||
|
|||||||
@@ -17,5 +17,5 @@ name = "nuwiki-ls"
|
|||||||
path = "src/main.rs"
|
path = "src/main.rs"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
nuwiki-lsp = { path = "../nuwiki-lsp", version = "0.4.1" }
|
nuwiki-lsp = { path = "../nuwiki-lsp", version = "0.5.0" }
|
||||||
tokio = { version = "1", features = ["macros", "rt-multi-thread", "io-std"] }
|
tokio = { version = "1", features = ["macros", "rt-multi-thread", "io-std"] }
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ homepage.workspace = true
|
|||||||
workspace = true
|
workspace = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
nuwiki-core = { path = "../nuwiki-core", version = "0.4.1" }
|
nuwiki-core = { path = "../nuwiki-core", version = "0.5.0" }
|
||||||
tower-lsp = "0.20"
|
tower-lsp = "0.20"
|
||||||
tokio = { version = "1", features = ["macros", "rt-multi-thread", "io-std", "sync", "fs"] }
|
tokio = { version = "1", features = ["macros", "rt-multi-thread", "io-std", "sync", "fs"] }
|
||||||
dashmap = "6"
|
dashmap = "6"
|
||||||
|
|||||||
Reference in New Issue
Block a user