Merge branch 'github:main' into fix/python-nested-function-declaration

Author: nohehf

languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg

@@ -759,32 +759,39 @@ inherit .parent_module
 
 (with_clause) {}
 
-(function_definition
-  name: (identifier) @name) {
-  attr (@name.def) node_definition = @name
-}
-
-(function_definition
-  name: (identifier) @name
-  parameters: (parameters) @params
-  body: (block) @body) @func
-{
-  node call
-  node drop_scope
+[
+  (function_definition
+    parameters: (_) @params
+    body: (_) @body
+  ) @func
+  (lambda
+    parameters: (_) @params
+    body: (_) @body
+  )@func
+] {
+  node @func.call
   node return_value
+  node drop_scope
 
-  attr (@name.def) definiens_node = @func
-  edge @func.after_scope -> @name.def
-  edge @name.def -> call
-  edge call -> return_value
+  edge @func.call -> return_value
   edge @body.before_scope -> @params.after_scope
   edge @body.before_scope -> drop_scope
   edge drop_scope -> @func.bottom
   attr (drop_scope) type = "drop_scopes"
-  attr (call) pop_scoped_symbol = "()"
+  attr (@func.call) pop_scoped_symbol = "()"
   edge @params.before_scope -> JUMP_TO_SCOPE_NODE
   attr (return_value) is_exported
   let @func.function_returns = return_value
+}
+
+(function_definition
+  name: (identifier) @name
+  body: (_) @body
+) @func {
+  attr (@name.def) node_definition = @name
+  attr (@name.def) definiens_node = @func
+  edge @func.after_scope -> @name.def
+  edge @name.def -> @func.call
 
   ; Prevent functions defined inside of method bodies from being treated like methods
   let @body.class_self_scope = #null
@@ -802,8 +809,10 @@ inherit .parent_module
   attr (@param.output) push_node = @param
 }
 
-(parameters
-  (_) @param) @params
+[
+  (parameters        (_) @param) @params
+  (lambda_parameters (_) @param) @params
+]
 {
   node @param.param_index
   node @param.param_name
@@ -954,6 +963,18 @@ inherit .parent_module
 ;;
 ;; Expressions
 
+(lambda
+  body: (_) @body
+)@lam {
+  ;; TODO Unify .before_scope, .local_scope, and .input to simplify
+  ;;      uniform treatment of lambdas and function definitions.
+  node @body.before_scope
+  let @body.local_scope = @body.before_scope
+  edge @body.input -> @body.before_scope
+
+  edge @lam.output -> @lam.call
+}
+
 (conditional_expression) {}
 
 (named_expression) {}

languages/tree-sitter-stack-graphs-python/test/lambdas.py

@@ -0,0 +1,2 @@
+sorted([1, 2, 3], key=lambda x: x)
+#                               ^ defined: 1

languages/tree-sitter-stack-graphs-typescript/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v0.3.0 -- unreleased
+
+### Added
+
+- Support for TSX. A new language configuration for TSX is available, and TSX is enabled in the CLI next to TypeScript.
+
 ## v0.2.0 -- 2024-03-06
 
 The `tree-sitter-stack-graphs` is updated to `v0.8`.

languages/tree-sitter-stack-graphs-typescript/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "tree-sitter-stack-graphs-typescript"
-version = "0.2.0"
-description = "Stack graphs definition for TypeScript using tree-sitter-typescript"
+version = "0.3.0"
+description = "Stack graphs definition for TypeScript & TSX using tree-sitter-typescript"
 readme = "README.md"
-keywords = ["tree-sitter", "stack-graphs", "typescript"]
+keywords = ["tree-sitter", "stack-graphs", "typescript", "tsx"]
 authors = ["Hendrik van Antwerpen <hendrikvanantwerpen@github.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2018"

languages/tree-sitter-stack-graphs-typescript/rust/bin.rs

@@ -6,56 +6,34 @@
 // ------------------------------------------------------------------------------------------------
 
 use anyhow::anyhow;
-use clap::{Parser, ValueEnum};
+use clap::Parser;
 use tree_sitter_stack_graphs::cli::database::default_user_database_path_for_crate;
 use tree_sitter_stack_graphs::cli::provided_languages::Subcommands;
-use tree_sitter_stack_graphs::loader::{LanguageConfiguration, LoadError};
 use tree_sitter_stack_graphs::NoCancellation;
 
-/// Flag to select the dialect of the language
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, ValueEnum)]
-pub enum Dialect {
-    Typescript,
-    TSX,
-}
-
 fn main() -> anyhow::Result<()> {
     let cli = Cli::parse();
-    let lc = match language_configuration(cli.dialect) {
-        Ok(lc) => lc,
-        Err(err) => {
-            eprintln!("{}", err.display_pretty());
-            return Err(anyhow!("Language configuration error"));
-        }
-    };
-    let default_db_path = default_user_database_path_for_crate(env!("CARGO_PKG_NAME"))?;
-    cli.subcommand.run(default_db_path, vec![lc])
-}
-
-fn language_configuration<'a>(dialect: Dialect) -> Result<LanguageConfiguration, LoadError<'a>> {
-    match dialect {
-        Dialect::Typescript => {
-            tree_sitter_stack_graphs_typescript::try_language_configuration_typescript(
-                &NoCancellation,
-            )
-        }
-        Dialect::TSX => {
-            tree_sitter_stack_graphs_typescript::try_language_configuration_tsx(&NoCancellation)
-        }
+    let mut lcs = Vec::new();
+    for r in [
+        tree_sitter_stack_graphs_typescript::try_language_configuration_typescript(&NoCancellation),
+        tree_sitter_stack_graphs_typescript::try_language_configuration_tsx(&NoCancellation),
+    ] {
+        let lc = match r {
+            Ok(lc) => lc,
+            Err(err) => {
+                eprintln!("{}", err.display_pretty());
+                return Err(anyhow!("Language configuration error"));
+            }
+        };
+        lcs.push(lc);
     }
+    let default_db_path = default_user_database_path_for_crate(env!("CARGO_PKG_NAME"))?;
+    cli.subcommand.run(default_db_path, lcs)
 }
 
 #[derive(Parser)]
 #[clap(about, version)]
 pub struct Cli {
-    #[clap(
-        short,
-        long,
-        value_enum,
-        default_value_t = Dialect::Typescript,
-    )]
-    dialect: Dialect,
-
     #[clap(subcommand)]
     subcommand: Subcommands,
 }