@tishlang/tish 2.2.3 → 2.2.5

package/crates/tish/Cargo.toml

@@ -1,11 +1,17 @@
 [package]
 name = "tishlang"
-version = "2.2.3"
+version = "2.2.5"
 edition = "2021"
 description = "Tish CLI - run, REPL, compile to native"
 license-file = { workspace = true }
 repository = { workspace = true }
 
+# tishlang_runtime has no direct source use here — it's required by the http/fs/process/
+# regex/ws/tty feature-forwards below (`tishlang_runtime/<feat>`). cargo-machete only scans
+# source, so it false-flags it; ignore it.
+[package.metadata.cargo-machete]
+ignored = ["tishlang_runtime"]
+
 [[bin]]
 name = "tish"
 path = "src/main.rs"
@@ -38,7 +44,6 @@ tty     = ["tishlang_eval/tty",     "tishlang_runtime/tty",     "tishlang_compil
 # GPU compute — Apple Silicon only
 [dependencies]
 rustyline = { version = "17", features = ["with-file-history"] }
-tishlang_lexer = { path = "../tish_lexer", version = ">=0.1" }
 tishlang_ast = { path = "../tish_ast", version = ">=0.1" }
 tishlang_parser = { path = "../tish_parser", version = ">=0.1" }
 tishlang_eval = { path = "../tish_eval", version = ">=0.1" }
@@ -49,7 +54,6 @@ tishlang_opt = { path = "../tish_opt", version = ">=0.1" }
 tishlang_vm = { path = "../tish_vm", version = ">=0.1" }
 tishlang_ffi = { path = "../tish_ffi", version = ">=0.1" }
 tishlang_native = { path = "../tish_native", version = ">=0.1" }
-tishlang_llvm = { path = "../tish_llvm", version = ">=0.1" }
 tishlang_wasm = { path = "../tish_wasm", version = ">=0.1" }
 tishlang_runtime = { path = "../tish_runtime", version = ">=0.1" }
 tishlang_core = { path = "../tish_core", version = ">=0.1" }

package/crates/tish_build_utils/Cargo.toml

@@ -5,7 +5,3 @@ edition = "2021"
 description = "Shared build utilities for Tish (workspace discovery, path resolution)"
 license-file = { workspace = true }
 repository = { workspace = true }
-
-[dependencies]
-# Bundled `protoc` for nested `cargo build` (Lance / prost-build) when none is on PATH.
-protoc-bin-vendored = "3"

package/crates/tish_build_utils/src/lib.rs

@@ -355,35 +355,6 @@ pub fn create_build_dir(prefix: &str, out_name: &str) -> Result<PathBuf, String>
     Ok(build_dir)
 }
 
-/// `PROTOC` for prost-build in transitive crates (e.g. lance-encoding) during nested `cargo build`.
-/// Respects an existing `PROTOC`, then `protoc` on `PATH`, then `protoc-bin-vendored`.
-fn protoc_for_nested_cargo() -> Option<PathBuf> {
-    // Empty or non-file PROTOC must not short-circuit: prost-build treats "" like a missing binary.
-    if let Some(v) = std::env::var_os("PROTOC") {
-        if !v.is_empty() {
-            let p = PathBuf::from(&v);
-            if p.is_file() {
-                return None;
-            }
-        }
-    }
-    // Prefer vendored protoc over PATH: a broken or non-executable `protoc` on PATH still passes `is_file()`.
-    if let Ok(p) = protoc_bin_vendored::protoc_bin_path() {
-        return Some(p);
-    }
-    let ext = if cfg!(windows) { ".exe" } else { "" };
-    let name = format!("protoc{}", ext);
-    if let Some(paths) = std::env::var_os("PATH") {
-        for dir in std::env::split_paths(&paths) {
-            let candidate = dir.join(&name);
-            if candidate.is_file() {
-                return Some(candidate);
-            }
-        }
-    }
-    None
-}
-
 /// Run cargo build in the given directory.
 /// If `cross_target` is Some, passes `--target` and skips `-C target-cpu=native`.
 pub fn run_cargo_build(
@@ -433,9 +404,6 @@ pub fn run_cargo_build(
     } else {
         cmd.env_remove("CARGO_INCREMENTAL");
     }
-    if let Some(protoc) = protoc_for_nested_cargo() {
-        cmd.env("PROTOC", protoc);
-    }
     let output = cmd
         .output()
         .map_err(|e| format!("Failed to run cargo: {}", e))?;
@@ -460,15 +428,6 @@ mod protoc_tests {
         assert_eq!(cargo_target_name("hello-ios"), "hello_ios");
         assert_eq!(cargo_target_name("tish_out"), "tish_out");
     }
-
-    #[test]
-    fn protoc_for_nested_cargo_without_env_uses_vendored_or_path() {
-        let _lock = std::sync::Mutex::new(());
-        let _guard = _lock.lock().unwrap();
-        std::env::remove_var("PROTOC");
-        let p = protoc_for_nested_cargo().expect("expected vendored or PATH protoc");
-        assert!(p.exists(), "resolved protoc should exist: {}", p.display());
-    }
 }
 
 /// Find the built static library in target/release (or target/$TRIPLE/release).

