mirror of
https://github.com/typst/typst
synced 2025-08-18 00:48:34 +08:00
Compare commits
9 Commits
8409e9f9f4
...
69f4cc90c5
Author | SHA1 | Date | |
---|---|---|---|
|
69f4cc90c5 | ||
|
0264534928 | ||
|
01f73c35ed | ||
|
fb0b01d45c | ||
|
801b689dae | ||
|
d799a4207b | ||
|
72c219d24a | ||
|
ea3ca30a65 | ||
|
a517a08d2f |
@ -7,6 +7,7 @@ use typst_library::foundations::{
|
|||||||
};
|
};
|
||||||
use typst_library::introspection::{Counter, State};
|
use typst_library::introspection::{Counter, State};
|
||||||
use typst_syntax::ast::{self, AstNode};
|
use typst_syntax::ast::{self, AstNode};
|
||||||
|
use typst_syntax::Span;
|
||||||
use typst_utils::singleton;
|
use typst_utils::singleton;
|
||||||
|
|
||||||
use crate::{CapturesVisitor, Eval, FlowEvent, Vm};
|
use crate::{CapturesVisitor, Eval, FlowEvent, Vm};
|
||||||
@ -284,8 +285,19 @@ impl Eval for ast::CodeBlock<'_> {
|
|||||||
type Output = Value;
|
type Output = Value;
|
||||||
|
|
||||||
fn eval(self, vm: &mut Vm) -> SourceResult<Self::Output> {
|
fn eval(self, vm: &mut Vm) -> SourceResult<Self::Output> {
|
||||||
|
let body = self.body();
|
||||||
|
match body.exprs().next_back() {
|
||||||
|
Some(expr @ ast::Expr::ShowRule(_)) => {
|
||||||
|
warn_for_useless_rule(&mut vm.engine, expr.span(), "show")
|
||||||
|
}
|
||||||
|
Some(expr @ ast::Expr::SetRule(_)) => {
|
||||||
|
warn_for_useless_rule(&mut vm.engine, expr.span(), "set")
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
|
||||||
vm.scopes.enter();
|
vm.scopes.enter();
|
||||||
let output = self.body().eval(vm)?;
|
let output = body.eval(vm)?;
|
||||||
vm.scopes.exit();
|
vm.scopes.exit();
|
||||||
Ok(output)
|
Ok(output)
|
||||||
}
|
}
|
||||||
@ -393,3 +405,12 @@ fn warn_for_discarded_content(engine: &mut Engine, event: &FlowEvent, joined: &V
|
|||||||
|
|
||||||
engine.sink.warn(warning);
|
engine.sink.warn(warning);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Emits a warning when a set or show rule has no effect.
|
||||||
|
fn warn_for_useless_rule(engine: &mut Engine, span: Span, kind: &str) {
|
||||||
|
engine.sink.warn(warning!(
|
||||||
|
span,
|
||||||
|
"{kind} rule has no effect";
|
||||||
|
hint: "a {kind} rule is only in effect until the end of the surrounding code block"
|
||||||
|
));
|
||||||
|
}
|
||||||
|
@ -130,7 +130,14 @@ fn complete_markup(ctx: &mut CompletionContext) -> bool {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start of a reference: "@|" or "@he|".
|
// Start of a reference: "@|".
|
||||||
|
if ctx.leaf.kind() == SyntaxKind::Text && ctx.before.ends_with("@") {
|
||||||
|
ctx.from = ctx.cursor;
|
||||||
|
ctx.label_completions();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// An existing reference: "@he|".
|
||||||
if ctx.leaf.kind() == SyntaxKind::RefMarker {
|
if ctx.leaf.kind() == SyntaxKind::RefMarker {
|
||||||
ctx.from = ctx.leaf.offset() + 1;
|
ctx.from = ctx.leaf.offset() + 1;
|
||||||
ctx.label_completions();
|
ctx.label_completions();
|
||||||
@ -1644,6 +1651,19 @@ mod tests {
|
|||||||
test_with_doc(world, pos, doc.as_ref())
|
test_with_doc(world, pos, doc.as_ref())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[track_caller]
|
||||||
|
fn test_with_addition(
|
||||||
|
initial_text: &str,
|
||||||
|
addition: &str,
|
||||||
|
pos: impl FilePos,
|
||||||
|
) -> Response {
|
||||||
|
let mut world = TestWorld::new(initial_text);
|
||||||
|
let doc = typst::compile(&world).output.ok();
|
||||||
|
let end = world.main.text().len();
|
||||||
|
world.main.edit(end..end, addition);
|
||||||
|
test_with_doc(&world, pos, doc.as_ref())
|
||||||
|
}
|
||||||
|
|
||||||
#[track_caller]
|
#[track_caller]
|
||||||
fn test_with_doc(
|
fn test_with_doc(
|
||||||
world: impl WorldLike,
|
world: impl WorldLike,
|
||||||
@ -1709,15 +1729,24 @@ mod tests {
|
|||||||
.must_exclude(["bib"]);
|
.must_exclude(["bib"]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_autocomplete_ref_function() {
|
||||||
|
test_with_addition("x<test>", " #ref(<)", -2).must_include(["test"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_autocomplete_ref_shorthand() {
|
||||||
|
test_with_addition("x<test>", " @", -1).must_include(["test"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_autocomplete_ref_shorthand_with_partial_identifier() {
|
||||||
|
test_with_addition("x<test>", " @te", -1).must_include(["test"]);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_autocomplete_ref_identical_labels_returns_single_completion() {
|
fn test_autocomplete_ref_identical_labels_returns_single_completion() {
|
||||||
let mut world = TestWorld::new("x<test> y<test>");
|
let result = test_with_addition("x<test> y<test>", " @t", -1);
|
||||||
let doc = typst::compile(&world).output.ok();
|
|
||||||
|
|
||||||
let end = world.main.text().len();
|
|
||||||
world.main.edit(end..end, " @t");
|
|
||||||
|
|
||||||
let result = test_with_doc(&world, -1, doc.as_ref());
|
|
||||||
let completions = result.completions();
|
let completions = result.completions();
|
||||||
let label_count =
|
let label_count =
|
||||||
completions.iter().filter(|c| c.kind == CompletionKind::Label).count();
|
completions.iter().filter(|c| c.kind == CompletionKind::Label).count();
|
||||||
|
@ -48,4 +48,5 @@
|
|||||||
let n = query(<a>).len()
|
let n = query(<a>).len()
|
||||||
let fonts = ("nope", "Roboto")
|
let fonts = ("nope", "Roboto")
|
||||||
set text(font: fonts.at(n))
|
set text(font: fonts.at(n))
|
||||||
|
[]
|
||||||
}
|
}
|
||||||
|
@ -51,4 +51,5 @@ Hello
|
|||||||
#context {
|
#context {
|
||||||
set document(author: "Changed") if "Normal" in document.author
|
set document(author: "Changed") if "Normal" in document.author
|
||||||
set document(title: "Changed") if document.title == "Normal"
|
set document(title: "Changed") if document.title == "Normal"
|
||||||
|
[]
|
||||||
}
|
}
|
||||||
|
12
tests/suite/styling/in-block.typ
Normal file
12
tests/suite/styling/in-block.typ
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
--- warn-show-set-last-in-block ---
|
||||||
|
#{
|
||||||
|
// Warning: 3-16 show rule has no effect
|
||||||
|
// Hint: 3-16 a show rule is only in effect until the end of the surrounding code block
|
||||||
|
show "a": "b"
|
||||||
|
}
|
||||||
|
|
||||||
|
#{
|
||||||
|
// Warning: 3-17 set rule has no effect
|
||||||
|
// Hint: 3-17 a set rule is only in effect until the end of the surrounding code block
|
||||||
|
set text(blue)
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user