@tishlang/tish 2.2.5 → 2.8.0

package/crates/tish_fmt/src/lib.rs

@@ -248,7 +248,7 @@ impl Printer {
 
     fn object_prop(&mut self, pr: &ObjectProp) {
         match pr {
-            ObjectProp::KeyValue(k, v) => {
+            ObjectProp::KeyValue(k, v, _) => {
                 self.buf.push_str(k.as_ref());
                 self.buf.push_str(": ");
                 self.expr(v);
@@ -1046,7 +1046,7 @@ impl Printer {
 
     fn type_ann(&mut self, t: &TypeAnnotation) {
         match t {
-            TypeAnnotation::Simple(s) => self.buf.push_str(s.as_ref()),
+            TypeAnnotation::Simple(s, _) => self.buf.push_str(s.as_ref()),
             TypeAnnotation::Array(inner) => {
                 self.type_ann(inner);
                 self.buf.push_str("[]");
@@ -2235,4 +2235,48 @@ let x = add(1, 2)
         tishlang_parser::parse(&out).unwrap();
         assert_eq!(format_source(&out).unwrap(), out, "not idempotent:\n{out}");
     }
+
+    /// Broad idempotence guard (#163): the existing tests targeted specific constructs (JSX, new-
+    /// expr) that *had* regressed, leaving structural blind spots. This sweeps a diverse corpus and
+    /// asserts, for every snippet, that (a) the formatted output re-parses and (b) re-formatting is
+    /// a fixed point — so any future construct that formats non-idempotently is caught here.
+    #[test]
+    fn format_is_idempotent_over_a_corpus() {
+        let corpus = [
+            "let a = { x: 1, y: { z: [1, 2, 3] } }\n",
+            "let f = (a, b) => a + b\n",
+            "let g = (x) => { return x * 2 }\n",
+            "const e = <div class=\"x\">{a}<span>b</span></div>\n",
+            "let frag = <><a>1</a><b>2</b></>\n",
+            "let n = new Foo(1).bar().baz\n",
+            "let n2 = new (getCtor())(arg)\n",
+            "let t = `a${b}c${d}e`\n",
+            "let lit = \"has a literal $ and a ${notInterp}\"\n",
+            "if (x) { return 1 } else if (y) { return 2 } else { return 3 }\n",
+            "for (let i = 0; i < n; i = i + 1) { f(i) }\n",
+            "for (const k of items) { use(k) }\n",
+            "while (cond) { step() }\n",
+            "do { once() } while (again)\n",
+            "switch (x) { case 1: f(); break; default: g() }\n",
+            "let u: number | string = 1\n",
+            "type T = { a: number, b: string[] }\n",
+            "export fn h(x: T): T { return x }\n",
+            "let v = a ? b : c\n",
+            "let w = a ?? b\n",
+            "let arr = [{ k: 1 }, { k: 2 }, ...rest]\n",
+            "let obj = { ...base, x: 1, y: 2 }\n",
+            "let chain = a?.b?.c\n",
+            "let big = 1e400\n",
+            "try { risky() } catch (e) { handle(e) } finally { cleanup() }\n",
+            "async fn af() { return await thing() }\n",
+            "import { a, b as c } from \"./m\"\nexport default a\n",
+        ];
+        for src in corpus {
+            let once = format_source(src).expect("format");
+            tishlang_parser::parse(&once)
+                .unwrap_or_else(|e| panic!("formatted output must re-parse for {src:?}: {e}\n{once}"));
+            let twice = format_source(&once).expect("re-format");
+            assert_eq!(once, twice, "non-idempotent for {src:?}:\n{once:?}\n  ->\n{twice:?}");
+        }
+    }
 }

package/crates/tish_lint/src/bin/tish-lint.rs

@@ -20,6 +20,11 @@ struct Cli {
     #[arg(long = "format", value_enum, default_value_t = OutputFormat::Text)]
     output_format: OutputFormat,
 
+    /// Exit non-zero if any WARNING is found (not just errors), so CI can gate on lint findings.
+    /// Without it, lint warnings print but the process exits 0 (only parse errors fail). (#154)
+    #[arg(long = "deny-warnings")]
+    deny_warnings: bool,
+
     #[arg(required = true)]
     paths: Vec<String>,
 }
@@ -36,7 +41,7 @@ struct Issue {
 
 fn main() {
     let cli = Cli::parse();
-    if let Err(e) = run(&cli.paths, cli.output_format) {
+    if let Err(e) = run(&cli.paths, cli.output_format, cli.deny_warnings) {
         eprintln!("{}", e);
         std::process::exit(1);
     }
@@ -67,7 +72,7 @@ fn collect_files(paths: &[String]) -> Result<Vec<PathBuf>, String> {
     Ok(files)
 }
 
-fn run(paths: &[String], format: OutputFormat) -> Result<(), String> {
+fn run(paths: &[String], format: OutputFormat, deny_warnings: bool) -> Result<(), String> {
     let files = collect_files(paths)?;
     let mut issues: Vec<Issue> = Vec::new();
     for f in files {
@@ -103,6 +108,13 @@ fn run(paths: &[String], format: OutputFormat) -> Result<(), String> {
     }
 
     let error_count = issues.iter().filter(|i| i.level == "error").count();
+    let warning_count = issues.iter().filter(|i| i.level == "warning").count();
+    // Always fail on errors (parse errors); with --deny-warnings, lint warnings fail too.
+    let fail_count = if deny_warnings {
+        error_count + warning_count
+    } else {
+        error_count
+    };
 
     match format {
         OutputFormat::Text => {
@@ -117,18 +129,15 @@ fn run(paths: &[String], format: OutputFormat) -> Result<(), String> {
                     i.message
                 );
             }
-            if error_count > 0 {
-                return Err(format!("{} issue(s)", error_count));
-            }
         }
         OutputFormat::Sarif => {
             print_sarif(&issues)?;
-            if error_count > 0 {
-                return Err(format!("{} issue(s)", error_count));
-            }
         }
     }
 
+    if fail_count > 0 {
+        return Err(format!("{} issue(s)", fail_count));
+    }
     Ok(())
 }
 

package/crates/tish_lint/src/lib.rs

@@ -24,12 +24,47 @@ pub struct LintDiagnostic {
 /// Run all default rules on parsed program.
 pub fn lint_program(program: &Program) -> Vec<LintDiagnostic> {
     let mut out = Vec::new();
+    check_unreachable(&program.statements, &mut out);
     for s in &program.statements {
         lint_stmt(s, &mut out);
     }
     out
 }
 
+/// `tish-unreachable-code` (no-unreachable): in a statement sequence, the first statement after an
+/// unconditional `return`/`throw`/`break`/`continue` sibling can never run. Flags only that first
+/// statement (not the whole tail — less noise) and skips hoisted `fn` declarations, which are valid
+/// after a terminator. Only a DIRECT-sibling terminator triggers it, so a conditional
+/// `if (c) return` followed by more statements is correctly NOT flagged.
+fn check_unreachable(stmts: &[Statement], out: &mut Vec<LintDiagnostic>) {
+    let mut terminated = false;
+    for st in stmts {
+        if terminated {
+            if matches!(st, Statement::FunDecl { .. }) {
+                continue; // function declarations hoist — reachable regardless of position
+            }
+            let (line, col) = stmt_span(st);
+            out.push(LintDiagnostic {
+                code: "tish-unreachable-code",
+                message: "Unreachable code after return/throw/break/continue.".into(),
+                line,
+                col,
+                severity: Severity::Warning,
+            });
+            return;
+        }
+        if matches!(
+            st,
+            Statement::Return { .. }
+                | Statement::Throw { .. }
+                | Statement::Break { .. }
+                | Statement::Continue { .. }
+        ) {
+            terminated = true;
+        }
+    }
+}
+
 /// Lint source: parse then lint. Parse errors are not reported here.
 pub fn lint_source(source: &str) -> Result<Vec<LintDiagnostic>, String> {
     let program = tishlang_parser::parse(source)?;
@@ -63,51 +98,86 @@ fn lint_stmt(s: &Statement, out: &mut Vec<LintDiagnostic>) {
                 lint_stmt(fb, out);
             }
         }
-        Statement::Block { statements, .. } => {
+        // Block and the transparent comma-declarator group (#141: Multi was previously skipped).
+        Statement::Block { statements, .. } | Statement::Multi { statements, .. } => {
+            check_unreachable(statements, out);
             for st in statements {
                 lint_stmt(st, out);
             }
         }
+        // #140: control-flow CONDITION expressions are linted too, not just bodies.
         Statement::If {
+            cond,
             then_branch,
             else_branch,
             ..
         } => {
+            lint_expr(cond, out);
             lint_stmt(then_branch, out);
             if let Some(e) = else_branch {
                 lint_stmt(e, out);
             }
         }
-        Statement::While { body, .. } | Statement::ForOf { body, .. } => lint_stmt(body, out),
-        Statement::For { init, body, .. } => {
+        Statement::While { cond, body, .. } => {
+            lint_expr(cond, out);
+            lint_stmt(body, out);
+        }
+        Statement::ForOf { iterable, body, .. } => {
+            lint_expr(iterable, out);
+            lint_stmt(body, out);
+        }
+        Statement::For {
+            init,
+            cond,
+            update,
+            body,
+            ..
+        } => {
             if let Some(i) = init {
                 lint_stmt(i, out);
             }
+            if let Some(c) = cond {
+                lint_expr(c, out);
+            }
+            if let Some(u) = update {
+                lint_expr(u, out);
+            }
             lint_stmt(body, out);
         }
         Statement::FunDecl { body, .. } => lint_stmt(body, out),
         Statement::Switch {
+            expr,
             cases,
             default_body,
             ..
         } => {
-            for (_, stmts) in cases {
+            lint_expr(expr, out);
+            for (case_expr, stmts) in cases {
+                if let Some(ce) = case_expr {
+                    lint_expr(ce, out);
+                }
+                check_unreachable(stmts, out);
                 for st in stmts {
                     lint_stmt(st, out);
                 }
             }
             if let Some(def) = default_body {
+                check_unreachable(def, out);
                 for st in def {
                     lint_stmt(st, out);
                 }
             }
         }
-        Statement::DoWhile { body, .. } => lint_stmt(body, out),
-        Statement::Export { declaration, .. } => {
-            if let tishlang_ast::ExportDeclaration::Named(inner) = declaration.as_ref() {
-                lint_stmt(inner, out);
-            }
+        Statement::DoWhile { body, cond, .. } => {
+            lint_stmt(body, out);
+            lint_expr(cond, out);
         }
+        Statement::Export { declaration, .. } => match declaration.as_ref() {
+            tishlang_ast::ExportDeclaration::Named(inner) => lint_stmt(inner, out),
+            // Walk `export default <expr>` too — its subtree was previously never linted, so e.g.
+            // `export default { a: 1, a: 2 }` produced no tish-duplicate-key warning (#151).
+            tishlang_ast::ExportDeclaration::Default(expr) => lint_expr(expr, out),
+        },
         Statement::ExprStmt { expr, .. } => lint_expr(expr, out),
         Statement::VarDecl { init: Some(e), .. } => lint_expr(e, out),
         Statement::VarDeclDestructure { init, .. } => lint_expr(init, out),
@@ -126,29 +196,26 @@ fn is_empty_block_or_stmt(s: &Statement) -> bool {
 }
 
 fn stmt_span(s: &Statement) -> (u32, u32) {
-    let sp = match s {
-        Statement::Block { span, .. } => *span,
-        Statement::Try { span, .. } => *span,
-        _ => tishlang_ast::Span {
-            start: (1, 1),
-            end: (1, 1),
-        },
-    };
+    // Use the AST's uniform accessor so every statement kind reports its real position (the old
+    // local match only handled Block/Try and defaulted everything else to (1,1)).
+    let sp = s.span();
     (sp.start.0 as u32, sp.start.1 as u32)
 }
 
 fn lint_expr(e: &Expr, out: &mut Vec<LintDiagnostic>) {
     match e {
-        Expr::Object { props, span, .. } => {
+        Expr::Object { props, .. } => {
             let mut seen: HashSet<&str> = HashSet::new();
             for p in props {
-                if let ObjectProp::KeyValue(k, v) = p {
+                if let ObjectProp::KeyValue(k, v, kspan) = p {
                     if !seen.insert(k.as_ref()) {
+                        // Point at the duplicated KEY, not the enclosing `{` — so distinct dupes get
+                        // distinct positions (#143).
                         out.push(LintDiagnostic {
                             code: "tish-duplicate-key",
                             message: format!("Duplicate object key `{}`", k),
-                            line: span.start.0 as u32,
-                            col: span.start.1 as u32,
+                            line: kspan.start.0 as u32,
+                            col: kspan.start.1 as u32,
                             severity: Severity::Warning,
                         });
                     }
@@ -238,6 +305,8 @@ fn lint_expr(e: &Expr, out: &mut Vec<LintDiagnostic>) {
         }
         Expr::Await { operand, .. } => lint_expr(operand, out),
         Expr::TypeOf { operand, .. } => lint_expr(operand, out),
+        // #142: descend into a delete target (`delete obj[expr]` / `delete (expr).prop`).
+        Expr::Delete { target, .. } => lint_expr(target, out),
         Expr::JsxElement {
             props, children, ..
         } => {
@@ -279,3 +348,110 @@ pub const RULES: &[(&str, &str)] = &[
         "Warns when an object literal repeats the same key.",
     ),
 ];
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// Count `tish-duplicate-key` diagnostics the linter emits for `src` — a probe for whether the
+    /// linter actually descends into a given position (the dup-key rule fires on any object literal
+    /// the walk reaches).
+    fn dup_keys(src: &str) -> usize {
+        lint_source(src)
+            .expect("parse")
+            .iter()
+            .filter(|d| d.code == "tish-duplicate-key")
+            .count()
+    }
+
+    #[test]
+    fn baseline_dup_key_in_plain_var_is_linted() {
+        assert_eq!(dup_keys("let x = { a: 1, a: 2 }\n"), 1);
+    }
+
+    // #141: comma-separated declarators lower to Statement::Multi, which the linter skipped.
+    #[test]
+    fn lints_inside_comma_declarators() {
+        assert!(
+            dup_keys("let x = { a: 1, a: 2 }, y = 3\n") >= 1,
+            "dup key in a comma-declarator (Statement::Multi) must be linted"
+        );
+    }
+
+    // #140: control-flow CONDITION expressions were never linted (only bodies were walked).
+    #[test]
+    fn lints_inside_control_flow_conditions() {
+        assert!(dup_keys("if ({ a: 1, a: 2 }) {}\n") >= 1, "if condition");
+        assert!(dup_keys("while ({ a: 1, a: 2 }) { break }\n") >= 1, "while condition");
+        assert!(
+            dup_keys("for (let i = 0; ({ a: 1, a: 2 }); i = i + 1) { break }\n") >= 1,
+            "for condition"
+        );
+        assert!(dup_keys("do { break } while ({ a: 1, a: 2 })\n") >= 1, "do-while condition");
+        assert!(
+            dup_keys("switch ({ a: 1, a: 2 }) { case 1: break }\n") >= 1,
+            "switch discriminant"
+        );
+    }
+
+    // #142: the linter never descended into a delete target.
+    #[test]
+    fn lints_inside_delete_target() {
+        assert!(dup_keys("delete ({ a: 1, a: 2 }).a\n") >= 1, "delete target");
+    }
+
+    // #151: the `export default <expr>` subtree was never walked (only `export <named>` was).
+    #[test]
+    fn lints_inside_export_default() {
+        assert!(
+            dup_keys("export default { a: 1, a: 2 }\n") >= 1,
+            "dup key inside `export default` must be linted"
+        );
+    }
+
+    // #152: no-unreachable.
+    fn unreachable(src: &str) -> usize {
+        lint_source(src)
+            .expect("parse")
+            .iter()
+            .filter(|d| d.code == "tish-unreachable-code")
+            .count()
+    }
+
+    #[test]
+    fn flags_code_after_terminator() {
+        assert_eq!(unreachable("fn f() {\n  return 1\n  let x = 2\n}\n"), 1, "after return");
+        assert_eq!(unreachable("fn g() {\n  throw 1\n  g()\n}\n"), 1, "after throw");
+        assert_eq!(
+            unreachable("fn h() {\n  while (true) {\n    break\n    h()\n  }\n}\n"),
+            1,
+            "after break in loop body"
+        );
+    }
+
+    #[test]
+    fn does_not_flag_reachable_or_hoisted() {
+        // Conditional return is NOT a direct-sibling terminator → following code is reachable.
+        assert_eq!(unreachable("fn f(c) {\n  if (c) { return 1 }\n  let x = 2\n}\n"), 0, "conditional");
+        // Function declarations hoist — valid after a return.
+        assert_eq!(unreachable("fn g() {\n  return 1\n  fn helper() { return 2 }\n}\n"), 0, "hoisted fn");
+        // Switch fall-through (no terminator) is intentional.
+        assert_eq!(unreachable("switch (x) {\n  case 1:\n    a()\n  case 2:\n    b()\n}\n"), 0, "fallthrough");
+    }
+}
+
+#[cfg(test)]
+mod dupkey_position_tests {
+    use super::*;
+    #[test]
+    fn dup_key_points_at_the_duplicated_key() {
+        // `let x = { a: 1, a: 2 }` — the duplicate `a` is at 1-indexed col 17; the object `{` is col 9.
+        let d: Vec<_> = lint_source("let x = { a: 1, a: 2 }\n")
+            .expect("parse")
+            .into_iter()
+            .filter(|d| d.code == "tish-duplicate-key")
+            .collect();
+        assert_eq!(d.len(), 1, "exactly one dup-key");
+        assert_eq!((d[0].line, d[0].col), (1, 17), "#143: must point at the duplicated key, not the `{{`");
+    }
+}

package/crates/tish_lsp/Cargo.toml

@@ -19,7 +19,13 @@ tishlang_fmt = { path = "../tish_fmt", version = ">=0.1" }
 tishlang_lint = { path = "../tish_lint", version = ">=0.1" }
 tishlang_resolve = { path = "../tish_resolve", version = ">=0.1" }
 tower-lsp = "0.20"
-tokio = { version = "1", features = ["rt-multi-thread", "macros", "io-std"] }
+tokio = { version = "1", features = ["rt-multi-thread", "macros", "io-std", "time"] }
 serde_json = "1"
 regex = "1"
 walkdir = "2"
+
+[dev-dependencies]
+# Drive `LspService` over JSON-RPC in tests (#163). Must match the `tower` major that tower-lsp 0.20
+# implements `Service` against (0.4), or the trait bound on `.call()` won't be satisfied. `util`
+# brings in `ServiceExt::ready`.
+tower = { version = "0.4", features = ["util"] }

package/crates/tish_lsp/src/import_goto.rs

@@ -314,6 +314,7 @@ pub fn native_member_definition(
     lsp_line: u32,
     lsp_character: u32,
     word: &str,
+    open_docs: &HashMap<Url, String>,
 ) -> Option<NativeMemberDefinition> {
     let project_root = infer_project_root(file_path, roots)?;
     let from_dir = file_path.parent()?;
@@ -357,7 +358,8 @@ pub fn native_member_definition(
 
             if from_s.starts_with("./") || from_s.starts_with("../") {
                 if members.len() == 1 {
-                    let loc = resolve_relative_tish(from_dir, from_s, members[0].as_ref())?;
+                    let loc =
+                        resolve_relative_tish(from_dir, from_s, members[0].as_ref(), open_docs)?;
                     return Some(NativeMemberDefinition {
                         location: loc,
                         doc: None,
@@ -422,6 +424,7 @@ pub fn definition_for_native_receiver_member(
     lsp_line: u32,
     lsp_character: u32,
     word: &str,
+    open_docs: &HashMap<Url, String>,
 ) -> Option<Location> {
     native_member_definition(
         program,
@@ -432,11 +435,28 @@ pub fn definition_for_native_receiver_member(
         lsp_line,
         lsp_character,
         word,
+        open_docs,
     )
     .map(|d| d.location)
 }
 
-fn resolve_relative_tish(from_dir: &Path, from_s: &str, imported: &str) -> Option<Location> {
+/// Source text of a target module: the live editor buffer if the file is open with unsaved edits,
+/// otherwise the on-disk contents. Reading the open buffer keeps cross-file goto-definition/hover in
+/// sync with what the user sees — disk would give a stale line/column (or miss a not-yet-saved
+/// export entirely). #148
+fn module_source(can: &Path, u: &Url, open_docs: &HashMap<Url, String>) -> Option<String> {
+    match open_docs.get(u) {
+        Some(buf) => Some(buf.clone()),
+        None => std::fs::read_to_string(can).ok(),
+    }
+}
+
+fn resolve_relative_tish(
+    from_dir: &Path,
+    from_s: &str,
+    imported: &str,
+    open_docs: &HashMap<Url, String>,
+) -> Option<Location> {
     let target = from_dir.join(from_s.trim_start_matches("./"));
     let target = if target.extension().is_none() {
         target.with_extension("tish")
@@ -445,13 +465,17 @@ fn resolve_relative_tish(from_dir: &Path, from_s: &str, imported: &str) -> Optio
     };
     let can = target.canonicalize().ok()?;
     let u = Url::from_file_path(&can).ok()?;
-    let src = std::fs::read_to_string(&can).ok()?;
+    let src = module_source(&can, &u, open_docs)?;
     let prog = tishlang_parser::parse(&src).ok()?;
     crate::find_export(&prog, imported, &u, &src)
 }
 
 /// Resolve a relative default import (`import X from "./m"`) to the `export default` in the source.
-fn resolve_relative_tish_default(from_dir: &Path, from_s: &str) -> Option<Location> {
+fn resolve_relative_tish_default(
+    from_dir: &Path,
+    from_s: &str,
+    open_docs: &HashMap<Url, String>,
+) -> Option<Location> {
     let target = from_dir.join(from_s.trim_start_matches("./"));
     let target = if target.extension().is_none() {
         target.with_extension("tish")
@@ -460,7 +484,7 @@ fn resolve_relative_tish_default(from_dir: &Path, from_s: &str) -> Option<Locati
     };
     let can = target.canonicalize().ok()?;
     let u = Url::from_file_path(&can).ok()?;
-    let src = std::fs::read_to_string(&can).ok()?;
+    let src = module_source(&can, &u, open_docs)?;
     let prog = tishlang_parser::parse(&src).ok()?;
     crate::find_default_export(&prog, &u, &src)
 }
@@ -473,6 +497,7 @@ pub fn definition_for_import(
     word: &str,
     roots: &[PathBuf],
     cargo_src_cache: &RwLock<HashMap<(PathBuf, String), PathBuf>>,
+    open_docs: &HashMap<Url, String>,
 ) -> Option<Location> {
     if word.is_empty() {
         return None;
@@ -506,9 +531,9 @@ pub fn definition_for_import(
                 // A default import binds the source module's `export default`, which has no name to
                 // match; resolve it directly. Named imports resolve by exported name.
                 return if is_default {
-                    resolve_relative_tish_default(from_dir, from_s)
+                    resolve_relative_tish_default(from_dir, from_s, open_docs)
                 } else {
-                    resolve_relative_tish(from_dir, from_s, imported)
+                    resolve_relative_tish(from_dir, from_s, imported, open_docs)
                 };
             }
 
@@ -563,6 +588,26 @@ mod receiver_member_tests {
         assert_eq!(mem, "setTitle");
     }
 
+    // #148: cross-file goto-def must read the open editor buffer (unsaved edits), not disk.
+    #[test]
+    fn module_source_prefers_open_buffer_over_disk() {
+        use std::collections::HashMap;
+        use tower_lsp::lsp_types::Url;
+        // A path that does NOT exist on disk: the disk branch would fail, so a non-None result
+        // proves the open buffer was used.
+        let path = std::path::Path::new("/nonexistent/tish/module.tish");
+        let url = Url::parse("file:///nonexistent/tish/module.tish").unwrap();
+        let mut docs = HashMap::new();
+        docs.insert(url.clone(), "export fn live() {}".to_string());
+        assert_eq!(
+            super::module_source(path, &url, &docs).as_deref(),
+            Some("export fn live() {}"),
+            "open buffer must win over (here, absent) disk content"
+        );
+        // Not open + nonexistent on disk → None (disk read fails), no panic.
+        assert_eq!(super::module_source(path, &url, &HashMap::new()), None);
+    }
+
     #[test]
     fn native_pragma_parse_optional_doc() {
         let src = r"// @tish-source window.innerHeight src/appkit/window_api.rs 289 | Height in points.