package/crates/tish_bytecode/Cargo.toml

@@ -11,7 +11,6 @@ tishlang_ast = { path = "../tish_ast", version = ">=0.1" }
 tishlang_core = { path = "../tish_core", version = ">=0.1" }
 
 [dev-dependencies]
-tishlang_compile = { path = "../tish_compile", version = ">=0.1" }
 tishlang_parser = { path = "../tish_parser", version = ">=0.1" }
 tishlang_opt = { path = "../tish_opt", version = ">=0.1" }
 tishlang_vm = { path = "../tish_vm", version = ">=0.1" }

package/crates/tish_cranelift/Cargo.toml

@@ -9,11 +9,7 @@ repository = { workspace = true }
 [dependencies]
 tishlang_build_utils = { path = "../tish_build_utils", version = ">=0.1" }
 cranelift = "0.130"
-cranelift-codegen = "0.130"
-cranelift-frontend = "0.130"
 cranelift-module = "0.130"
 cranelift-native = "0.130"
 cranelift-object = "0.130"
-target-lexicon = "0.13"
 tishlang_bytecode = { path = "../tish_bytecode", version = ">=0.1" }
-tishlang_core = { path = "../tish_core", version = ">=0.1" }

package/crates/tish_cranelift_runtime/Cargo.toml

@@ -23,4 +23,3 @@ crate-type = ["staticlib", "rlib"]
 [dependencies]
 tishlang_bytecode = { path = "../tish_bytecode", version = ">=0.1" }
 tishlang_vm = { path = "../tish_vm", version = ">=0.1" }
-tishlang_core = { path = "../tish_core", version = ">=0.1" }

package/crates/tish_eval/Cargo.toml

