ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more lsp tests / pass python a bool on parse (#6975)

Browse Source 
* updates

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* parse returns bool for python

Signed-off-by: Jess Frazelle <github@jessfraz.com>

---------

Signed-off-by: Jess Frazelle <github@jessfraz.com>
This commit is contained in:
Jess Frazelle
2025-05-15 11:04:53 -07:00
committed by GitHub
parent d34aea345b
commit d93a57d7bf
14 changed files with 89 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rust/Cargo.lock generated
View File

@ -1815,7 +1815,7 @@ dependencies = [
[[package]]
name = "kcl-bumper"
version = "0.1.71"
version = "0.1.72"
dependencies = [
"anyhow",
"clap",
@ -1826,7 +1826,7 @@ dependencies = [
[[package]]
name = "kcl-derive-docs"
version = "0.1.71"
version = "0.1.72"
dependencies = [
"Inflector",
"anyhow",
@ -1845,7 +1845,7 @@ dependencies = [
[[package]]
name = "kcl-directory-test-macro"
version = "0.1.71"
version = "0.1.72"
dependencies = [
"proc-macro2",
"quote",
@ -1854,7 +1854,7 @@ dependencies = [
[[package]]
name = "kcl-language-server"
version = "0.2.71"
version = "0.2.72"
dependencies = [
"anyhow",
"clap",
@ -1875,7 +1875,7 @@ dependencies = [
[[package]]
name = "kcl-language-server-release"
version = "0.1.71"
version = "0.1.72"
dependencies = [
"anyhow",
"clap",
@ -1895,7 +1895,7 @@ dependencies = [
[[package]]
name = "kcl-lib"
version = "0.2.71"
version = "0.2.72"
dependencies = [
"anyhow",
"approx 0.5.1",
@ -1971,7 +1971,7 @@ dependencies = [
[[package]]
name = "kcl-python-bindings"
version = "0.3.71"
version = "0.3.72"
dependencies = [
"anyhow",
"kcl-lib",
@ -1986,7 +1986,7 @@ dependencies = [
[[package]]
name = "kcl-test-server"
version = "0.1.71"
version = "0.1.72"
dependencies = [
"anyhow",
"hyper 0.14.32",
@ -1999,7 +1999,7 @@ dependencies = [
[[package]]
name = "kcl-to-core"
version = "0.1.71"
version = "0.1.72"
dependencies = [
"anyhow",
"async-trait",
@ -2013,7 +2013,7 @@ dependencies = [
[[package]]
name = "kcl-wasm-lib"
version = "0.1.71"
version = "0.1.72"
dependencies = [
"anyhow",
"bson",

2
rust/kcl-bumper/Cargo.toml
View File

@ -1,7 +1,7 @@
[package]
name = "kcl-bumper"
version = "0.1.71"
version = "0.1.72"
edition = "2021"
repository = "https://github.com/KittyCAD/modeling-api"
rust-version = "1.76"

2
rust/kcl-derive-docs/Cargo.toml
View File

@ -1,7 +1,7 @@
[package]
name = "kcl-derive-docs"
description = "A tool for generating documentation from Rust derive macros"
version = "0.1.71"
version = "0.1.72"
edition = "2021"
license = "MIT"
repository = "https://github.com/KittyCAD/modeling-app"

2
rust/kcl-directory-test-macro/Cargo.toml
View File

@ -1,7 +1,7 @@
[package]
name = "kcl-directory-test-macro"
description = "A tool for generating tests from a directory of kcl files"
version = "0.1.71"
version = "0.1.72"
edition = "2021"
license = "MIT"
repository = "https://github.com/KittyCAD/modeling-app"

2
rust/kcl-language-server-release/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "kcl-language-server-release"
version = "0.1.71"
version = "0.1.72"
edition = "2021"
authors = ["KittyCAD Inc <kcl@kittycad.io>"]
publish = false

2
rust/kcl-language-server/Cargo.toml
View File

@ -2,7 +2,7 @@
name = "kcl-language-server"
description = "A language server for KCL."
authors = ["KittyCAD Inc <kcl@kittycad.io>"]
version = "0.2.71"
version = "0.2.72"
edition = "2021"
license = "MIT"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

2
rust/kcl-lib/Cargo.toml
View File

@ -1,7 +1,7 @@
[package]
name = "kcl-lib"
description = "KittyCAD Language implementation and tools"
version = "0.2.71"
version = "0.2.72"
edition = "2021"
license = "MIT"
repository = "https://github.com/KittyCAD/modeling-app"

61
rust/kcl-lib/src/lsp/tests.rs
View File

@ -4316,3 +4316,64 @@ sketch001 = startSketchOn(XY)
}]
);
}
#[tokio::test(flavor = "multi_thread")]
async fn test_kcl_lsp_diagnostic_compilation_warnings() {
let server = kcl_lsp_server(false).await.unwrap();
// Send open file.
server
.did_open(tower_lsp::lsp_types::DidOpenTextDocumentParams {
text_document: tower_lsp::lsp_types::TextDocumentItem {
uri: "file:///test.kcl".try_into().unwrap(),
language_id: "kcl".to_string(),
version: 1,
text: r#"foo = 42
@settings(defaultLengthUnit = mm)"#
.to_string(),
},
})
.await;
// Send diagnostics request.
let diagnostics = server
.diagnostic(tower_lsp::lsp_types::DocumentDiagnosticParams {
text_document: tower_lsp::lsp_types::TextDocumentIdentifier {
uri: "file:///test.kcl".try_into().unwrap(),
},
partial_result_params: Default::default(),
work_done_progress_params: Default::default(),
identifier: None,
previous_result_id: None,
})
.await
.unwrap();
// Check the diagnostics.
if let tower_lsp::lsp_types::DocumentDiagnosticReportResult::Report(diagnostics) = diagnostics {
if let tower_lsp::lsp_types::DocumentDiagnosticReport::Full(diagnostics) = diagnostics {
assert_eq!(diagnostics.full_document_diagnostic_report.items.len(), 1);
assert_eq!(
diagnostics.full_document_diagnostic_report.items[0],
tower_lsp::lsp_types::Diagnostic {
range: tower_lsp::lsp_types::Range {
start: tower_lsp::lsp_types::Position { line: 0, character: 8 },
end: tower_lsp::lsp_types::Position { line: 1, character: 33 },
},
severity: Some(tower_lsp::lsp_types::DiagnosticSeverity::WARNING),
code: None,
source: Some("kcl".to_string()),
message: "Named attributes should appear before any declarations or expressions.\n\nBecause named attributes apply to the whole function or module, including code written before them, it can be confusing for readers to not have these attributes at the top of code blocks.".to_string(),
related_information: None,
tags: None,
data: None,
code_description: None,
}
);
} else {
panic!("Expected full diagnostics");
}
} else {
panic!("Expected diagnostics");
}
}

2
rust/kcl-python-bindings/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "kcl-python-bindings"
version = "0.3.71"
version = "0.3.72"
edition = "2021"
repository = "https://github.com/kittycad/modeling-app"
exclude = ["tests/*", "files/*", "venv/*"]

8
rust/kcl-python-bindings/src/lib.rs
View File

@ -229,7 +229,7 @@ async fn new_context_state(current_file: Option<std::path::PathBuf>) -> Result<(
/// Parse the kcl code from a file path.
#[pyfunction]
async fn parse(path: String) -> PyResult<()> {
async fn parse(path: String) -> PyResult<bool> {
tokio()
.spawn(async move {
let (code, path) = get_code_and_file_path(&path)
@ -238,7 +238,7 @@ async fn parse(path: String) -> PyResult<()> {
let _program = kcl_lib::Program::parse_no_errs(&code)
.map_err(|err| into_miette_for_parse(&path.display().to_string(), &code, err))?;
Ok(())
Ok(true)
})
.await
.map_err(|err| pyo3::exceptions::PyException::new_err(err.to_string()))?
@ -246,10 +246,10 @@ async fn parse(path: String) -> PyResult<()> {
/// Parse the kcl code.
#[pyfunction]
fn parse_code(code: String) -> PyResult<()> {
fn parse_code(code: String) -> PyResult<bool> {
let _program = kcl_lib::Program::parse_no_errs(&code).map_err(|err| into_miette_for_parse("", &code, err))?;
Ok(())
Ok(true)
}
/// Execute the kcl code from a file path.

6
rust/kcl-python-bindings/tests/tests.py
View File

@ -53,7 +53,8 @@ async def test_kcl_parse_with_exception():
@pytest.mark.asyncio
async def test_kcl_parse():
# Read from a file.
await kcl.parse(lego_file)
result = await kcl.parse(lego_file)
assert result is True
@pytest.mark.asyncio
@ -63,7 +64,8 @@ async def test_kcl_parse_code():
code = str(f.read())
assert code is not None
assert len(code) > 0
kcl.parse_code(code)
result = kcl.parse_code(code)
assert result is True
@pytest.mark.asyncio

2
rust/kcl-test-server/Cargo.toml
View File

@ -1,7 +1,7 @@
[package]
name = "kcl-test-server"
description = "A test server for KCL"
version = "0.1.71"
version = "0.1.72"
edition = "2021"
license = "MIT"

2
rust/kcl-to-core/Cargo.toml
View File

@ -1,7 +1,7 @@
[package]
name = "kcl-to-core"
description = "Utility methods to convert kcl to engine core executable tests"
version = "0.1.71"
version = "0.1.72"
edition = "2021"
license = "MIT"
repository = "https://github.com/KittyCAD/modeling-app"

2
rust/kcl-wasm-lib/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "kcl-wasm-lib"
version = "0.1.71"
version = "0.1.72"
edition = "2021"
repository = "https://github.com/KittyCAD/modeling-app"
rust-version = "1.83"