@@ -13,8 +13,6 @@ timers = []
 http = [
     "timers",
     "tokio",
-    "reqwest",
-    "futures",
     "tiny_http",
     "tishlang_core/regex",
     "dep:tishlang_runtime",
@@ -27,7 +25,7 @@ http = [
 fs = []
 process = []
 tty = ["dep:tishlang_runtime", "tishlang_runtime/tty"]
-regex = ["dep:fancy-regex", "tishlang_core/regex"]
+regex = ["tishlang_core/regex"]
 tokio = ["dep:tokio"]
 ws = ["dep:tishlang_runtime", "tishlang_runtime/ws"]
 
@@ -43,9 +41,6 @@ tishlang_ast = { path = "../tish_ast", version = ">=0.1" }
 tishlang_builtins = { path = "../tish_builtins", version = ">=0.1" }
 tishlang_parser = { path = "../tish_parser", version = ">=0.1" }
 tishlang_core = { path = "../tish_core", version = ">=0.1" }
-reqwest = { version = "0.13.2", default-features = false, features = ["rustls", "json", "stream"], optional = true }
-futures = { version = "0.3.32", optional = true }
 tiny_http = { version = "0.12.0", optional = true }
-fancy-regex = { version = "0.17.0", optional = true }
 tokio = { version = "1.50.0", features = ["rt-multi-thread", "time", "sync"], optional = true }
 tishlang_runtime = { path = "../tish_runtime", version = ">=0.1", optional = true }

package/crates/tish_lsp/src/main.rs

@@ -119,6 +119,15 @@ fn document_symbol(
     selection_range: Range,
     children: Option<Vec<DocumentSymbol>>,
 ) -> DocumentSymbol {
+    // LSP spec: selectionRange must be contained in range, or VS Code rejects the whole document
+    // outline ("selectionRange must be contained in fullRange"). Some declaration spans are
+    // unset/degenerate (e.g. a top-level VarDecl's span defaults to an empty range) and so do not
+    // enclose the name span; fall back to the name range to keep the invariant.
+    let contains = (range.start.line, range.start.character)
+        <= (selection_range.start.line, selection_range.start.character)
+        && (selection_range.end.line, selection_range.end.character)
+            <= (range.end.line, range.end.character);
+    let range = if contains { range } else { selection_range };
     DocumentSymbol {
         name,
         detail,
@@ -1671,6 +1680,50 @@ mod hover_tests {
         assert_eq!(full_doc_end(""), (0, 0));
         assert_eq!(full_doc_end("café"), (0, 4)); // UTF-16 units (é = 1), not bytes (5)
     }
+
+    #[test]
+    fn doc_symbols_satisfy_lsp_selection_containment() {
+        // LSP requires every DocumentSymbol's selectionRange ⊆ range, or VS Code rejects the
+        // whole outline ("selectionRange must be contained in fullRange"). Exercise the
+        // declaration forms the outline emits.
+        use tower_lsp::lsp_types::DocumentSymbol;
+        fn check(syms: &[DocumentSymbol], src: &str) {
+            for s in syms {
+                let (r, sel) = (&s.range, &s.selection_range);
+                let contained = (r.start.line, r.start.character)
+                    <= (sel.start.line, sel.start.character)
+                    && (sel.end.line, sel.end.character) <= (r.end.line, r.end.character);
+                assert!(
+                    contained,
+                    "selectionRange {sel:?} not contained in range {r:?} for `{}` in:\n{src}",
+                    s.name
+                );
+                if let Some(children) = &s.children {
+                    check(children, src);
+                }
+            }
+        }
+        let sources = [
+            "fn f(x) { return x }\n",
+            "let a = 1\n",
+            "let a = 1, b = 2\n",
+            "export fn g() { return 1 }\n",
+            "export let x = 1\n",
+            "type T = number\n",
+            "declare fn h(): void\n",
+            "declare let y: number\n",
+            "fn outer() {\n  fn inner() { return 1 }\n  return inner\n}\n",
+            "export type Opts = { a: number }\n",
+        ];
+        for src in sources {
+            let p = parse(src);
+            let mut syms = Vec::new();
+            for s in &p.statements {
+                doc_symbol_stmt(s, src, &mut syms);
+            }
+            check(&syms, src);
+        }
+    }
 }
 
 #[cfg(test)]

package/crates/tish_runtime/Cargo.toml

@@ -47,8 +47,6 @@ http-hyper = [
     "dep:hyper",
     "dep:hyper-util",
     "dep:http-body-util",
-    "dep:http",
-    "dep:pin-project-lite",
     "dep:core_affinity",
     "tokio/net",
     "tokio/rt",
@@ -92,8 +90,6 @@ crossterm = { version = "0.28", optional = true }
 hyper = { version = "1", default-features = false, features = ["server", "http1", "http2"], optional = true }
 hyper-util = { version = "0.1", features = ["server", "tokio"], optional = true }
 http-body-util = { version = "0.1", optional = true }
-http = { version = "1", optional = true }
-pin-project-lite = { version = "0.2", optional = true }
 core_affinity = { version = "0.8", optional = true }
 tokio-tungstenite = { version = "0.29", optional = true }
 futures-util = { version = "0.3", optional = true }

package/crates/tishlang_cargo_bindgen/Cargo.toml

@@ -6,6 +6,11 @@ description = "Generate Rust glue for Tish cargo: imports (bindgen-style, pre-co
 license-file = { workspace = true }
 repository = { workspace = true }
 
+# proc-macro2 is enabled for its `span-locations` feature, not used by name (Span comes
+# via syn). cargo-machete can't see feature-only deps, so it's ignored here.
+[package.metadata.cargo-machete]
+ignored = ["proc-macro2"]
+
 [[bin]]
 name = "tishlang-cargo-bindgen"
 path = "src/main.rs"
@@ -18,6 +23,8 @@ path = "src/lib.rs"
 cargo_metadata = "0.19"
 clap = { version = "4.6", features = ["derive", "color"] }
 pathdiff = "0.2"
+# Not referenced by name (Span comes via syn's re-export), but the `span-locations`
+# feature is load-bearing: it enables Span::start()/end() used in src/lib.rs.
 proc-macro2 = { version = "1.0", features = ["span-locations"] }
 serde_json = "1"
 syn = { version = "2.0", features = ["full", "extra-traits"] }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tishlang/tish",
-  "version": "2.2.3",
+  "version": "2.2.5",
   "description": "Tish - minimal TS/JS-compatible language. Run, REPL, build to native or other targets.",
   "license": "PIF",
   "repository": {