From be380496728a91744ab449682af6d7bac6efdc6a Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 11 Jan 2024 13:57:32 -0800 Subject: [PATCH 001/202] Update README to include some usage guidance --- .github/workflows/ci.yml | 39 +++-- CONTRIBUTING.md | 5 +- .../tree-sitter-stack-graphs-java/README.md | 134 ++++++++++++++++-- .../README.md | 102 +++++++++---- .../README.md | 116 +++++++++------ script/ci-test-init | 18 +++ tree-sitter-stack-graphs/README.md | 105 +++++++++----- tree-sitter-stack-graphs/examples/README.md | 8 +- tree-sitter-stack-graphs/src/cli/init.rs | 126 ++++++++++------ 9 files changed, 465 insertions(+), 188 deletions(-) create mode 100755 script/ci-test-init diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c561bd429..cad93d701 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,21 +58,32 @@ jobs: run: cargo test --all-features - name: Run test suite with all optimizations run: cargo test --release - # Do the new project test last, because it adds the crate in the current source - # folder, and that shouldn't influence other tests. + + test-init: + needs: [test-rust] + runs-on: ubuntu-latest + strategy: + matrix: + rust: [stable] + + steps: + - name: Install Rust environment + uses: hecrj/setup-rust-action@v1 + with: + rust-version: ${{ matrix.rust }} + - name: Checkout code + uses: actions/checkout@v3 + - name: Cache dependencies + uses: actions/cache@v3 + with: + path: | + ~/.cargo + target + key: ${{ runner.OS }}-cargo-${{ hashFiles('**/Cargo.lock') }} + restore-keys: | + ${{ runner.OS }}-cargo- - name: Generate, build, and run new language project - run: | - cargo run --bin tree-sitter-stack-graphs --features cli -- init \ - --language-name InitTest \ - --language-id init_test \ - --language-file-extension it \ - --grammar-crate-name tree-sitter-python \ - --grammar-crate-version 0.20.0 \ - --internal \ - --non-interactive - cargo check -p tree-sitter-stack-graphs-init_test --all-features - cargo test -p tree-sitter-stack-graphs-init_test - cargo run -p tree-sitter-stack-graphs-init_test --features cli -- help + run: script/ci-test-init list-languages: runs-on: ubuntu-latest diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1992fceca..3827e3473 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -32,8 +32,8 @@ Here are a few things you can do that will increase the likelihood of your pull If you are one of the maintainers of this package, bump the version numbers in [`Cargo.toml`](Cargo.toml) and [`README.md`](README.md), then follow the typical instructions to publish a new version to [crates.io][]: ``` -$ cargo package -$ cargo publish +cargo package +cargo publish ``` [crates.io]: https://crates.io/stack-graphs/ @@ -43,4 +43,3 @@ $ cargo publish - [How to Contribute to Open Source](https://opensource.guide/how-to-contribute/) - [Using Pull Requests](https://help.github.com/articles/about-pull-requests/) - [GitHub Help](https://help.github.com) - diff --git a/languages/tree-sitter-stack-graphs-java/README.md b/languages/tree-sitter-stack-graphs-java/README.md index 821796b67..40c0f847f 100644 --- a/languages/tree-sitter-stack-graphs-java/README.md +++ b/languages/tree-sitter-stack-graphs-java/README.md @@ -1,30 +1,138 @@ # tree-sitter-stack-graphs definition for Java -This project defines tree-sitter-stack-graphs rules for Java using the [tree-sitter-java](https://www.npmjs.com/package/tree-sitter-java) grammar. +This project defines tree-sitter-stack-graphs rules for Java using the [tree-sitter-java][] grammar. -## Local Development +[tree-sitter-java]: https://crates.io/crates/tree-sitter-java + +- [API documentation](https://docs.rs/tree-sitter-stack-graphs-java/) +- [Release notes](https://github.com/github/stack-graphs/blob/main/languages/tree-sitter-stack-graphs-java/CHANGELOG.md) + +## Using the API + +To use this library, add the following to your `Cargo.toml`: + +```toml +[dependencies] +tree-sitter-stack-graphs-java = "0.2.0" +``` + +Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs-java/*/) for more details on how to use this library. + +## Using the Command-line Program + +The command-line program for `tree-sitter-stack-graphs-java` lets you do stack graph based analysis and lookup from the command line. + +The CLI can be run as follows: + +1. _(Installed)_ Install the CLI using Cargo as follows: + + ```sh + cargo install --features cli tree-sitter-stack-graphs-java + ``` + + After this, the CLI should be available as `tree-sitter-stack-graphs-java`. + +2. _(From source)_ Instead of installing the CLI, it can also be run directly from the crate directory, as a replacement for a `tree-sitter-stack-graphs-java` invocation, as follows: + + ```sh + cargo run --features cli -- + ``` + +The basic CLI workflow for the command-line program is to index source code and issue queries against the resulting database: + +1. Index a source folder as follows: + + ```sh + tree-sitter-stack-graphs-java index SOURCE_DIR + ``` + + _Indexing will skip any files that have already be indexed. To force a re-index, add the `-f` flag._ + + To check the status if a source folder, run: + + ```sh + tree-sitter-stack-graphs-java status SOURCE_DIR + ``` + + To clean the database and start with a clean slate, run: + + ```sh + tree-sitter-stack-graphs-java clean + ``` + + _Pass the `--delete` flag to not just empty the database, but also delete it. This is useful to resolve `unsupported database version` errors that may occur after a version update._ + +2. Run a query to find the definition(s) for a reference on a given line and column, run: + + ```sh + tree-sitter-stack-graphs-java query definition SOURCE_PATH:LINE:COLUMN + ``` + + Resulting definitions are printed, including a source line if the source file is available. + +Discover all available commands and flags by passing the `-h` flag to the CLI directly, or to any of the subcommands. + +## Development + +The project is written in Rust, and requires a recent version installed. Rust can be installed and updated using [rustup][]. + +[rustup]: https://rustup.rs/ The project is organized as follows: - The stack graph rules are defined in `src/stack-graphs.tsg`. +- Builtins sources and configuration are defined in `src/builtins.it` and `builtins.cfg` respectively. - Tests are put into the `test` directory. -The following commands are intended to be run from the repo root. +### Running Tests + +Run the tests as follows: + +```sh +cargo test +``` + +The project consists of a library and a CLI. By default, running `cargo` only applies to the library. To run `cargo` commands on the CLI as well, add `--features cli` or `--all-features`. + +Run the CLI from source as follows: + +```sh +cargo run --features cli -- ARGS +``` + +Sources are formatted using the standard Rust formatted, which is applied by running: + +```sh +cargo fmt +``` + +### Writing TSG + +The stack graph rules are written in [tree-sitter-graph][]. Checkout the [examples][], +which contain self-contained TSG rules for specific language features. A VSCode +[extension][] is available that provides syntax highlighting for TSG files. -Run all tests in the project by executing the following: +[tree-sitter-graph]: https://github.com/tree-sitter/tree-sitter-graph +[examples]: https://github.com/github/stack-graphs/blob/main/tree-sitter-stack-graphs/examples/ +[extension]: https://marketplace.visualstudio.com/items?itemName=tree-sitter.tree-sitter-graph - cargo test -p tree-sitter-stack-graphs-java +Parse and test a single file by executing the following commands: -Parse a single test file: - `cargo run -p tree-sitter-stack-graphs-java -- parse OPTIONS FILENAME` +```sh +cargo run --features cli -- parse FILES... +cargo run --features cli -- test TESTFILES... +``` -Test a single file: - `cargo run -p tree-sitter-stack-graphs-java -- test OPTIONS FILENAME` +Generate a visualization to debug failing tests by passing the `-V` flag: -For debugging purposes, it is useful to run the visualization tool to generate graphs for the tests being run. +```sh +cargo run --features cli -- test -V TESTFILES... +``` -To run a test and generate the visualization: +To generate the visualization regardless of test outcome, execute: -`cargo run -p tree-sitter-stack-graphs-java -- test --output-mode=always -V=%r/%d/%n.html FILENAME` +```sh +cargo run --features cli -- test -V --output-mode=always TESTFILES... +``` -Go to https://crates.io/crates/tree-sitter-stack-graphs for links to examples and documentation. +Go to for links to examples and documentation. diff --git a/languages/tree-sitter-stack-graphs-javascript/README.md b/languages/tree-sitter-stack-graphs-javascript/README.md index 3b53f03de..6d449be9c 100644 --- a/languages/tree-sitter-stack-graphs-javascript/README.md +++ b/languages/tree-sitter-stack-graphs-javascript/README.md @@ -4,27 +4,73 @@ This project defines tree-sitter-stack-graphs rules for JavaScript using the [tr [tree-sitter-javascript]: https://crates.io/crates/tree-sitter-javascript -## Usage +- [API documentation](https://docs.rs/tree-sitter-stack-graphs-javascript/) +- [Release notes](https://github.com/github/stack-graphs/blob/main/languages/tree-sitter-stack-graphs-javascript/CHANGELOG.md) + +## Using the API To use this library, add the following to your `Cargo.toml`: -``` toml +```toml [dependencies] -tree-sitter-stack-graphs-javascript = "0.0.1" +tree-sitter-stack-graphs-javascript = "0.1.0" ``` Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs-javascript/*/) for more details on how to use this library. -## Command-line Program +## Using the Command-line Program The command-line program for `tree-sitter-stack-graphs-javascript` lets you do stack graph based analysis and lookup from the command line. -Install the program using `cargo install` as follows: +The CLI can be run as follows: -``` sh -$ cargo install --features cli tree-sitter-stack-graphs-javascript -$ tree-sitter-stack-graphs-javascript --help -``` +1. _(Installed)_ Install the CLI using Cargo as follows: + + ```sh + cargo install --features cli tree-sitter-stack-graphs-javascript + ``` + + After this, the CLI should be available as `tree-sitter-stack-graphs-javascript`. + +2. _(From source)_ Instead of installing the CLI, it can also be run directly from the crate directory, as a replacement for a `tree-sitter-stack-graphs-javascript` invocation, as follows: + + ```sh + cargo run --features cli -- + ``` + +The basic CLI workflow for the command-line program is to index source code and issue queries against the resulting database: + +1. Index a source folder as follows: + + ```sh + tree-sitter-stack-graphs-javascript index SOURCE_DIR + ``` + + _Indexing will skip any files that have already be indexed. To force a re-index, add the `-f` flag._ + + To check the status if a source folder, run: + + ```sh + tree-sitter-stack-graphs-javascript status SOURCE_DIR + ``` + + To clean the database and start with a clean slate, run: + + ```sh + tree-sitter-stack-graphs-javascript clean + ``` + + _Pass the `--delete` flag to not just empty the database, but also delete it. This is useful to resolve `unsupported database version` errors that may occur after a version update._ + +2. Run a query to find the definition(s) for a reference on a given line and column, run: + + ```sh + tree-sitter-stack-graphs-javascript query definition SOURCE_PATH:LINE:COLUMN + ``` + + Resulting definitions are printed, including a source line if the source file is available. + +Discover all available commands and flags by passing the `-h` flag to the CLI directly, or to any of the subcommands. ## Development @@ -35,35 +81,29 @@ The project is written in Rust, and requires a recent version installed. Rust c The project is organized as follows: - The stack graph rules are defined in `src/stack-graphs.tsg`. -- Builtins sources and configuration are defined in `src/builtins.js` and `builtins.cfg` respectively. +- Builtins sources and configuration are defined in `src/builtins.it` and `builtins.cfg` respectively. - Tests are put into the `test` directory. -### Building and Running Tests - -Build the project by running: - -``` sh -$ cargo build -``` +### Running Tests Run the tests as follows: -``` sh -$ cargo test +```sh +cargo test ``` The project consists of a library and a CLI. By default, running `cargo` only applies to the library. To run `cargo` commands on the CLI as well, add `--features cli` or `--all-features`. Run the CLI from source as follows: -``` sh -$ cargo run --features cli -- ARGS +```sh +cargo run --features cli -- ARGS ``` Sources are formatted using the standard Rust formatted, which is applied by running: -``` sh -$ cargo fmt +```sh +cargo fmt ``` ### Writing TSG @@ -78,21 +118,21 @@ which contain self-contained TSG rules for specific language features. A VSCode Parse and test a single file by executing the following commands: -``` sh -$ cargo run --features cli -- parse FILES... -$ cargo run --features cli -- test TESTFILES... +```sh +cargo run --features cli -- parse FILES... +cargo run --features cli -- test TESTFILES... ``` Generate a visualization to debug failing tests by passing the `-V` flag: -``` sh -$ cargo run --features cli -- test -V TESTFILES... +```sh +cargo run --features cli -- test -V TESTFILES... ``` To generate the visualization regardless of test outcome, execute: -``` sh -$ cargo run --features cli -- test -V --output-mode=always TESTFILES... +```sh +cargo run --features cli -- test -V --output-mode=always TESTFILES... ``` -Go to https://crates.io/crates/tree-sitter-stack-graphs for links to examples and documentation. +Go to for links to examples and documentation. diff --git a/languages/tree-sitter-stack-graphs-typescript/README.md b/languages/tree-sitter-stack-graphs-typescript/README.md index 0c1f9d5ee..fada7e2df 100644 --- a/languages/tree-sitter-stack-graphs-typescript/README.md +++ b/languages/tree-sitter-stack-graphs-typescript/README.md @@ -4,72 +4,106 @@ This project defines tree-sitter-stack-graphs rules for TypeScript using the [tr [tree-sitter-typescript]: https://crates.io/crates/tree-sitter-typescript -## Usage +- [API documentation](https://docs.rs/tree-sitter-stack-graphs-typescript/) +- [Release notes](https://github.com/github/stack-graphs/blob/main/languages/tree-sitter-stack-graphs-typescript/CHANGELOG.md) + +## Using the API To use this library, add the following to your `Cargo.toml`: -``` toml +```toml [dependencies] -tree-sitter-stack-graphs-typescript = "0.1" +tree-sitter-stack-graphs-typescript = "0.1.0" ``` -Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs-typescript/*/) for -more details on how to use this library. +Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs-typescript/*/) for more details on how to use this library. -## Command-line Program +## Using the Command-line Program -The command-line program for `tree-sitter-stack-graphs-typescript` lets you do -stack graph based analysis and lookup from the command line. +The command-line program for `tree-sitter-stack-graphs-typescript` lets you do stack graph based analysis and lookup from the command line. -Install the program using `cargo install` as follows: +The CLI can be run as follows: -``` sh -$ cargo install --features cli tree-sitter-stack-graphs-typescript -$ tree-sitter-stack-graphs-typescript --help -``` +1. _(Installed)_ Install the CLI using Cargo as follows: + + ```sh + cargo install --features cli tree-sitter-stack-graphs-typescript + ``` + + After this, the CLI should be available as `tree-sitter-stack-graphs-typescript`. + +2. _(From source)_ Instead of installing the CLI, it can also be run directly from the crate directory, as a replacement for a `tree-sitter-stack-graphs-typescript` invocation, as follows: + + ```sh + cargo run --features cli -- + ``` + +The basic CLI workflow for the command-line program is to index source code and issue queries against the resulting database: + +1. Index a source folder as follows: + + ```sh + tree-sitter-stack-graphs-typescript index SOURCE_DIR + ``` + + _Indexing will skip any files that have already be indexed. To force a re-index, add the `-f` flag._ + + To check the status if a source folder, run: + + ```sh + tree-sitter-stack-graphs-typescript status SOURCE_DIR + ``` + + To clean the database and start with a clean slate, run: + + ```sh + tree-sitter-stack-graphs-typescript clean + ``` + + _Pass the `--delete` flag to not just empty the database, but also delete it. This is useful to resolve `unsupported database version` errors that may occur after a version update._ + +2. Run a query to find the definition(s) for a reference on a given line and column, run: + + ```sh + tree-sitter-stack-graphs-typescript query definition SOURCE_PATH:LINE:COLUMN + ``` + + Resulting definitions are printed, including a source line if the source file is available. + +Discover all available commands and flags by passing the `-h` flag to the CLI directly, or to any of the subcommands. ## Development -The project is written in Rust, and requires a recent version installed. -Rust can be installed and updated using [rustup][]. +The project is written in Rust, and requires a recent version installed. Rust can be installed and updated using [rustup][]. [rustup]: https://rustup.rs/ - The project is organized as follows: - The stack graph rules are defined in `src/stack-graphs.tsg`. -- Builtins sources and configuration are defined in `src/builtins.ts` and `builtins.cfg` respectively. +- Builtins sources and configuration are defined in `src/builtins.it` and `builtins.cfg` respectively. - Tests are put into the `test` directory. -### Building and Running Tests - -Build the project by running: - -``` sh -$ cargo build -``` +### Running Tests Run the tests as follows: -``` sh -$ cargo test +```sh +cargo test ``` -The project consists of a library and a CLI. -By default, running `cargo` only applies to the library. -To run `cargo` commands on the CLI as well, add `--features cli` or `--all-features`. +The project consists of a library and a CLI. By default, running `cargo` only applies to the library. To run `cargo` commands on the CLI as well, add `--features cli` or `--all-features`. Run the CLI from source as follows: -``` sh -$ cargo run --features cli -- ARGS +```sh +cargo run --features cli -- ARGS ``` Sources are formatted using the standard Rust formatted, which is applied by running: -``` sh -$ cargo fmt +```sh +cargo fmt ``` ### Writing TSG @@ -84,21 +118,21 @@ which contain self-contained TSG rules for specific language features. A VSCode Parse and test a single file by executing the following commands: -``` sh -$ cargo run --features cli -- parse FILES... -$ cargo run --features cli -- test TESTFILES... +```sh +cargo run --features cli -- parse FILES... +cargo run --features cli -- test TESTFILES... ``` Generate a visualization to debug failing tests by passing the `-V` flag: -``` sh -$ cargo run --features cli -- test -V TESTFILES... +```sh +cargo run --features cli -- test -V TESTFILES... ``` To generate the visualization regardless of test outcome, execute: -``` sh -$ cargo run --features cli -- test -V --output-mode=always TESTFILES... +```sh +cargo run --features cli -- test -V --output-mode=always TESTFILES... ``` -Go to https://crates.io/crates/tree-sitter-stack-graphs for links to examples and documentation. +Go to for links to examples and documentation. diff --git a/script/ci-test-init b/script/ci-test-init new file mode 100755 index 000000000..c58532fd5 --- /dev/null +++ b/script/ci-test-init @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +set -eu + +cargo run --bin tree-sitter-stack-graphs --features cli -- init \ + --language-name InitTest \ + --language-id init_test \ + --language-file-extension it \ + --grammar-crate-name tree-sitter-python \ + --grammar-crate-version 0.20.0 \ + --internal \ + --non-interactive + +cargo check -p tree-sitter-stack-graphs-init_test --all-features + +cargo test -p tree-sitter-stack-graphs-init_test + +cargo run -p tree-sitter-stack-graphs-init_test --features cli -- -V diff --git a/tree-sitter-stack-graphs/README.md b/tree-sitter-stack-graphs/README.md index 01ce41971..dc7b18a80 100644 --- a/tree-sitter-stack-graphs/README.md +++ b/tree-sitter-stack-graphs/README.md @@ -1,7 +1,6 @@ # tree-sitter-stack-graphs -The `tree-sitter-stack-graphs` crate lets you create stack graphs using the -[tree-sitter][] grammar for a language. +The `tree-sitter-stack-graphs` crate lets you create stack graphs using the [tree-sitter][] grammar for a language. [tree-sitter]: https://tree-sitter.github.io/ @@ -9,50 +8,82 @@ The `tree-sitter-stack-graphs` crate lets you create stack graphs using the - [Examples](https://github.com/github/stack-graphs/blob/main/tree-sitter-stack-graphs/examples/) - [Release notes](https://github.com/github/stack-graphs/blob/main/tree-sitter-stack-graphs/CHANGELOG.md) -## Usage +## Using the API To use this library, add the following to your `Cargo.toml`: -``` toml +```toml [dependencies] tree-sitter-stack-graphs = "0.7" ``` -Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs/*/) for -more details on how to use this library. +Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs/*/) for more details on how to use this library. -## Command-line Program +## Using the Command-line Program -The command-line program for `tree-sitter-stack-graphs` lets you do stack -graph based analysis and lookup from the command line. +The command-line program for `tree-sitter-stack-graphs` lets you do stack graph based analysis and lookup from the command line. -Install the program using `cargo install` as follows: +The CLI can be run as follows: -``` sh -$ cargo install --features cli tree-sitter-stack-graphs -$ tree-sitter-stack-graphs --help -``` +1. _(Installed)_ Install the CLI using Cargo as follows: -Alternatively, the program can be invoked via NPM as follows: + ```sh + cargo install --features cli tree-sitter-stack-graphs + ``` -``` sh -$ npx tree-sitter-stack-graphs -``` + After this, the CLI should be available as `tree-sitter-stack-graphs`. + +2. _(From source)_ Instead of installing the CLI, it can also be run directly from the crate directory, as a replacement for a `tree-sitter-stack-graphs` invocation, as follows: + + ```sh + cargo run --features cli -- + ``` + +The basic CLI workflow for the command-line program is to index source code and issue queries against the resulting database: + +1. Index a source folder as follows: + + ```sh + tree-sitter-stack-graphs index SOURCE_DIR + ``` + + _Indexing will skip any files that have already be indexed. To force a re-index, add the `-f` flag._ + + To check the status if a source folder, run: + + ```sh + tree-sitter-stack-graphs status SOURCE_DIR + ``` -## Getting Started + To clean the database and start with a clean slate, run: -Starting a new project to develop stack graph definitions for your favourite language -is as easy as running the `init` command: + ```sh + tree-sitter-stack-graphs clean + ``` -``` sh -$ tree-sitter-stack-graphs init PROJECT_DIR + _Pass the `--delete` flag to not just empty the database, but also delete it. This is useful to resolve `unsupported database version` errors that may occur after a version update._ + +2. Run a query to find the definition(s) for a reference on a given line and column, run: + + ```sh + tree-sitter-stack-graphs query definition SOURCE_PATH:LINE:COLUMN + ``` + + Resulting definitions are printed, including a source line if the source file is available. + +Discover all available commands and flags by passing the `-h` flag to the CLI directly, or to any of the subcommands. + +## Getting Started on a new Language + +Starting a new project to develop stack graph definitions for your favourite language is as easy as running the `init` command: + +```sh +tree-sitter-stack-graphs init PROJECT_DIR ``` -Answer the questions to provide information about the language, the grammar dependency, and -the project and hit `Generate` to generate the new project. Check out `PROJECT_DIR/README.md` -to find out how to start developing. +Answer the questions to provide information about the language, the grammar dependency, and the project and hit `Generate` to generate the new project. Check out `PROJECT_DIR/README.md` to find out how to start developing. -Also check out our [examples][] for more details on how to work with the CLI. +Check out [examples][] of stack graph rules for typical language features. [examples]: https://github.com/github/stack-graphs/blob/main/tree-sitter-stack-graphs/examples/ @@ -65,14 +96,14 @@ Rust can be installed and updated using [rustup][]. Build the project by running: -``` -$ cargo build +```sh +cargo build ``` Run the tests by running: -``` -$ cargo test +```sh +cargo test ``` The project consists of a library and a CLI. @@ -81,22 +112,22 @@ To run `cargo` commands on the CLI as well, add `--features cli` or `--all-featu Run the CLI from source as follows: -``` sh -$ cargo run --features cli -- ARGS +```sh +cargo run --features cli -- ARGS ``` Sources are formatted using the standard Rust formatted, which is applied by running: -``` -$ cargo fmt +```sh +cargo fmt ``` ## License Licensed under either of - - [Apache License, Version 2.0][apache] ([LICENSE-APACHE](LICENSE-APACHE)) - - [MIT license][mit] ([LICENSE-MIT](LICENSE-MIT)) +- [Apache License, Version 2.0][apache] ([LICENSE-APACHE](LICENSE-APACHE)) +- [MIT license][mit] ([LICENSE-MIT](LICENSE-MIT)) at your option. diff --git a/tree-sitter-stack-graphs/examples/README.md b/tree-sitter-stack-graphs/examples/README.md index 901616422..5d5186ad5 100644 --- a/tree-sitter-stack-graphs/examples/README.md +++ b/tree-sitter-stack-graphs/examples/README.md @@ -7,19 +7,19 @@ Each directory contains a `stack-graphs.tsg` file that describes at the top what Running the examples requires the Python grammar to be available. This can be installed (in this directory) by executing: ```bash -$ ./bootstrap +./bootstrap ``` Run the tests for an example by executing: ```bash -$ ./run EXAMPLE_DIR +./run EXAMPLE_DIR ``` or, from within the example's directory: ```bash -$ ../run +../run ``` To render HTML visualizations of the stack graphs for the tests in an example, add the `-V` flag to run. @@ -27,7 +27,7 @@ To render HTML visualizations of the stack graphs for the tests in an example, a Print the parse tree of an example file by executing: ```bash -$ ./parse EXAMPLE_FILE +./parse EXAMPLE_FILE ``` The following examples are available: diff --git a/tree-sitter-stack-graphs/src/cli/init.rs b/tree-sitter-stack-graphs/src/cli/init.rs index e381786b9..df18339aa 100644 --- a/tree-sitter-stack-graphs/src/cli/init.rs +++ b/tree-sitter-stack-graphs/src/cli/init.rs @@ -455,33 +455,79 @@ impl ProjectSettings<'_> { fn generate_readme(&self, project_path: &Path) -> anyhow::Result<()> { let mut file = File::create(project_path.join("README.md"))?; writedoc! {file, r####" - # tree-sitter-stack-graphs definition for {} + # tree-sitter-stack-graphs definition for {language_name} - This project defines tree-sitter-stack-graphs rules for {} using the [{}][] grammar. + This project defines tree-sitter-stack-graphs rules for {language_name} using the [{grammar_crate_name}][] grammar. - [{}]: https://crates.io/crates/{} + [{grammar_crate_name}]: https://crates.io/crates/{grammar_crate_name} - ## Usage + - [API documentation](https://docs.rs/{crate_name}/) + - [Release notes](https://github.com/github/stack-graphs/blob/main/languages/{crate_name}/CHANGELOG.md) + + ## Using the API To use this library, add the following to your `Cargo.toml`: - ``` toml + ```toml [dependencies] - {} = "{}" + {crate_name} = "{crate_version}" ``` - Check out our [documentation](https://docs.rs/{}/*/) for more details on how to use this library. + Check out our [documentation](https://docs.rs/{crate_name}/*/) for more details on how to use this library. - ## Command-line Program + ## Using the Command-line Program - The command-line program for `{}` lets you do stack graph based analysis and lookup from the command line. + The command-line program for `{crate_name}` lets you do stack graph based analysis and lookup from the command line. - Install the program using `cargo install` as follows: + The CLI can be run as follows: - ``` sh - $ cargo install --features cli {} - $ {} --help - ``` + 1. _(Installed)_ Install the CLI using Cargo as follows: + + ```sh + cargo install --features cli {crate_name} + ``` + + After this, the CLI should be available as `{crate_name}`. + + 2. _(From source)_ Instead of installing the CLI, it can also be run directly from the crate directory, as a replacement for a `{crate_name}` invocation, as follows: + + ```sh + cargo run --features cli -- + ``` + + The basic CLI workflow for the command-line program is to index source code and issue queries against the resulting database: + + 1. Index a source folder as follows: + + ```sh + {crate_name} index SOURCE_DIR + ``` + + _Indexing will skip any files that have already be indexed. To force a re-index, add the `-f` flag._ + + To check the status if a source folder, run: + + ```sh + {crate_name} status SOURCE_DIR + ``` + + To clean the database and start with a clean slate, run: + + ```sh + {crate_name} clean + ``` + + _Pass the `--delete` flag to not just empty the database, but also delete it. This is useful to resolve `unsupported database version` errors that may occur after a version update._ + + 2. Run a query to find the definition(s) for a reference on a given line and column, run: + + ```sh + {crate_name} query definition SOURCE_PATH:LINE:COLUMN + ``` + + Resulting definitions are printed, including a source line if the source file is available. + + Discover all available commands and flags by passing the `-h` flag to the CLI directly, or to any of the subcommands. ## Development @@ -492,35 +538,29 @@ impl ProjectSettings<'_> { The project is organized as follows: - The stack graph rules are defined in `src/stack-graphs.tsg`. - - Builtins sources and configuration are defined in `src/builtins.{}` and `builtins.cfg` respectively. + - Builtins sources and configuration are defined in `src/builtins.{language_file_extension}` and `builtins.cfg` respectively. - Tests are put into the `test` directory. - ### Building and Running Tests - - Build the project by running: - - ``` sh - $ cargo build - ``` + ### Running Tests Run the tests as follows: - ``` sh - $ cargo test + ```sh + cargo test ``` The project consists of a library and a CLI. By default, running `cargo` only applies to the library. To run `cargo` commands on the CLI as well, add `--features cli` or `--all-features`. Run the CLI from source as follows: - ``` sh - $ cargo run --features cli -- ARGS + ```sh + cargo run --features cli -- ARGS ``` Sources are formatted using the standard Rust formatted, which is applied by running: - ``` sh - $ cargo fmt + ```sh + cargo fmt ``` ### Writing TSG @@ -535,34 +575,30 @@ impl ProjectSettings<'_> { Parse and test a single file by executing the following commands: - ``` sh - $ cargo run --features cli -- parse FILES... - $ cargo run --features cli -- test TESTFILES... + ```sh + cargo run --features cli -- parse FILES... + cargo run --features cli -- test TESTFILES... ``` Generate a visualization to debug failing tests by passing the `-V` flag: - ``` sh - $ cargo run --features cli -- test -V TESTFILES... + ```sh + cargo run --features cli -- test -V TESTFILES... ``` To generate the visualization regardless of test outcome, execute: - ``` sh - $ cargo run --features cli -- test -V --output-mode=always TESTFILES... + ```sh + cargo run --features cli -- test -V --output-mode=always TESTFILES... ``` - Go to https://crates.io/crates/tree-sitter-stack-graphs for links to examples and documentation. + Go to for links to examples and documentation. "####, - self.language_name, - self.language_name, self.grammar_crate_name(), - self.grammar_crate_name(), self.grammar_crate_name(), - self.crate_name(), self.crate_version(), - self.crate_name(), - self.crate_name(), - self.crate_name(), - self.crate_name(), - self.language_file_extension, + language_name=self.language_name, + grammar_crate_name=self.grammar_crate_name(), + crate_name=self.crate_name(), + crate_version=self.crate_version(), + language_file_extension=self.language_file_extension, }?; Ok(()) } From 13b5e25b3603126883074caffc6409e8a73b8d4c Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Tue, 16 Jan 2024 14:38:57 -0500 Subject: [PATCH 002/202] Nested arrow functions. Co-Authored-By: Rebecca Valentine <171941+BekaValentine@users.noreply.github.com> --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index e732ced2a..17a9ddcca 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -46,6 +46,7 @@ undefined; [1, 2, 3]; function () { return; }; () => { }; +() => () => { }; function* () { yield 1; }; foo(); foo(bar); From 1f75acb21053475198da0962f730dd02e5419165 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Tue, 16 Jan 2024 14:52:44 -0500 Subject: [PATCH 003/202] Trace return_or_yield through an edge. Co-Authored-By: Rebecca Valentine <171941+BekaValentine@users.noreply.github.com> --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index d7faf39f2..e15e3e301 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -2818,7 +2818,7 @@ inherit .return_or_yield ; function values have return nodes which need to be visible for returns attr (fun_value_return) pop_symbol = "GUARD:RETURN" edge fun_value_call -> fun_value_return - let @body.return_or_yield = fun_value_return + edge fun_value_return -> @fun.return_or_yield ; function values have this nodes which need to be visible for method calls attr (fun_value_this) push_symbol = "this" From d31bd76627cab9f041810070b189cfb959450331 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Tue, 16 Jan 2024 15:18:12 -0500 Subject: [PATCH 004/202] Nested functions. Co-Authored-By: Rebecca Valentine <171941+BekaValentine@users.noreply.github.com> --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index 17a9ddcca..3f21383b5 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -45,6 +45,7 @@ undefined; []; [1, 2, 3]; function () { return; }; +function () { return function () { }; }; () => { }; () => () => { }; function* () { yield 1; }; From 4a70bcf496f5a26bfdb5cddc1eb593b3ab06373e Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Tue, 16 Jan 2024 15:25:05 -0500 Subject: [PATCH 005/202] Test comments in param lists. Co-Authored-By: Rebecca Valentine <171941+BekaValentine@users.noreply.github.com> --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index e732ced2a..6bd200294 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -47,6 +47,7 @@ undefined; function () { return; }; () => { }; function* () { yield 1; }; +function (/**/) { }; foo(); foo(bar); foo.bar; From 8c46a27829bfe4b9adfcabd5964aed7cfa5813b2 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Tue, 16 Jan 2024 15:32:02 -0500 Subject: [PATCH 006/202] Give comments covalues. Co-Authored-By: Rebecca Valentine <171941+BekaValentine@users.noreply.github.com> --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index d7faf39f2..2afc77d71 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -398,6 +398,7 @@ inherit .return_or_yield node @comment.after_scope node @comment.before_scope node @comment.value + node @comment.covalue edge @comment.after_scope -> @comment.before_scope } From 8f39af50b135abc630ae5705018ff318fef76f18 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Tue, 16 Jan 2024 15:40:38 -0500 Subject: [PATCH 007/202] Test with parameters. Co-Authored-By: Rebecca Valentine <171941+BekaValentine@users.noreply.github.com> --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index 6bd200294..697edaac6 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -48,6 +48,8 @@ function () { return; }; () => { }; function* () { yield 1; }; function (/**/) { }; +function (x /**/) { }; +function (/**/ x) { }; foo(); foo(bar); foo.bar; From c1b16560b0353fdb3ad039ed632b60f6878f1b3c Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Tue, 16 Jan 2024 16:03:30 -0500 Subject: [PATCH 008/202] Extract the else_clause nodes into their own rule. They were being run twice due to :sparkles: comments :sparkles: Co-Authored-By: Rebecca Valentine <171941+BekaValentine@users.noreply.github.com> --- .../src/stack-graphs.tsg | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 9e887ea32..602d19244 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -1708,6 +1708,11 @@ inherit .return_or_yield edge @if_stmt.after_scope -> @alternative.after_scope } +(else_clause)@else_clause { + node @else_clause.after_scope + node @else_clause.before_scope +} + (else_clause (_)@inner)@else_clause { @@ -1716,8 +1721,6 @@ inherit .return_or_yield } (else_clause (_)@inner)@else_clause { - node @else_clause.after_scope - node @else_clause.before_scope ; scopes flow in and right back out edge @inner.before_scope -> @else_clause.before_scope edge @else_clause.after_scope -> @inner.after_scope From 500f5fc4f9789dba24ff9984cba0fcc41d619d87 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Tue, 16 Jan 2024 16:06:50 -0500 Subject: [PATCH 009/202] The first child is the hoist point. Co-Authored-By: Rebecca Valentine <171941+BekaValentine@users.noreply.github.com> --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 602d19244..b1c6481d2 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -1714,7 +1714,7 @@ inherit .return_or_yield } (else_clause - (_)@inner)@else_clause { + . (_)@inner)@else_clause { let @else_clause.hoist_point = @inner.before_scope From 726aa2931129b1925488afd48b1f5d68df7cefad Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Tue, 16 Jan 2024 16:13:54 -0500 Subject: [PATCH 010/202] Test comments around if statements. Co-Authored-By: Rebecca Valentine <171941+BekaValentine@users.noreply.github.com> --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index b557e8bcf..99a0f98b2 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -12,6 +12,11 @@ function* foo() { } class Foo { } { } if (true) { } +if (true) { } else { } +if (/**/ true) /**/ { } else /**/ { } +if (true) return; +if (true) return; else return; +if (/**/ true) /**/ return; else /**/ return; switch (x) { } for (x; y; z) { } for (x in xs) { } From 62a1ff3bb22b4f0934bf8f3deba5b297340b418a Mon Sep 17 00:00:00 2001 From: Rebecca Valentine Date: Wed, 17 Jan 2024 14:06:12 -0800 Subject: [PATCH 011/202] Makes class definiens be the constructor instead of the class body --- .../src/stack-graphs.tsg | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index b1c6481d2..e4eb58924 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -4629,11 +4629,19 @@ inherit .return_or_yield ;; These rules are all about declarations and terms that have the names ;; directly in them. -(class_declaration - name:(_)@name - body:(_)@_body)@class_decl { +( + (class_declaration + name:(_)@name + body:(class_body + (method_definition + name:(_)@name)@constructor + ) + ) + + (#eq? @name "constructor") +) { - attr (@name.pop) definiens_node = @class_decl + attr (@name.pop) definiens_node = @constructor } @@ -4680,11 +4688,19 @@ inherit .return_or_yield } -(class - name:(_)@name - body:(_)@_body)@class { +( + (class + name:(_)@name + body:(class_body + (method_definition + name:(_)@name)@constructor + ) + ) - attr (@name.pop) definiens_node = @class + (#eq? @name "constructor") +) { + + attr (@name.pop) definiens_node = @constructor } From dbcf25ce0dbd1700e1ef492da73bcd0ffbac912d Mon Sep 17 00:00:00 2001 From: Rebecca Valentine Date: Thu, 18 Jan 2024 11:25:57 -0800 Subject: [PATCH 012/202] Adds member field name --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index e4eb58924..4d9266296 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -4633,7 +4633,7 @@ inherit .return_or_yield (class_declaration name:(_)@name body:(class_body - (method_definition + member:(method_definition name:(_)@name)@constructor ) ) @@ -4692,7 +4692,7 @@ inherit .return_or_yield (class name:(_)@name body:(class_body - (method_definition + member:(method_definition name:(_)@name)@constructor ) ) From 7f1034f4358f25a284a29a8a61cbc0e8617896a3 Mon Sep 17 00:00:00 2001 From: Rebecca Valentine Date: Thu, 18 Jan 2024 11:37:10 -0800 Subject: [PATCH 013/202] Fixes bug --- .../src/stack-graphs.tsg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 4d9266296..5d4100acb 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -4634,11 +4634,11 @@ inherit .return_or_yield name:(_)@name body:(class_body member:(method_definition - name:(_)@name)@constructor + name:(_)@_method_name)@constructor ) ) - (#eq? @name "constructor") + (#eq? @_method_name "constructor") ) { attr (@name.pop) definiens_node = @constructor @@ -4693,11 +4693,11 @@ inherit .return_or_yield name:(_)@name body:(class_body member:(method_definition - name:(_)@name)@constructor + name:(_)@_method_name)@constructor ) ) - (#eq? @name "constructor") + (#eq? @_method_name "constructor") ) { attr (@name.pop) definiens_node = @constructor From e7718570ec9f0f4966bcecead9fa16c8f7a82b2a Mon Sep 17 00:00:00 2001 From: Rebecca Valentine Date: Fri, 26 Jan 2024 15:41:24 -0800 Subject: [PATCH 014/202] Adds reference test --- ...ion_fields_and_methods_visible_in_other_methods.js | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 languages/tree-sitter-stack-graphs-javascript/test/computation_flow/class_declaration_fields_and_methods_visible_in_other_methods.js diff --git a/languages/tree-sitter-stack-graphs-javascript/test/computation_flow/class_declaration_fields_and_methods_visible_in_other_methods.js b/languages/tree-sitter-stack-graphs-javascript/test/computation_flow/class_declaration_fields_and_methods_visible_in_other_methods.js new file mode 100644 index 000000000..d00499691 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-javascript/test/computation_flow/class_declaration_fields_and_methods_visible_in_other_methods.js @@ -0,0 +1,11 @@ +class Foo { + bar = 1; + baz() { } + quux() { + this.bar; + // ^ defined: 2 + + this.baz(); + // ^ defined: 2 + } +} \ No newline at end of file From d4f7b88bfc26f358878321450dd369e025b34832 Mon Sep 17 00:00:00 2001 From: Rebecca Valentine Date: Fri, 26 Jan 2024 17:05:34 -0800 Subject: [PATCH 015/202] fixes bug in test --- ...s_declaration_fields_and_methods_visible_in_other_methods.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/computation_flow/class_declaration_fields_and_methods_visible_in_other_methods.js b/languages/tree-sitter-stack-graphs-javascript/test/computation_flow/class_declaration_fields_and_methods_visible_in_other_methods.js index d00499691..5ea5db72e 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/computation_flow/class_declaration_fields_and_methods_visible_in_other_methods.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/computation_flow/class_declaration_fields_and_methods_visible_in_other_methods.js @@ -6,6 +6,6 @@ class Foo { // ^ defined: 2 this.baz(); - // ^ defined: 2 + // ^ defined: 3 } } \ No newline at end of file From e0198278edb028a1db035abb89df59f18a130305 Mon Sep 17 00:00:00 2001 From: Rebecca Valentine Date: Fri, 26 Jan 2024 17:05:43 -0800 Subject: [PATCH 016/202] Makes test pass --- .../src/stack-graphs.tsg | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 5d4100acb..a9274f6f3 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -257,6 +257,7 @@ inherit .import_statement inherit .pkg_pop inherit .pkg_push inherit .return_or_yield +inherit .containing_class_value @@ -357,6 +358,10 @@ inherit .return_or_yield node @prog.builtins_Regex_prototype node @prog.builtins_arguments_prototype node @prog.builtins_empty_object + ; !!!! HACK + ; stack graphs currently make it impossible to test if an inherited variable + ; like this is defined or not + let @prog.containing_class_value = @prog.builtins_null } @@ -1429,6 +1434,7 @@ inherit .return_or_yield node @name.pop node @class_decl.class_value + let @class_decl.containing_class_value = @class_decl.class_value node guard_prototype node @class_decl.prototype node @class_decl.constructor @@ -2382,6 +2388,14 @@ inherit .return_or_yield ; this is a lookup, ie a push attr (@this.value) symbol_reference = "this", source_node = @this edge @this.value -> @this.before_scope + + node pop_this + attr (pop_this) symbol_definition = "this" + node guard_prototype + attr (guard_prototype) push_symbol = "GUARD:PROTOTYPE" + edge @this.value -> pop_this + edge pop_this -> guard_prototype + edge guard_prototype -> @this.containing_class_value } From cc0e93705be92d3c3c56780f3a290393b3e959d3 Mon Sep 17 00:00:00 2001 From: Rebecca Valentine Date: Fri, 26 Jan 2024 17:27:44 -0800 Subject: [PATCH 017/202] Adds class expressions --- .../src/stack-graphs.tsg | 1 + ..._fields_and_methods_visible_in_other_methods.js | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index a9274f6f3..93cd66066 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -3464,6 +3464,7 @@ inherit .containing_class_value body:(_)@body)@class { node @class.class_value + let @class.containing_class_value = @class.class_value node guard_prototype node @class.prototype node @class.constructor diff --git a/languages/tree-sitter-stack-graphs-javascript/test/computation_flow/class_declaration_fields_and_methods_visible_in_other_methods.js b/languages/tree-sitter-stack-graphs-javascript/test/computation_flow/class_declaration_fields_and_methods_visible_in_other_methods.js index 5ea5db72e..3bed1c415 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/computation_flow/class_declaration_fields_and_methods_visible_in_other_methods.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/computation_flow/class_declaration_fields_and_methods_visible_in_other_methods.js @@ -8,4 +8,16 @@ class Foo { this.baz(); // ^ defined: 3 } -} \ No newline at end of file +} + +(class { + bar = 1; + baz() { } + quux() { + this.bar; + // ^ defined: 14 + + this.baz(); + // ^ defined: 15 + } +}); \ No newline at end of file From 30d216ffe01223e225bd3c9946f016b8f648500b Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 08:52:47 +0200 Subject: [PATCH 018/202] Add initial Python language project --- .../.gitignore | 3 + .../CHANGELOG.md | 6 ++ .../Cargo.toml | 38 +++++++ .../tree-sitter-stack-graphs-python/LICENSE | 0 .../tree-sitter-stack-graphs-python/README.md | 98 +++++++++++++++++++ .../rust/bin.rs | 32 ++++++ .../rust/lib.rs | 48 +++++++++ .../rust/test.rs | 23 +++++ .../src/builtins.cfg | 1 + .../src/builtins.py | 0 .../src/stack-graphs.tsg | 42 ++++++++ .../test/test.py | 0 12 files changed, 291 insertions(+) create mode 100644 languages/tree-sitter-stack-graphs-python/.gitignore create mode 100644 languages/tree-sitter-stack-graphs-python/CHANGELOG.md create mode 100644 languages/tree-sitter-stack-graphs-python/Cargo.toml create mode 100644 languages/tree-sitter-stack-graphs-python/LICENSE create mode 100644 languages/tree-sitter-stack-graphs-python/README.md create mode 100644 languages/tree-sitter-stack-graphs-python/rust/bin.rs create mode 100644 languages/tree-sitter-stack-graphs-python/rust/lib.rs create mode 100644 languages/tree-sitter-stack-graphs-python/rust/test.rs create mode 100644 languages/tree-sitter-stack-graphs-python/src/builtins.cfg create mode 100644 languages/tree-sitter-stack-graphs-python/src/builtins.py create mode 100644 languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg create mode 100644 languages/tree-sitter-stack-graphs-python/test/test.py diff --git a/languages/tree-sitter-stack-graphs-python/.gitignore b/languages/tree-sitter-stack-graphs-python/.gitignore new file mode 100644 index 000000000..faf6459fb --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/.gitignore @@ -0,0 +1,3 @@ +*.html +/Cargo.lock +/target diff --git a/languages/tree-sitter-stack-graphs-python/CHANGELOG.md b/languages/tree-sitter-stack-graphs-python/CHANGELOG.md new file mode 100644 index 000000000..9e6604deb --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/CHANGELOG.md @@ -0,0 +1,6 @@ +# Changelog for tree-sitter-stack-graphs-python + +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). diff --git a/languages/tree-sitter-stack-graphs-python/Cargo.toml b/languages/tree-sitter-stack-graphs-python/Cargo.toml new file mode 100644 index 000000000..9270879c0 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/Cargo.toml @@ -0,0 +1,38 @@ +[package] +name = "tree-sitter-stack-graphs-python" +version = "0.1.0" +description = "Stack graphs definition for Python using tree-sitter-python" +readme = "README.md" +keywords = ["tree-sitter", "stack-graphs", "python"] +authors = [ + "GitHub ", +] +license = "MIT OR Apache-2.0" +edition = "2018" + +[[bin]] +name = "tree-sitter-stack-graphs-python" +path = "rust/bin.rs" +required-features = ["cli"] + +[lib] +path = "rust/lib.rs" +test = false + +[[test]] +name = "test" +path = "rust/test.rs" +harness = false + +[features] +cli = ["anyhow", "clap", "tree-sitter-stack-graphs/cli"] + +[dependencies] +anyhow = { version = "1.0", optional = true } +clap = { version = "4", optional = true, features = ["derive"] } +tree-sitter-stack-graphs = { version = "0.7", path = "../../tree-sitter-stack-graphs" } +tree-sitter-python = "0.20.2" + +[dev-dependencies] +anyhow = "1.0" +tree-sitter-stack-graphs = { version = "0.7", path = "../../tree-sitter-stack-graphs", features = ["cli"] } diff --git a/languages/tree-sitter-stack-graphs-python/LICENSE b/languages/tree-sitter-stack-graphs-python/LICENSE new file mode 100644 index 000000000..e69de29bb diff --git a/languages/tree-sitter-stack-graphs-python/README.md b/languages/tree-sitter-stack-graphs-python/README.md new file mode 100644 index 000000000..3bf115da0 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/README.md @@ -0,0 +1,98 @@ +# tree-sitter-stack-graphs definition for Python + +This project defines tree-sitter-stack-graphs rules for Python using the [tree-sitter-python][] grammar. + +[tree-sitter-python]: https://crates.io/crates/tree-sitter-python + +## Usage + +To use this library, add the following to your `Cargo.toml`: + +``` toml +[dependencies] +tree-sitter-stack-graphs-python = "0.1.0" +``` + +Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs-python/*/) for more details on how to use this library. + +## Command-line Program + +The command-line program for `tree-sitter-stack-graphs-python` lets you do stack graph based analysis and lookup from the command line. + +Install the program using `cargo install` as follows: + +``` sh +$ cargo install --features cli tree-sitter-stack-graphs-python +$ tree-sitter-stack-graphs-python --help +``` + +## Development + +The project is written in Rust, and requires a recent version installed. Rust can be installed and updated using [rustup][]. + +[rustup]: https://rustup.rs/ + +The project is organized as follows: + +- The stack graph rules are defined in `src/stack-graphs.tsg`. +- Builtins sources and configuration are defined in `src/builtins.py` and `builtins.cfg` respectively. +- Tests are put into the `test` directory. + +### Building and Running Tests + +Build the project by running: + +``` sh +$ cargo build +``` + +Run the tests as follows: + +``` sh +$ cargo test +``` + +The project consists of a library and a CLI. By default, running `cargo` only applies to the library. To run `cargo` commands on the CLI as well, add `--features cli` or `--all-features`. + +Run the CLI from source as follows: + +``` sh +$ cargo run --features cli -- ARGS +``` + +Sources are formatted using the standard Rust formatted, which is applied by running: + +``` sh +$ cargo fmt +``` + +### Writing TSG + +The stack graph rules are written in [tree-sitter-graph][]. Checkout the [examples][], +which contain self-contained TSG rules for specific language features. A VSCode +[extension][] is available that provides syntax highlighting for TSG files. + +[tree-sitter-graph]: https://github.com/tree-sitter/tree-sitter-graph +[examples]: https://github.com/github/stack-graphs/blob/main/tree-sitter-stack-graphs/examples/ +[extension]: https://marketplace.visualstudio.com/items?itemName=tree-sitter.tree-sitter-graph + +Parse and test a single file by executing the following commands: + +``` sh +$ cargo run --features cli -- parse FILES... +$ cargo run --features cli -- test TESTFILES... +``` + +Generate a visualization to debug failing tests by passing the `-V` flag: + +``` sh +$ cargo run --features cli -- test -V TESTFILES... +``` + +To generate the visualization regardless of test outcome, execute: + +``` sh +$ cargo run --features cli -- test -V --output-mode=always TESTFILES... +``` + +Go to https://crates.io/crates/tree-sitter-stack-graphs for links to examples and documentation. diff --git a/languages/tree-sitter-stack-graphs-python/rust/bin.rs b/languages/tree-sitter-stack-graphs-python/rust/bin.rs new file mode 100644 index 000000000..dc9a6772c --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/rust/bin.rs @@ -0,0 +1,32 @@ +// -*- coding: utf-8 -*- +// ------------------------------------------------------------------------------------------------ +// Copyright © 2023, stack-graphs authors. +// Licensed under either of Apache License, Version 2.0, or MIT license, at your option. +// Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details. +// ------------------------------------------------------------------------------------------------ + +use anyhow::anyhow; +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::NoCancellation; + +fn main() -> anyhow::Result<()> { + let lc = match tree_sitter_stack_graphs_python::try_language_configuration(&NoCancellation) { + Ok(lc) => lc, + Err(err) => { + eprintln!("{}", err.display_pretty()); + return Err(anyhow!("Language configuration error")); + } + }; + let cli = Cli::parse(); + let default_db_path = default_user_database_path_for_crate(env!("CARGO_PKG_NAME"))?; + cli.subcommand.run(default_db_path, vec![lc]) +} + +#[derive(Parser)] +#[clap(about, version)] +pub struct Cli { + #[clap(subcommand)] + subcommand: Subcommands, +} diff --git a/languages/tree-sitter-stack-graphs-python/rust/lib.rs b/languages/tree-sitter-stack-graphs-python/rust/lib.rs new file mode 100644 index 000000000..74176a475 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/rust/lib.rs @@ -0,0 +1,48 @@ +// -*- coding: utf-8 -*- +// ------------------------------------------------------------------------------------------------ +// Copyright © 2023, stack-graphs authors. +// Licensed under either of Apache License, Version 2.0, or MIT license, at your option. +// Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details. +// ------------------------------------------------------------------------------------------------ + +use tree_sitter_stack_graphs::loader::LanguageConfiguration; +use tree_sitter_stack_graphs::loader::LoadError; +use tree_sitter_stack_graphs::CancellationFlag; + +/// The stack graphs tsg source for this language. +pub const STACK_GRAPHS_TSG_PATH: &str = "src/stack-graphs.tsg"; +/// The stack graphs tsg source for this language. +pub const STACK_GRAPHS_TSG_SOURCE: &str = include_str!("../src/stack-graphs.tsg"); + +/// The stack graphs builtins configuration for this language. +pub const STACK_GRAPHS_BUILTINS_CONFIG: &str = include_str!("../src/builtins.cfg"); +/// The stack graphs builtins path for this language +pub const STACK_GRAPHS_BUILTINS_PATH: &str = "src/builtins.py"; +/// The stack graphs builtins source for this language. +pub const STACK_GRAPHS_BUILTINS_SOURCE: &str = include_str!("../src/builtins.py"); + +/// The name of the file path global variable. +pub const FILE_PATH_VAR: &str = "FILE_PATH"; + +pub fn language_configuration(cancellation_flag: &dyn CancellationFlag) -> LanguageConfiguration { + try_language_configuration(cancellation_flag).unwrap_or_else(|err| panic!("{}", err)) +} + +pub fn try_language_configuration( + cancellation_flag: &dyn CancellationFlag, +) -> Result { + LanguageConfiguration::from_sources( + tree_sitter_python::language(), + Some(String::from("source.py")), + None, + vec![String::from("py")], + STACK_GRAPHS_TSG_PATH.into(), + STACK_GRAPHS_TSG_SOURCE, + Some(( + STACK_GRAPHS_BUILTINS_PATH.into(), + STACK_GRAPHS_BUILTINS_SOURCE, + )), + Some(STACK_GRAPHS_BUILTINS_CONFIG), + cancellation_flag, + ) +} diff --git a/languages/tree-sitter-stack-graphs-python/rust/test.rs b/languages/tree-sitter-stack-graphs-python/rust/test.rs new file mode 100644 index 000000000..c81edf0d4 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/rust/test.rs @@ -0,0 +1,23 @@ +// -*- coding: utf-8 -*- +// ------------------------------------------------------------------------------------------------ +// Copyright © 2023, stack-graphs authors. +// Licensed under either of Apache License, Version 2.0, or MIT license, at your option. +// Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details. +// ------------------------------------------------------------------------------------------------ + +use anyhow::anyhow; +use std::path::PathBuf; +use tree_sitter_stack_graphs::ci::Tester; +use tree_sitter_stack_graphs::NoCancellation; + +fn main() -> anyhow::Result<()> { + let lc = match tree_sitter_stack_graphs_python::try_language_configuration(&NoCancellation) { + Ok(lc) => lc, + Err(err) => { + eprintln!("{}", err.display_pretty()); + return Err(anyhow!("Language configuration error")); + } + }; + let test_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("test"); + Tester::new(vec![lc], vec![test_path]).run() +} diff --git a/languages/tree-sitter-stack-graphs-python/src/builtins.cfg b/languages/tree-sitter-stack-graphs-python/src/builtins.cfg new file mode 100644 index 000000000..d685061be --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/src/builtins.cfg @@ -0,0 +1 @@ +[globals] diff --git a/languages/tree-sitter-stack-graphs-python/src/builtins.py b/languages/tree-sitter-stack-graphs-python/src/builtins.py new file mode 100644 index 000000000..e69de29bb diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg new file mode 100644 index 000000000..99647e75b --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -0,0 +1,42 @@ +;; -*- coding: utf-8 -*- +;; ------------------------------------------------------------------------------------------------ +;; Copyright © 2023, stack-graphs authors. +;; Licensed under either of Apache License, Version 2.0, or MIT license, at your option. +;; Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details. +;; ------------------------------------------------------------------------------------------------ + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Stack graphs definition for Python +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +;; Global Variables +;; ^^^^^^^^^^^^^^^^ + +global FILE_PATH +global ROOT_NODE +global JUMP_TO_SCOPE_NODE + +;; Attribute Shorthands +;; ^^^^^^^^^^^^^^^^^^^^ + +attribute node_definition = node => type = "pop_symbol", node_symbol = node, is_definition +attribute node_reference = node => type = "push_symbol", node_symbol = node, is_reference +attribute pop_node = node => type = "pop_symbol", node_symbol = node +attribute pop_scoped_node = node => type = "pop_scoped_symbol", node_symbol = node +attribute pop_scoped_symbol = symbol => type = "pop_scoped_symbol", symbol = symbol +attribute pop_symbol = symbol => type = "pop_symbol", symbol = symbol +attribute push_node = node => type = "push_symbol", node_symbol = node +attribute push_scoped_node = node => type = "push_scoped_symbol", node_symbol = node +attribute push_scoped_symbol = symbol => type = "push_scoped_symbol", symbol = symbol +attribute push_symbol = symbol => type = "push_symbol", symbol = symbol +attribute scoped_node_definition = node => type = "pop_scoped_symbol", node_symbol = node, is_definition +attribute scoped_node_reference = node => type = "push_scoped_symbol", node_symbol = node, is_reference +attribute symbol_definition = symbol => type = "pop_symbol", symbol = symbol, is_definition +attribute symbol_reference = symbol => type = "push_symbol", symbol = symbol, is_reference + +attribute node_symbol = node => symbol = (source-text node), source_node = node + +;; Stack Graph Rules +;; ^^^^^^^^^^^^^^^^^ + +; Have fun! diff --git a/languages/tree-sitter-stack-graphs-python/test/test.py b/languages/tree-sitter-stack-graphs-python/test/test.py new file mode 100644 index 000000000..e69de29bb From 75a3ec5939ead46a7d50c18ad8a936067402c4f6 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 09:37:26 +0200 Subject: [PATCH 019/202] Add legacy queries and tests for reference --- .../src/stack-graphs.scm | 779 ++++++++++++++++++ .../test/legacy.skip/aliased_imports.py | 31 + .../test/legacy.skip/attributes.py | 14 + .../test/legacy.skip/blocks.py | 21 + .../test/legacy.skip/chained_functions.py | 23 + .../test/legacy.skip/chained_methods.py | 27 + .../test/legacy.skip/class_members.py | 23 + .../test/legacy.skip/decorators.py | 10 + .../test/legacy.skip/exceptions.py | 5 + .../test/legacy.skip/functions.py | 31 + .../test/legacy.skip/imported_functions.py | 17 + .../test/legacy.skip/imports.py | 31 + .../test/legacy.skip/instance_members.py | 38 + .../test/legacy.skip/loops.py | 19 + .../test/legacy.skip/many_definitions.py | 76 ++ .../test/legacy.skip/pattern_matching.py | 39 + .../test/legacy.skip/redundant_reexport.py | 15 + .../test/legacy.skip/relative_imports.py | 60 ++ .../test/legacy.skip/statement_bindings.py | 9 + .../test/legacy.skip/superclasses.py | 19 + .../test/{ => legacy.skip}/test.py | 0 .../test/legacy.skip/tuples.py | 38 + .../test/legacy.skip/wildcard_import.py | 21 + 23 files changed, 1346 insertions(+) create mode 100644 languages/tree-sitter-stack-graphs-python/src/stack-graphs.scm create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/aliased_imports.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/attributes.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/blocks.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/chained_functions.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/chained_methods.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/class_members.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/decorators.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/exceptions.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/functions.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/imported_functions.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/imports.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/instance_members.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/loops.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/many_definitions.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/pattern_matching.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/redundant_reexport.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/relative_imports.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/statement_bindings.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/superclasses.py rename languages/tree-sitter-stack-graphs-python/test/{ => legacy.skip}/test.py (100%) create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/tuples.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/legacy.skip/wildcard_import.py diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.scm b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.scm new file mode 100644 index 000000000..380af7d95 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.scm @@ -0,0 +1,779 @@ +;; -*- coding: utf-8 -*- +;; ------------------------------------------------------------------------------------------------ +;; Copyright © 2023, stack-graphs authors. +;; Licensed under either of Apache License, Version 2.0, or MIT license, at your option. +;; Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details. +;; ------------------------------------------------------------------------------------------------ + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; LEGACY DEFINITION! INCLUDED FOR REFERENCE ONLY! ;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +; Modules and Imports +;--------------------- + +(module) @mod +{ + var module_def = @mod.file_def + attr module_def "no_span" + var module_ref = @mod.file_ref + attr module_ref "no_span" + var parent_module_def = module_def + var parent_module_ref = module_ref + var grandparent_module_ref = module_ref + + scan filepath { + "([^/]+)/" + { + edge module_def -> module_def.dot + edge module_def.dot -> module_def.next_def + edge module_ref.next_ref -> module_ref.dot + edge module_ref.dot -> module_ref + + attr module_def "pop" = $1 + attr module_def.dot "pop" = "." + attr module_ref "push" = $1 + attr module_ref.dot "push" = "." + + set grandparent_module_ref = parent_module_ref + set parent_module_def = module_def + set parent_module_ref = module_ref + set module_ref = module_ref.next_ref + set module_def = module_def.next_def + attr module_def "no_span" + attr module_ref "no_span" + } + + "__init__\\.py$" + { + attr parent_module_def "definition" + } + + "([^/]+)$" + { + edge module_def -> module_def.dot + edge module_def.dot -> module_def.next_def + + attr module_def "definition", "pop" = (replace $1 "\\.py" "") + attr module_def.dot "pop" = "." + + set module_def = module_def.next_def + attr module_def "no_span" + attr module_ref "no_span" + } + } + + edge root -> @mod.file_def + edge @mod.file_ref -> root + edge module_def -> @mod.after_scope + + edge @mod.before_scope -> @mod.global_dot + edge @mod.global -> root + attr @mod.global "push" = "" + + edge @mod.global_dot -> @mod.global + attr @mod.global_dot "push" = "." + + var @mod::parent_module = parent_module_ref + var @mod::grandparent_module = grandparent_module_ref + var @mod::bottom = @mod.after_scope + var @mod::global = @mod.global + var @mod::global_dot = @mod.global_dot +} + +(import_statement + name: (dotted_name + . (identifier) @root_name)) @stmt +{ + edge @stmt.after_scope -> @root_name.def, "precedence" = 1 + edge @root_name.ref -> root + attr @root_name.ref "push", "reference" + attr @root_name.def "pop", "definition" +} + +(import_statement + name: (aliased_import + (dotted_name . (identifier) @root_name))) @stmt +{ + edge @stmt.after_scope -> @root_name.def + edge @root_name.ref -> root + attr @root_name.ref "push", "reference" +} + +(import_from_statement + module_name: (dotted_name + . (identifier) @prefix_root_name)) @stmt +{ + edge @prefix_root_name.ref -> root + attr @prefix_root_name.ref "push", "reference" +} + +(import_from_statement + name: (dotted_name + . (identifier) @import_root_name)) @stmt +{ + edge @stmt.after_scope -> @import_root_name.def, "precedence" = 1 + edge @import_root_name.ref -> @import_root_name.ref_dot + attr @import_root_name.def "pop", "definition" + attr @import_root_name.ref "push", "reference" + attr @import_root_name.ref_dot "push" = "." +} + +(import_from_statement + name: (aliased_import + (dotted_name + . (identifier) @import_root_name))) @stmt +{ + edge @import_root_name.ref -> @import_root_name.ref_dot + attr @import_root_name.ref "push", "reference" + attr @import_root_name.ref_dot "push" = "." +} + +(import_from_statement + module_name: [ + (dotted_name (identifier) @prefix_leaf_name .) + (relative_import (dotted_name (identifier) @prefix_leaf_name .)) + (relative_import (import_prefix) @prefix_leaf_name .) + ] + name: [ + (dotted_name + . (identifier) @import_root_name) + (aliased_import + (dotted_name + . (identifier) @import_root_name)) + ]) +{ + edge @import_root_name.ref_dot -> @prefix_leaf_name.ref +} + +[ + (import_from_statement + (aliased_import + name: (dotted_name (identifier) @name .) + alias: (identifier) @alias)) + (import_statement + (aliased_import + name: (dotted_name (identifier) @name .) + alias: (identifier) @alias)) +] @stmt +{ + edge @stmt.after_scope -> @alias + edge @alias -> @name.ref + attr @alias "pop", "definition" +} + +[ + (import_statement + name: (dotted_name + (identifier) @leaf_name .)) + (import_from_statement + name: (dotted_name + (identifier) @leaf_name .)) +] +{ + attr @leaf_name.def "pop", "definition" + attr @leaf_name.ref "push", "reference" + edge @leaf_name.def -> @leaf_name.ref +} + +(relative_import + (import_prefix) @prefix + (#eq? @prefix ".")) @import +{ + edge @prefix.ref -> @import::parent_module +} + +(relative_import + (import_prefix) @prefix + (#eq? @prefix "..")) @import +{ + edge @prefix.ref -> @import::grandparent_module +} + +(relative_import + (import_prefix) @prefix + (dotted_name + . (identifier) @name)) +{ + attr @name.ref "push", "reference" + attr @name.ref_dot "push" = "." + edge @name.ref -> @name.ref_dot + edge @name.ref_dot -> @prefix.ref +} + +[ + (import_from_statement + module_name: (relative_import + (dotted_name + (identifier) @parent_name + . + (identifier) @child_name))) + (import_from_statement + module_name: (dotted_name + (identifier) @parent_name + . + (identifier) @child_name)) +] +{ + attr @child_name.ref "push", "reference" + attr @child_name.ref_dot "push" = "." + edge @child_name.ref -> @child_name.ref_dot + edge @child_name.ref_dot -> @parent_name.ref +} + +(import_from_statement + module_name: (dotted_name + . (identifier) @root_name)) +{ + attr @root_name.ref "push", "reference" + edge @root_name.ref -> root +} + +(import_from_statement + module_name: (dotted_name + (identifier) @leaf_name .) + (wildcard_import) @star) @stmt +{ + edge @stmt.after_scope -> @star.ref_dot, "precedence" = 1 + edge @star.ref_dot -> @leaf_name.ref + attr @star.ref_dot "push" = "." +} + +[ + (import_statement + name: (dotted_name + (identifier) @parent_name + . + (identifier) @child_name)) + (import_from_statement + name: (dotted_name + (identifier) @parent_name + . + (identifier) @child_name)) + (import_from_statement + name: (aliased_import + name: (dotted_name + (identifier) @parent_name + . + (identifier) @child_name))) +] +{ + edge @child_name.ref -> @child_name.ref_dot + edge @child_name.ref_dot -> @parent_name.ref + edge @parent_name.def -> @parent_name.def_dot + edge @parent_name.def_dot -> @child_name.def + attr @child_name.def "pop", "definition" + attr @child_name.ref "push","reference" + attr @parent_name.def_dot "pop" = "." + attr @child_name.ref_dot "push" = "." +} + +;-------- +; Scopes +;-------- + +[ + (module (_) @last_stmt .) + (block (_) @last_stmt .) +] @block +{ + edge @block.after_scope -> @last_stmt.after_scope +} + +[ + (module (_) @stmt1 . (_) @stmt2) + (block (_) @stmt1 . (_) @stmt2) +] +{ + edge @stmt2.before_scope -> @stmt1.after_scope +} + +[ + (module (_) @stmt) + (block (_) @stmt) +] +{ + edge @stmt.after_scope -> @stmt.before_scope + let @stmt::local_scope = @stmt.before_scope +} + +[ + (block . (_) @stmt) + (module . (_) @stmt) +] @block +{ + edge @stmt.before_scope -> @block.before_scope +} + +(block (_) @stmt . ) @block +{ + edge @block.after_scope -> @stmt.after_scope +} + +(function_definition (block) @block) +{ + edge @block.before_scope -> @block::local_scope +} + +[ + (while_statement (block) @block) + (if_statement (block) @block) + (with_statement (block) @block) + (try_statement (block) @block) + (for_statement (block) @block) + (_ [ + (else_clause (block) @block) + (elif_clause (block) @block) + (except_clause (block) @block) + (finally_clause (block) @block) + ]) +] @stmt +{ + edge @block.before_scope -> @block::local_scope + edge @stmt.after_scope -> @block.after_scope +} + +(match_statement (case_clause) @block) @stmt +{ + let @block::local_scope = @block.before_scope + edge @block.before_scope -> @stmt.before_scope + edge @stmt.after_scope -> @block.after_scope +} + +[ + (for_statement) + (while_statement) +] @stmt +{ + edge @stmt.before_scope -> @stmt.after_scope +} + +;------------- +; Definitions +;------------- + +[ + (assignment + left: (_) @pattern + right: (_) @value) + (with_item + value: + (as_pattern + (_) @value + alias: (as_pattern_target (_) @pattern))) +] +{ + edge @pattern.input -> @value.output +} + +(function_definition + name: (identifier) @name + parameters: (parameters) @params + body: (block) @body) @func +{ + attr @name "definiens" = @func + edge @func.after_scope -> @name + edge @name -> @func.call + edge @func.call -> @func.return_value + edge @body.before_scope -> @params.after_scope + edge @body.before_scope -> @func.drop_scope + edge @func.drop_scope -> @func::bottom + attr @func.drop_scope "drop" + attr @name "pop", "definition" + attr @func.call "pop" = "()", "pop-scope" + attr @params.before_scope "jump-to" + attr @func.return_value "endpoint" + let @func::function_returns = @func.return_value + + ; Prevent functions defined inside of method bodies from being treated like methods + let @body::class_self_scope = nil + let @body::class_member_attr_scope = nil +} + +;; +;; BEGIN BIG GNARLY DISJUNCTION +;; +;; The following pair of rules is intended to capture the following behavior: +;; +;; If a function definition is used to define a method, by being inside a class +;; definition, then we make its syntax type `method`. Otherwise, we make it's +;; syntax type `function`. Unfortunately, because of the limitations on negation +;; and binding in tree sitter queries, we cannot negate `class_definition` or +;; similar things directly. Instead, we have to manually push the negation down +;; to form the finite disjunction it corresponds to. +;; + +[ + (class_definition (block (decorated_definition (function_definition name: (_)@name)))) + (class_definition (block (function_definition name: (_)@name))) +] +{ + attr @name "syntax_type" = "method" +} + +[ + (module (decorated_definition (function_definition name: (_)@name))) + (module (function_definition name: (_)@name)) + + (if_statement (block (decorated_definition (function_definition name: (_)@name)))) + (if_statement (block (function_definition name: (_)@name))) + + (elif_clause (block (decorated_definition (function_definition name: (_)@name)))) + (elif_clause (block (function_definition name: (_)@name))) + + (else_clause (block (decorated_definition (function_definition name: (_)@name)))) + (else_clause (block (function_definition name: (_)@name))) + + (case_clause (block (decorated_definition (function_definition name: (_)@name)))) + (case_clause (block (function_definition name: (_)@name))) + + (for_statement (block (decorated_definition (function_definition name: (_)@name)))) + (for_statement (block (function_definition name: (_)@name))) + + (while_statement (block (decorated_definition (function_definition name: (_)@name)))) + (while_statement (block (function_definition name: (_)@name))) + + (try_statement (block (decorated_definition (function_definition name: (_)@name)))) + (try_statement (block (function_definition name: (_)@name))) + + (except_clause (block (decorated_definition (function_definition name: (_)@name)))) + (except_clause (block (function_definition name: (_)@name))) + + (finally_clause (block (decorated_definition (function_definition name: (_)@name)))) + (finally_clause (block (function_definition name: (_)@name))) + + (with_statement (block (decorated_definition (function_definition name: (_)@name)))) + (with_statement (block (function_definition name: (_)@name))) + + (function_definition (block (decorated_definition (function_definition name: (_)@name)))) + (function_definition (block (function_definition name: (_)@name))) +] +{ + attr @name "syntax_type" = "function" +} + +;; +;; END BIG GNARLY DISJUNCTION +;; + +(function_definition + parameters: (parameters + . (identifier) @param) + body: (block) @body) +{ + edge @param.input -> @param::class_self_scope + edge @param::class_member_attr_scope -> @param.output + edge @param.output -> @body.after_scope + attr @param.output "push" +} + +(parameter/identifier) @param +{ + attr @param.input "definition", "pop" + attr @param.param_name "push" + edge @param.input -> @param.param_index + edge @param.input -> @param.param_name +} + +[ + (parameter/default_parameter + name: (identifier) @name + value: (_) @value) @param + (parameter/typed_default_parameter + name: (_) @name + value: (_) @value) @param +] +{ + attr @name "definition", "pop" + attr @param.param_name "push" = @name + edge @name -> @param.param_name + edge @name -> @param.param_index + edge @param.input -> @name + edge @name -> @value.output +} + +[ + (parameter/typed_parameter + . (_) @name) @param + (parameter/list_splat_pattern + (_) @name) @param + (parameter/dictionary_splat_pattern + (_) @name) @param +] +{ + attr @name "definition", "pop" + attr @param.param_name "push" = @name + edge @name -> @param.param_name + edge @name -> @param.param_index + edge @param.input -> @name +} + +[ + (pattern_list (_) @pattern) + (tuple_pattern (_) @pattern) +] @list +{ + let statement_scope = @list::local_scope + let @pattern::local_scope = @pattern.pattern_before_scope + edge statement_scope -> @pattern::local_scope, "precedence" = (+ 1 (child-index @pattern)) + + edge @pattern.pattern_index -> @list.input + edge @pattern.input -> @pattern.pattern_index + attr @pattern.pattern_index "push" = (child-index @pattern) +} + +(parameters + (_) @param) @params +{ + attr @param.param_index "push" = (child-index @param) + edge @param.param_index -> @params.before_scope + edge @params.after_scope -> @param.input + edge @param.param_name -> @params.before_scope +} + +(return_statement (_) @expr) @stmt +{ + edge @stmt::function_returns -> @expr.output +} + +(class_definition + name: (identifier) @name) @class +{ + attr @name "definiens" = @class + attr @name "syntax_type" = "class" + edge @class.parent_scope -> @class::class_parent_scope + edge @class.parent_scope -> @class::local_scope + edge @class.after_scope -> @name + edge @name -> @class.call + edge @name -> @class.dot + edge @class.dot -> @class.members + edge @class.call -> @class.call_drop + edge @class.call_drop -> @class.self_scope + edge @class.self_scope -> @class.super_scope + edge @class.self_scope -> @class.self_dot + edge @class.self_dot -> @class.members + edge @class.members -> @class.member_attrs + attr @class.call "pop" = "()", "pop-scope" + attr @class.call_drop "drop" + attr @class.dot "pop" = "." + attr @class.self_dot "pop" = "." + attr @name "pop", "definition" + attr @class.member_attrs "push" = "." + attr @class.self_scope "endpoint" + let @class::super_scope = @class.super_scope + let @class::class_parent_scope = @class.parent_scope + let @class::class_self_scope = @class.call_drop + let @class::class_member_attr_scope = @class.member_attrs +} + +(class_definition + body: (block + (_) @last_stmt .) @body) @class +{ + edge @class.members -> @last_stmt.after_scope +} + +(class_definition + superclasses: (argument_list + (_) @superclass)) @class +{ + edge @class.super_scope -> @superclass.output +} + +(decorated_definition + definition: (_) @def) @stmt +{ + edge @def.before_scope -> @stmt.before_scope + edge @stmt.after_scope -> @def.after_scope +} + +(case_clause + pattern: (_) @pattern + consequence: (_) @consequence) @clause +{ + edge @consequence.before_scope -> @pattern.new_bindings + edge @consequence.before_scope -> @clause.before_scope + edge @clause.after_scope -> @consequence.after_scope +} + +;------------- +; Expressions +;------------- + +(call + function: (_) @fn + arguments: (argument_list) @args) @call +{ + edge @call.output -> @call.output_args + edge @call.output_args -> @fn.output + attr @call.output_args "push" = "()", "push-scope" = @args +} + +(call + function: (attribute + object: (_) @receiver) + arguments: (argument_list + (expression) @arg) @args) +{ + edge @args -> @arg.arg_index + edge @receiver -> @receiver.arg_index + + attr @receiver.arg_index "pop" = "0" + edge @receiver.arg_index -> @receiver.output + + attr @arg.arg_index "pop" = (+ 1 (child-index @arg)) + edge @arg.arg_index -> @arg.output +} + +(call + arguments: (argument_list + (keyword_argument + name: (identifier) @name + value: (_) @val) @arg) @args) @call +{ + edge @args -> @arg.arg_name + attr @arg.arg_name "pop" = @name + edge @arg.arg_name -> @val.output +} + +(argument_list + (expression) @arg) @args +{ + edge @args -> @arg.arg_index + attr @arg.arg_index "pop" = (child-index @arg) + edge @arg.arg_index -> @arg.output +} + +( + (call + function: (identifier) @fn-name) @call + (#eq? @fn-name "super") +) +{ + edge @call.output -> @call::super_scope +} + +[ + (tuple (_) @element) + (expression_list (_) @element) +] @tuple +{ + edge @tuple.output -> @element.el_index + attr @element.el_index "pop" = (child-index @element) + edge @element.el_index -> @element.output + + edge @tuple.new_bindings -> @element.new_bindings +} + +(attribute + object: (_) @object + attribute: (identifier) @name) @expr +{ + edge @expr.output -> @name.output + edge @name.output -> @expr.output_dot + edge @expr.output_dot -> @object.output + edge @object.input -> @expr.input_dot + edge @expr.input_dot -> @name.input + edge @name.input -> @expr.input + attr @expr.output_dot "push" = "." + attr @expr.input_dot "pop" = "." + attr @name.input "pop" + attr @name.output "push" +} + +(pattern/attribute + attribute: (identifier) @name) +{ + attr @name.input "definition" +} + +(primary_expression/attribute + attribute: (identifier) @name) +{ + attr @name.output "reference" +} + +(primary_expression/identifier) @id +{ + edge @id.output -> @id::local_scope + edge @id.output -> @id::class_parent_scope + edge @id::local_scope -> @id.input + attr @id.input "pop" + attr @id.output "push", "reference" + + attr @id.new_binding_pop "pop", "definition" + edge @id.new_bindings -> @id.new_binding_pop +} + +(pattern/identifier) @id +{ + edge @id.output -> @id::local_scope + edge @id.output -> @id::class_parent_scope + edge @id::local_scope -> @id.input, "precedence" = 1 + attr @id.input "pop", "definition" + attr @id.output "push" + + attr @id.new_binding_pop "pop", "definition" + edge @id.new_bindings -> @id.new_binding_pop +} + +(as_pattern + (expression) @value + alias: (as_pattern_target (primary_expression/identifier) @id)) @as_pattern +{ + edge @id.output -> @id::local_scope + edge @id.output -> @id::class_parent_scope + edge @id::local_scope -> @id.input, "precedence" = 1 + attr @id.input "pop", "definition" + attr @id.output "push" + + edge @as_pattern.new_bindings -> @value.new_bindings + edge @as_pattern.new_bindings -> @id.new_bindings +} + +(list) @list +{ + edge @list.output -> @list.called + edge @list.called -> @list::global_dot + attr @list.called "push" = "list" +} + +(list (_) @el) @list +{ + edge @list.new_bindings -> @el.new_bindings +} + +(dictionary (pair) @pair) @dict +{ + edge @dict.new_bindings -> @pair.new_bindings +} + +(pair + value: (_) @value) @pair +{ + edge @pair.new_bindings -> @value.new_bindings +} + +(set (_) @el) @set +{ + edge @set.new_bindings -> @el.new_bindings +} + +(list_splat (_) @splatted) @splat +{ +attr @splat.new_bindings_pop "pop" = @splatted, "definition" +edge @splat.new_bindings -> @splat.new_bindings_pop +} + +(binary_operator + (_) @left + (_) @right) @binop +{ + edge @binop.new_bindings -> @left.new_bindings + edge @binop.new_bindings -> @right.new_bindings +} + +(case_pattern (_) @expr) @pat +{ + edge @pat.new_bindings -> @expr.new_bindings +} diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/aliased_imports.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/aliased_imports.py new file mode 100644 index 000000000..d988757a5 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/aliased_imports.py @@ -0,0 +1,31 @@ +#------ path: foo.py ------# + +# module +class A: + a = 1 + +class B: + class C: + class D: + d = 2 + +#------ path: main.py ---# + +from foo import A as X, B.C.D as Y +import foo as f + +print X.a, Y.d +# ^ defined: 5 +# ^ defined: 10 + +print A, B.C +# ^ defined: +# ^ defined: +# ^ defined: + +print f.B +# ^ defined: 2, 15 +# ^ defined: 7 + +print foo +# ^ defined: diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/attributes.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/attributes.py new file mode 100644 index 000000000..6dd3d0e48 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/attributes.py @@ -0,0 +1,14 @@ +a = 1 + +a.b = 2 + +a.c.d = 5 + +print a.b +# ^ defined: 1 +# ^ defined: 3 + +print a.c, a.c.d +# ^ defined: 1 +# ^ defined: +# ^ defined: 5 diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/blocks.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/blocks.py new file mode 100644 index 000000000..462890baf --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/blocks.py @@ -0,0 +1,21 @@ +def f(): + if a: + b = 1 + else: + c = 2 + + print b, c + # ^ defined: 3 + # ^ defined: 5 + +class G: + if d: + e = 1 + + print e + # ^ defined: 13 + +print b, c, e +# ^ defined: +# ^ defined: +# ^ defined: diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/chained_functions.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/chained_functions.py new file mode 100644 index 000000000..ef1dac21d --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/chained_functions.py @@ -0,0 +1,23 @@ +class A: + w = 1 + x = 2 + y = 3 + z = 4 + +def get_a(): + return A +def get_b(): + return get_a() +def get_c(): + return get_b() +def get_d(): + return get_c() +def get_e(): + return get_d() +def get_f(): + return get_e() + +g = get_f(A) +print g.x, g.y +# ^ defined: 3 +# ^ defined: 4 diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/chained_methods.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/chained_methods.py new file mode 100644 index 000000000..9c4f53115 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/chained_methods.py @@ -0,0 +1,27 @@ +class Builder: + def set_a(self, a): + self.a = a + return self + + def set_b(self, b): + self.b = b + return self + + def set_c(self, c): + self.c = c + return self + + def set_d(self, d): + self.d = d + return self + + def set_e(self, e): + self.d = d + return self + +Builder().set_a('a1').set_b('b2').set_c('c3').set_d('d4').set_e('e4') +# ^ defined: 2 +# ^ defined: 6 +# ^ defined: 10 +# ^ defined: 14 +# ^ defined: 18 diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/class_members.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/class_members.py new file mode 100644 index 000000000..c67ace992 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/class_members.py @@ -0,0 +1,23 @@ +a = 1 + +class B: + c = a + # ^ defined: 1 + + def d(self): + return self.c + + class E: + f = a + # ^ defined: 1 + +print B.c +# ^ defined: 3 +# ^ defined: 1, 4 + +print B.d(1) +# ^ defined: 7 + +print B.a, E.a +# ^ defined: +# ^ defined: diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/decorators.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/decorators.py new file mode 100644 index 000000000..b55f44b2f --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/decorators.py @@ -0,0 +1,10 @@ +from a import deprecated +from b import ignore_warnings + +class A: + @deprecated + # ^ defined: 1 + @ignore_warnings.all + # ^ defined: 2 + def b(self): + pass diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/exceptions.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/exceptions.py new file mode 100644 index 000000000..b6b2e57e1 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/exceptions.py @@ -0,0 +1,5 @@ +try: + print() +except Exception as e: + x = e + # ^ defined: 3 diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/functions.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/functions.py new file mode 100644 index 000000000..31a1d6782 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/functions.py @@ -0,0 +1,31 @@ +import a.x.y +import b.x.y + +def get_x(value): + return value.x + # ^ defined: 4 + +print get_x(a).y +# ^ defined: 1 + +print get_x(b).y +# ^ defined: 2 + +def get_a(): + return a + +print get_a(b).x +# ^ defined: 1 + +print get_x(foo=1, value=a).y +# ^ defined: 1 + +def foo(w: int, x, y=1, z: int=4, *args, **dict): + local = x +# ^ defined: 23 + print(args, w, z) +# ^ defined: 23 +# ^ defined: 23 +# ^ defined: 23 + return y +# ^ defined: 23 diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/imported_functions.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/imported_functions.py new file mode 100644 index 000000000..495697740 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/imported_functions.py @@ -0,0 +1,17 @@ +#------ path: a.py ------# + +def foo(x): + return x + +#------ path: b.py ------# + +class A: + bar = 1 + +#------ path: main.py ---------# + +from a import * +from b import * + +foo(A).bar +# ^ defined: 9 diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/imports.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/imports.py new file mode 100644 index 000000000..2f21795da --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/imports.py @@ -0,0 +1,31 @@ +#------ path: one/two.py -----------# + +# module +import a.b.c + +d = 1 + +e = a.b + +#------ path: three/__init__.py ---# + +# module +f = 3 + +#------ path: main.py -------------# + +from one.two import d, e.c +# ^ defined: 2 +# ^ defined: 6, 17 +# ^ defined: 4, 8, 17 + +import three +# ^ defined: 11, 22 + +print(d, e.c) +# ^ defined: 6, 17 +# ^ defined: 4, 17 + +print three.f +# ^ defined: 11, 22 +# ^ defined: 13 diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/instance_members.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/instance_members.py new file mode 100644 index 000000000..38a6b6d75 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/instance_members.py @@ -0,0 +1,38 @@ +#---- path: a.py ------- + +class A: + def __init__(self, b, c): + self.b = b + self.c = A(c, 1) + + def get_b(self): + return self.b + # ^ defined: 4, 5 + + def get_c(self): + return self.c + # ^ defined: 6 + + def get_all(self): + return [self.get_b(), self.get_c()] + # ^ defined: 8 + # ^ defined: 12 + +a = A(1, 2) +a.get_all() +# ^ defined: 16 + +a.b +# ^ defined: 4, 5 + +a.c.b +# ^ defined: 4, 5 +# ^ defined: 6 + +#----- path: main.py --------- + +import a + +print a.A, a.a +# ^ defined: 3 +# ^ defined: 21 diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/loops.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/loops.py new file mode 100644 index 000000000..2f0663295 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/loops.py @@ -0,0 +1,19 @@ +class Node3: + value = 3 +class Node2: + value = 2 + next = Node3 +class Node1: + value = 1 + next = Node2 + +def linked_list_search(l, item): + node = l + while node: + if node.value == item: + return node + # ^ defined: 10, 11, 16 + node = node.next + +linked_list_search(Node1, 5).value +# ^ defined: 6 diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/many_definitions.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/many_definitions.py new file mode 100644 index 000000000..f85f3a8ec --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/many_definitions.py @@ -0,0 +1,76 @@ +#--- path: a.py ---# + +def f0(a): return X.a + X.b +def f1(a): return f0(1) +def f2(a): return f1(2) +def f3(a): return f2(3) +def f4(a): return f3(4) +def f5(a): return f4(5) +def f6(a): return f5(6) +def f7(a): return f6(7) +def f8(a): return f7(8) +def f9(a): return f8(9) + +class C1: + def m0(self, b): return f9(0) + def m1(self, b): return self.m0(1) + def m2(self, b): return self.m1(2) + def m3(self, b): return self.m2(3) + def m4(self, b): return self.m3(4) + def m5(self, b): return self.m4(5) + def m6(self, b): return self.m5(6) + def m7(self, b): return self.m6(7) + def m8(self, b): return self.m7(8) + +def f10(): return C1.m8(0) +def f11(): return f10(1) +def f12(): return X.c(2) +def f13(): return X.c(3) +def f14(): return x(4) +def f15(): return x(5) +def f16(): return x(6) +def f17(): return x(7) +def f18(): return x(8) + +class C2: + def m0(self): return X.d(0) + def m1(self): return X.d(1) + def m2(self): return X.d(2) + def m3(self): return X.d(3) + def m4(self): return X.d(4) + def m5(self): return X.d(5) + def m6(self): return X.d(6) + def m7(self): return X.d(7) + def m8(self): return X.d(8) + +#--- path: main.py ---# + +from a import * + +print f0(), f4(), f8() +# ^ defined: 3 +# ^ defined: 7 +# ^ defined: 11 + +print C1.m0, C1().m0(), C1.m4, C1().m4, C1.m8, C1.m8 +# ^ defined: 14 +# ^ defined: 15 +# ^ defined: 15 +# ^ defined: 19 +# ^ defined: 19 +# ^ defined: 23 +# ^ defined: 23 + +print f10(), f14(), f18() +# ^ defined: 25 +# ^ defined: 29 +# ^ defined: 33 + +print C2.m0, C2().m0(), C2.m4, C2().m4, C2.m8, C2.m8 +# ^ defined: 35 +# ^ defined: 36 +# ^ defined: 36 +# ^ defined: 40 +# ^ defined: 40 +# ^ defined: 44 +# ^ defined: 44 diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/pattern_matching.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/pattern_matching.py new file mode 100644 index 000000000..58c0d16fc --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/pattern_matching.py @@ -0,0 +1,39 @@ +command = 1 +current_room = 2 +character = 3 + +match command.split(): + # ^ defined: 1 + case ["quit"]: + print("Goodbye!") + quit_game() + case ["look"]: + current_room.describe() + # ^ defined: 2 + case ["get", obj]: + character.get(obj, current_room) + # ^ defined: 3 + # ^ defined: 13 + # ^ defined: 2 + case ["go", direction]: + current_room = current_room.neighbor(direction) + # ^ defined: 18 + case { "foo": foo }: + print(foo) + # ^ defined: 21 + case {bar,quux}: + print(bar,quux) + # ^ defined: 24 + # ^ defined: 24 + case ["grab", { "key": {garply}}]: + print(garply) + # ^ defined: 28 + case ["drop", *objs]: + print(objs) + # ^ defined: 31 + case ["get", obj] | ["pick", "up", obj] | ["pick", obj, "up"]: + print(obj) + # ^ defined: 34, 34, 34 + case ["go", ("north" | "south" | "east" | "west") as direction2]: + current_room = current_room.neighbor(direction2) + # ^ defined: 37 diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/redundant_reexport.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/redundant_reexport.py new file mode 100644 index 000000000..53afca29e --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/redundant_reexport.py @@ -0,0 +1,15 @@ +#--- path: a/__init__.py ---# + +from . import child + +#--- path: a/child.py ---- + +def f(): + pass + +#--- path: main.py ---# + +import a + +print a.child.f() +# ^ defined: 7 diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/relative_imports.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/relative_imports.py new file mode 100644 index 000000000..2d6e14eb4 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/relative_imports.py @@ -0,0 +1,60 @@ +#------ path: foo/bar/main.py ------# + +from . import a +from .b import B +from ..c import see +from ..c.d import D + +print a.A +# ^ defined: 3, 24 +# ^ defined: 26 + +print B.bee +# ^ defined: 4, 31 +# ^ defined: 32 + +print see() +# ^ defined: 5, 37 + + +print D.d +# ^ defined: 44 + +#------ path: foo/bar/a.py --------# + +# module +A = "a" + +#------ path: foo/bar/b.py --------# + +# module +class B: + bee = 1 + +#------ path: foo/c.py ------------# + +# module +def see(): + pass + +#------ path: foo/c/d.py ---------# + +# module +class D: + d = "d" + +#------ path: foo/e/g.py ---# + +# module +G = 1 + +#------ path: foo/e/__init__.py ---# + +# module +from .g import G +# ^ defined: 49, 54 + +from ..c import see +# ^ defined: 37, 57 + +E = 1 diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/statement_bindings.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/statement_bindings.py new file mode 100644 index 000000000..6e3a13abb --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/statement_bindings.py @@ -0,0 +1,9 @@ +import a.b +import c.d + +with a as x, c as y: + print x.b, y.d + # ^ defined: 1, 4 + # ^ defined: 1 + # ^ defined: 2, 4 + # ^ defined: 2 diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/superclasses.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/superclasses.py new file mode 100644 index 000000000..849a192a6 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/superclasses.py @@ -0,0 +1,19 @@ +class A: + def __init__(self): + self.some_attr = 2 + + def some_method(self): + print self + +class B(A): + def method2(self): + print self.some_attr, self.some_method() + # ^ defined: 3 + # ^ defined: 5, 14 + + def some_method(self): + pass + + def other(self): + super().some_method() + # ^ defined: 5 diff --git a/languages/tree-sitter-stack-graphs-python/test/test.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/test.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/test.py rename to languages/tree-sitter-stack-graphs-python/test/legacy.skip/test.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/tuples.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/tuples.py new file mode 100644 index 000000000..1ea6ee3ef --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/tuples.py @@ -0,0 +1,38 @@ +class a: + x = 1 +class b: + x = 1 +class c: + x = 1 + +(a1, b1) = (a, b) +a2, b2 = (a, b) +(a3, b3) = (a, b) +a4, b4 = a, b + +print a1.x, b1.x +# ^ defined: 2 +# ^ defined: 4 +print a2.x, b2.x +# ^ defined: 2 +# ^ defined: 4 +print a3.x, b3.x +# ^ defined: 2 +# ^ defined: 4 +print a4.x, b4.x +# ^ defined: 2 +# ^ defined: 4 + +t = (a, b), c +(a5, b5), c5 = t + +print a5.x, b5.x, c5.x +# ^ defined: 2 +# ^ defined: 4 +# ^ defined: 6 + +(a6, (b6, c6)) = (a, (b, c)) + +print a6.x, b6.x +# ^ defined: 2 +# ^ defined: 4 diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/wildcard_import.py b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/wildcard_import.py new file mode 100644 index 000000000..f2ac040f2 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/legacy.skip/wildcard_import.py @@ -0,0 +1,21 @@ +#------ path: one/two.py ------# + +a = 1 +b = 2 + +#------ path: one/three.py ------# + +b = 3 +c = 4 + +#------ path: main.py ---------# + +from one.two import * +from one.three import * + +print a +# ^ defined: 3 +print b +# ^ defined: 8 +print c +# ^ defined: 9 From decf584c173adcfc038b3f8c398c0025715832bf Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 09:42:41 +0200 Subject: [PATCH 020/202] convert: copy old --- .../src/stack-graphs.tsg | 770 +++++++++++++++++- 1 file changed, 767 insertions(+), 3 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 99647e75b..99fd0acaf 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -36,7 +36,771 @@ attribute symbol_reference = symbol => type = "push_symbol", symbol = symbol attribute node_symbol = node => symbol = (source-text node), source_node = node -;; Stack Graph Rules -;; ^^^^^^^^^^^^^^^^^ +; Modules and Imports +;--------------------- -; Have fun! +(module) @mod +{ + var module_def = @mod.file_def + attr module_def "no_span" + var module_ref = @mod.file_ref + attr module_ref "no_span" + var parent_module_def = module_def + var parent_module_ref = module_ref + var grandparent_module_ref = module_ref + + scan filepath { + "([^/]+)/" + { + edge module_def -> module_def.dot + edge module_def.dot -> module_def.next_def + edge module_ref.next_ref -> module_ref.dot + edge module_ref.dot -> module_ref + + attr module_def "pop" = $1 + attr module_def.dot "pop" = "." + attr module_ref "push" = $1 + attr module_ref.dot "push" = "." + + set grandparent_module_ref = parent_module_ref + set parent_module_def = module_def + set parent_module_ref = module_ref + set module_ref = module_ref.next_ref + set module_def = module_def.next_def + attr module_def "no_span" + attr module_ref "no_span" + } + + "__init__\\.py$" + { + attr parent_module_def "definition" + } + + "([^/]+)$" + { + edge module_def -> module_def.dot + edge module_def.dot -> module_def.next_def + + attr module_def "definition", "pop" = (replace $1 "\\.py" "") + attr module_def.dot "pop" = "." + + set module_def = module_def.next_def + attr module_def "no_span" + attr module_ref "no_span" + } + } + + edge root -> @mod.file_def + edge @mod.file_ref -> root + edge module_def -> @mod.after_scope + + edge @mod.before_scope -> @mod.global_dot + edge @mod.global -> root + attr @mod.global "push" = "" + + edge @mod.global_dot -> @mod.global + attr @mod.global_dot "push" = "." + + var @mod::parent_module = parent_module_ref + var @mod::grandparent_module = grandparent_module_ref + var @mod::bottom = @mod.after_scope + var @mod::global = @mod.global + var @mod::global_dot = @mod.global_dot +} + +(import_statement + name: (dotted_name + . (identifier) @root_name)) @stmt +{ + edge @stmt.after_scope -> @root_name.def, "precedence" = 1 + edge @root_name.ref -> root + attr @root_name.ref "push", "reference" + attr @root_name.def "pop", "definition" +} + +(import_statement + name: (aliased_import + (dotted_name . (identifier) @root_name))) @stmt +{ + edge @stmt.after_scope -> @root_name.def + edge @root_name.ref -> root + attr @root_name.ref "push", "reference" +} + +(import_from_statement + module_name: (dotted_name + . (identifier) @prefix_root_name)) @stmt +{ + edge @prefix_root_name.ref -> root + attr @prefix_root_name.ref "push", "reference" +} + +(import_from_statement + name: (dotted_name + . (identifier) @import_root_name)) @stmt +{ + edge @stmt.after_scope -> @import_root_name.def, "precedence" = 1 + edge @import_root_name.ref -> @import_root_name.ref_dot + attr @import_root_name.def "pop", "definition" + attr @import_root_name.ref "push", "reference" + attr @import_root_name.ref_dot "push" = "." +} + +(import_from_statement + name: (aliased_import + (dotted_name + . (identifier) @import_root_name))) @stmt +{ + edge @import_root_name.ref -> @import_root_name.ref_dot + attr @import_root_name.ref "push", "reference" + attr @import_root_name.ref_dot "push" = "." +} + +(import_from_statement + module_name: [ + (dotted_name (identifier) @prefix_leaf_name .) + (relative_import (dotted_name (identifier) @prefix_leaf_name .)) + (relative_import (import_prefix) @prefix_leaf_name .) + ] + name: [ + (dotted_name + . (identifier) @import_root_name) + (aliased_import + (dotted_name + . (identifier) @import_root_name)) + ]) +{ + edge @import_root_name.ref_dot -> @prefix_leaf_name.ref +} + +[ + (import_from_statement + (aliased_import + name: (dotted_name (identifier) @name .) + alias: (identifier) @alias)) + (import_statement + (aliased_import + name: (dotted_name (identifier) @name .) + alias: (identifier) @alias)) +] @stmt +{ + edge @stmt.after_scope -> @alias + edge @alias -> @name.ref + attr @alias "pop", "definition" +} + +[ + (import_statement + name: (dotted_name + (identifier) @leaf_name .)) + (import_from_statement + name: (dotted_name + (identifier) @leaf_name .)) +] +{ + attr @leaf_name.def "pop", "definition" + attr @leaf_name.ref "push", "reference" + edge @leaf_name.def -> @leaf_name.ref +} + +(relative_import + (import_prefix) @prefix + (#eq? @prefix ".")) @import +{ + edge @prefix.ref -> @import::parent_module +} + +(relative_import + (import_prefix) @prefix + (#eq? @prefix "..")) @import +{ + edge @prefix.ref -> @import::grandparent_module +} + +(relative_import + (import_prefix) @prefix + (dotted_name + . (identifier) @name)) +{ + attr @name.ref "push", "reference" + attr @name.ref_dot "push" = "." + edge @name.ref -> @name.ref_dot + edge @name.ref_dot -> @prefix.ref +} + +[ + (import_from_statement + module_name: (relative_import + (dotted_name + (identifier) @parent_name + . + (identifier) @child_name))) + (import_from_statement + module_name: (dotted_name + (identifier) @parent_name + . + (identifier) @child_name)) +] +{ + attr @child_name.ref "push", "reference" + attr @child_name.ref_dot "push" = "." + edge @child_name.ref -> @child_name.ref_dot + edge @child_name.ref_dot -> @parent_name.ref +} + +(import_from_statement + module_name: (dotted_name + . (identifier) @root_name)) +{ + attr @root_name.ref "push", "reference" + edge @root_name.ref -> root +} + +(import_from_statement + module_name: (dotted_name + (identifier) @leaf_name .) + (wildcard_import) @star) @stmt +{ + edge @stmt.after_scope -> @star.ref_dot, "precedence" = 1 + edge @star.ref_dot -> @leaf_name.ref + attr @star.ref_dot "push" = "." +} + +[ + (import_statement + name: (dotted_name + (identifier) @parent_name + . + (identifier) @child_name)) + (import_from_statement + name: (dotted_name + (identifier) @parent_name + . + (identifier) @child_name)) + (import_from_statement + name: (aliased_import + name: (dotted_name + (identifier) @parent_name + . + (identifier) @child_name))) +] +{ + edge @child_name.ref -> @child_name.ref_dot + edge @child_name.ref_dot -> @parent_name.ref + edge @parent_name.def -> @parent_name.def_dot + edge @parent_name.def_dot -> @child_name.def + attr @child_name.def "pop", "definition" + attr @child_name.ref "push","reference" + attr @parent_name.def_dot "pop" = "." + attr @child_name.ref_dot "push" = "." +} + +;-------- +; Scopes +;-------- + +[ + (module (_) @last_stmt .) + (block (_) @last_stmt .) +] @block +{ + edge @block.after_scope -> @last_stmt.after_scope +} + +[ + (module (_) @stmt1 . (_) @stmt2) + (block (_) @stmt1 . (_) @stmt2) +] +{ + edge @stmt2.before_scope -> @stmt1.after_scope +} + +[ + (module (_) @stmt) + (block (_) @stmt) +] +{ + edge @stmt.after_scope -> @stmt.before_scope + let @stmt::local_scope = @stmt.before_scope +} + +[ + (block . (_) @stmt) + (module . (_) @stmt) +] @block +{ + edge @stmt.before_scope -> @block.before_scope +} + +(block (_) @stmt . ) @block +{ + edge @block.after_scope -> @stmt.after_scope +} + +(function_definition (block) @block) +{ + edge @block.before_scope -> @block::local_scope +} + +[ + (while_statement (block) @block) + (if_statement (block) @block) + (with_statement (block) @block) + (try_statement (block) @block) + (for_statement (block) @block) + (_ [ + (else_clause (block) @block) + (elif_clause (block) @block) + (except_clause (block) @block) + (finally_clause (block) @block) + ]) +] @stmt +{ + edge @block.before_scope -> @block::local_scope + edge @stmt.after_scope -> @block.after_scope +} + +(match_statement (case_clause) @block) @stmt +{ + let @block::local_scope = @block.before_scope + edge @block.before_scope -> @stmt.before_scope + edge @stmt.after_scope -> @block.after_scope +} + +[ + (for_statement) + (while_statement) +] @stmt +{ + edge @stmt.before_scope -> @stmt.after_scope +} + +;------------- +; Definitions +;------------- + +[ + (assignment + left: (_) @pattern + right: (_) @value) + (with_item + value: + (as_pattern + (_) @value + alias: (as_pattern_target (_) @pattern))) +] +{ + edge @pattern.input -> @value.output +} + +(function_definition + name: (identifier) @name + parameters: (parameters) @params + body: (block) @body) @func +{ + attr @name "definiens" = @func + edge @func.after_scope -> @name + edge @name -> @func.call + edge @func.call -> @func.return_value + edge @body.before_scope -> @params.after_scope + edge @body.before_scope -> @func.drop_scope + edge @func.drop_scope -> @func::bottom + attr @func.drop_scope "drop" + attr @name "pop", "definition" + attr @func.call "pop" = "()", "pop-scope" + attr @params.before_scope "jump-to" + attr @func.return_value "endpoint" + let @func::function_returns = @func.return_value + + ; Prevent functions defined inside of method bodies from being treated like methods + let @body::class_self_scope = nil + let @body::class_member_attr_scope = nil +} + +;; +;; BEGIN BIG GNARLY DISJUNCTION +;; +;; The following pair of rules is intended to capture the following behavior: +;; +;; If a function definition is used to define a method, by being inside a class +;; definition, then we make its syntax type `method`. Otherwise, we make it's +;; syntax type `function`. Unfortunately, because of the limitations on negation +;; and binding in tree sitter queries, we cannot negate `class_definition` or +;; similar things directly. Instead, we have to manually push the negation down +;; to form the finite disjunction it corresponds to. +;; + +[ + (class_definition (block (decorated_definition (function_definition name: (_)@name)))) + (class_definition (block (function_definition name: (_)@name))) +] +{ + attr @name "syntax_type" = "method" +} + +[ + (module (decorated_definition (function_definition name: (_)@name))) + (module (function_definition name: (_)@name)) + + (if_statement (block (decorated_definition (function_definition name: (_)@name)))) + (if_statement (block (function_definition name: (_)@name))) + + (elif_clause (block (decorated_definition (function_definition name: (_)@name)))) + (elif_clause (block (function_definition name: (_)@name))) + + (else_clause (block (decorated_definition (function_definition name: (_)@name)))) + (else_clause (block (function_definition name: (_)@name))) + + (case_clause (block (decorated_definition (function_definition name: (_)@name)))) + (case_clause (block (function_definition name: (_)@name))) + + (for_statement (block (decorated_definition (function_definition name: (_)@name)))) + (for_statement (block (function_definition name: (_)@name))) + + (while_statement (block (decorated_definition (function_definition name: (_)@name)))) + (while_statement (block (function_definition name: (_)@name))) + + (try_statement (block (decorated_definition (function_definition name: (_)@name)))) + (try_statement (block (function_definition name: (_)@name))) + + (except_clause (block (decorated_definition (function_definition name: (_)@name)))) + (except_clause (block (function_definition name: (_)@name))) + + (finally_clause (block (decorated_definition (function_definition name: (_)@name)))) + (finally_clause (block (function_definition name: (_)@name))) + + (with_statement (block (decorated_definition (function_definition name: (_)@name)))) + (with_statement (block (function_definition name: (_)@name))) + + (function_definition (block (decorated_definition (function_definition name: (_)@name)))) + (function_definition (block (function_definition name: (_)@name))) +] +{ + attr @name "syntax_type" = "function" +} + +;; +;; END BIG GNARLY DISJUNCTION +;; + +(function_definition + parameters: (parameters + . (identifier) @param) + body: (block) @body) +{ + edge @param.input -> @param::class_self_scope + edge @param::class_member_attr_scope -> @param.output + edge @param.output -> @body.after_scope + attr @param.output "push" +} + +(parameter/identifier) @param +{ + attr @param.input "definition", "pop" + attr @param.param_name "push" + edge @param.input -> @param.param_index + edge @param.input -> @param.param_name +} + +[ + (parameter/default_parameter + name: (identifier) @name + value: (_) @value) @param + (parameter/typed_default_parameter + name: (_) @name + value: (_) @value) @param +] +{ + attr @name "definition", "pop" + attr @param.param_name "push" = @name + edge @name -> @param.param_name + edge @name -> @param.param_index + edge @param.input -> @name + edge @name -> @value.output +} + +[ + (parameter/typed_parameter + . (_) @name) @param + (parameter/list_splat_pattern + (_) @name) @param + (parameter/dictionary_splat_pattern + (_) @name) @param +] +{ + attr @name "definition", "pop" + attr @param.param_name "push" = @name + edge @name -> @param.param_name + edge @name -> @param.param_index + edge @param.input -> @name +} + +[ + (pattern_list (_) @pattern) + (tuple_pattern (_) @pattern) +] @list +{ + let statement_scope = @list::local_scope + let @pattern::local_scope = @pattern.pattern_before_scope + edge statement_scope -> @pattern::local_scope, "precedence" = (+ 1 (child-index @pattern)) + + edge @pattern.pattern_index -> @list.input + edge @pattern.input -> @pattern.pattern_index + attr @pattern.pattern_index "push" = (child-index @pattern) +} + +(parameters + (_) @param) @params +{ + attr @param.param_index "push" = (child-index @param) + edge @param.param_index -> @params.before_scope + edge @params.after_scope -> @param.input + edge @param.param_name -> @params.before_scope +} + +(return_statement (_) @expr) @stmt +{ + edge @stmt::function_returns -> @expr.output +} + +(class_definition + name: (identifier) @name) @class +{ + attr @name "definiens" = @class + attr @name "syntax_type" = "class" + edge @class.parent_scope -> @class::class_parent_scope + edge @class.parent_scope -> @class::local_scope + edge @class.after_scope -> @name + edge @name -> @class.call + edge @name -> @class.dot + edge @class.dot -> @class.members + edge @class.call -> @class.call_drop + edge @class.call_drop -> @class.self_scope + edge @class.self_scope -> @class.super_scope + edge @class.self_scope -> @class.self_dot + edge @class.self_dot -> @class.members + edge @class.members -> @class.member_attrs + attr @class.call "pop" = "()", "pop-scope" + attr @class.call_drop "drop" + attr @class.dot "pop" = "." + attr @class.self_dot "pop" = "." + attr @name "pop", "definition" + attr @class.member_attrs "push" = "." + attr @class.self_scope "endpoint" + let @class::super_scope = @class.super_scope + let @class::class_parent_scope = @class.parent_scope + let @class::class_self_scope = @class.call_drop + let @class::class_member_attr_scope = @class.member_attrs +} + +(class_definition + body: (block + (_) @last_stmt .) @body) @class +{ + edge @class.members -> @last_stmt.after_scope +} + +(class_definition + superclasses: (argument_list + (_) @superclass)) @class +{ + edge @class.super_scope -> @superclass.output +} + +(decorated_definition + definition: (_) @def) @stmt +{ + edge @def.before_scope -> @stmt.before_scope + edge @stmt.after_scope -> @def.after_scope +} + +(case_clause + pattern: (_) @pattern + consequence: (_) @consequence) @clause +{ + edge @consequence.before_scope -> @pattern.new_bindings + edge @consequence.before_scope -> @clause.before_scope + edge @clause.after_scope -> @consequence.after_scope +} + +;------------- +; Expressions +;------------- + +(call + function: (_) @fn + arguments: (argument_list) @args) @call +{ + edge @call.output -> @call.output_args + edge @call.output_args -> @fn.output + attr @call.output_args "push" = "()", "push-scope" = @args +} + +(call + function: (attribute + object: (_) @receiver) + arguments: (argument_list + (expression) @arg) @args) +{ + edge @args -> @arg.arg_index + edge @receiver -> @receiver.arg_index + + attr @receiver.arg_index "pop" = "0" + edge @receiver.arg_index -> @receiver.output + + attr @arg.arg_index "pop" = (+ 1 (child-index @arg)) + edge @arg.arg_index -> @arg.output +} + +(call + arguments: (argument_list + (keyword_argument + name: (identifier) @name + value: (_) @val) @arg) @args) @call +{ + edge @args -> @arg.arg_name + attr @arg.arg_name "pop" = @name + edge @arg.arg_name -> @val.output +} + +(argument_list + (expression) @arg) @args +{ + edge @args -> @arg.arg_index + attr @arg.arg_index "pop" = (child-index @arg) + edge @arg.arg_index -> @arg.output +} + +( + (call + function: (identifier) @fn-name) @call + (#eq? @fn-name "super") +) +{ + edge @call.output -> @call::super_scope +} + +[ + (tuple (_) @element) + (expression_list (_) @element) +] @tuple +{ + edge @tuple.output -> @element.el_index + attr @element.el_index "pop" = (child-index @element) + edge @element.el_index -> @element.output + + edge @tuple.new_bindings -> @element.new_bindings +} + +(attribute + object: (_) @object + attribute: (identifier) @name) @expr +{ + edge @expr.output -> @name.output + edge @name.output -> @expr.output_dot + edge @expr.output_dot -> @object.output + edge @object.input -> @expr.input_dot + edge @expr.input_dot -> @name.input + edge @name.input -> @expr.input + attr @expr.output_dot "push" = "." + attr @expr.input_dot "pop" = "." + attr @name.input "pop" + attr @name.output "push" +} + +(pattern/attribute + attribute: (identifier) @name) +{ + attr @name.input "definition" +} + +(primary_expression/attribute + attribute: (identifier) @name) +{ + attr @name.output "reference" +} + +(primary_expression/identifier) @id +{ + edge @id.output -> @id::local_scope + edge @id.output -> @id::class_parent_scope + edge @id::local_scope -> @id.input + attr @id.input "pop" + attr @id.output "push", "reference" + + attr @id.new_binding_pop "pop", "definition" + edge @id.new_bindings -> @id.new_binding_pop +} + +(pattern/identifier) @id +{ + edge @id.output -> @id::local_scope + edge @id.output -> @id::class_parent_scope + edge @id::local_scope -> @id.input, "precedence" = 1 + attr @id.input "pop", "definition" + attr @id.output "push" + + attr @id.new_binding_pop "pop", "definition" + edge @id.new_bindings -> @id.new_binding_pop +} + +(as_pattern + (expression) @value + alias: (as_pattern_target (primary_expression/identifier) @id)) @as_pattern +{ + edge @id.output -> @id::local_scope + edge @id.output -> @id::class_parent_scope + edge @id::local_scope -> @id.input, "precedence" = 1 + attr @id.input "pop", "definition" + attr @id.output "push" + + edge @as_pattern.new_bindings -> @value.new_bindings + edge @as_pattern.new_bindings -> @id.new_bindings +} + +(list) @list +{ + edge @list.output -> @list.called + edge @list.called -> @list::global_dot + attr @list.called "push" = "list" +} + +(list (_) @el) @list +{ + edge @list.new_bindings -> @el.new_bindings +} + +(dictionary (pair) @pair) @dict +{ + edge @dict.new_bindings -> @pair.new_bindings +} + +(pair + value: (_) @value) @pair +{ + edge @pair.new_bindings -> @value.new_bindings +} + +(set (_) @el) @set +{ + edge @set.new_bindings -> @el.new_bindings +} + +(list_splat (_) @splatted) @splat +{ +attr @splat.new_bindings_pop "pop" = @splatted, "definition" +edge @splat.new_bindings -> @splat.new_bindings_pop +} + +(binary_operator + (_) @left + (_) @right) @binop +{ + edge @binop.new_bindings -> @left.new_bindings + edge @binop.new_bindings -> @right.new_bindings +} + +(case_pattern (_) @expr) @pat +{ + edge @pat.new_bindings -> @expr.new_bindings +} From edfe903f0f5b976fd08d490e9ffe1925ea724ed0 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 09:42:59 +0200 Subject: [PATCH 021/202] convert: attr syntax --- .../src/stack-graphs.tsg | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 99fd0acaf..5aed50404 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -42,9 +42,9 @@ attribute node_symbol = node => symbol = (source-text node), source_n (module) @mod { var module_def = @mod.file_def - attr module_def "no_span" + attr (module_def) "no_span" var module_ref = @mod.file_ref - attr module_ref "no_span" + attr (module_ref) "no_span" var parent_module_def = module_def var parent_module_ref = module_ref var grandparent_module_ref = module_ref @@ -57,9 +57,9 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge module_ref.next_ref -> module_ref.dot edge module_ref.dot -> module_ref - attr module_def "pop" = $1 + attr (module_def) "pop" = $1 attr module_def.dot "pop" = "." - attr module_ref "push" = $1 + attr (module_ref) "push" = $1 attr module_ref.dot "push" = "." set grandparent_module_ref = parent_module_ref @@ -67,13 +67,13 @@ attribute node_symbol = node => symbol = (source-text node), source_n set parent_module_ref = module_ref set module_ref = module_ref.next_ref set module_def = module_def.next_def - attr module_def "no_span" - attr module_ref "no_span" + attr (module_def) "no_span" + attr (module_ref) "no_span" } "__init__\\.py$" { - attr parent_module_def "definition" + attr (parent_module_def) "definition" } "([^/]+)$" @@ -81,12 +81,12 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge module_def -> module_def.dot edge module_def.dot -> module_def.next_def - attr module_def "definition", "pop" = (replace $1 "\\.py" "") + attr (module_def) "definition", "pop" = (replace $1 "\\.py" "") attr module_def.dot "pop" = "." set module_def = module_def.next_def - attr module_def "no_span" - attr module_ref "no_span" + attr (module_def) "no_span" + attr (module_ref) "no_span" } } From 58c67fd2dbc806ebb331c6a26deb1f45ec1bf871 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 09:43:51 +0200 Subject: [PATCH 022/202] convert: no_span --- .../src/stack-graphs.tsg | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 5aed50404..afe702317 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -42,9 +42,9 @@ attribute node_symbol = node => symbol = (source-text node), source_n (module) @mod { var module_def = @mod.file_def - attr (module_def) "no_span" + attr (module_def) empty_source_span var module_ref = @mod.file_ref - attr (module_ref) "no_span" + attr (module_ref) empty_source_span var parent_module_def = module_def var parent_module_ref = module_ref var grandparent_module_ref = module_ref @@ -67,8 +67,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n set parent_module_ref = module_ref set module_ref = module_ref.next_ref set module_def = module_def.next_def - attr (module_def) "no_span" - attr (module_ref) "no_span" + attr (module_def) empty_source_span + attr (module_ref) empty_source_span } "__init__\\.py$" @@ -85,8 +85,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n attr module_def.dot "pop" = "." set module_def = module_def.next_def - attr (module_def) "no_span" - attr (module_ref) "no_span" + attr (module_def) empty_source_span + attr (module_ref) empty_source_span } } From a830ef55ab2b304f3d59c438d1ba1dfcf942537e Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 09:48:03 +0200 Subject: [PATCH 023/202] convert: more attr syntax --- .../src/stack-graphs.tsg | 150 +++++++++--------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index afe702317..f6d557b50 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -58,9 +58,9 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge module_ref.dot -> module_ref attr (module_def) "pop" = $1 - attr module_def.dot "pop" = "." + attr (module_def.dot) "pop" = "." attr (module_ref) "push" = $1 - attr module_ref.dot "push" = "." + attr (module_ref.dot) "push" = "." set grandparent_module_ref = parent_module_ref set parent_module_def = module_def @@ -82,7 +82,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge module_def.dot -> module_def.next_def attr (module_def) "definition", "pop" = (replace $1 "\\.py" "") - attr module_def.dot "pop" = "." + attr (module_def.dot) "pop" = "." set module_def = module_def.next_def attr (module_def) empty_source_span @@ -96,10 +96,10 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @mod.before_scope -> @mod.global_dot edge @mod.global -> root - attr @mod.global "push" = "" + attr (@mod.global) "push" = "" edge @mod.global_dot -> @mod.global - attr @mod.global_dot "push" = "." + attr (@mod.global_dot) "push" = "." var @mod::parent_module = parent_module_ref var @mod::grandparent_module = grandparent_module_ref @@ -114,8 +114,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n { edge @stmt.after_scope -> @root_name.def, "precedence" = 1 edge @root_name.ref -> root - attr @root_name.ref "push", "reference" - attr @root_name.def "pop", "definition" + attr (@root_name.ref) "push", "reference" + attr (@root_name.def) "pop", "definition" } (import_statement @@ -124,7 +124,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n { edge @stmt.after_scope -> @root_name.def edge @root_name.ref -> root - attr @root_name.ref "push", "reference" + attr (@root_name.ref) "push", "reference" } (import_from_statement @@ -132,7 +132,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n . (identifier) @prefix_root_name)) @stmt { edge @prefix_root_name.ref -> root - attr @prefix_root_name.ref "push", "reference" + attr (@prefix_root_name.ref) "push", "reference" } (import_from_statement @@ -141,9 +141,9 @@ attribute node_symbol = node => symbol = (source-text node), source_n { edge @stmt.after_scope -> @import_root_name.def, "precedence" = 1 edge @import_root_name.ref -> @import_root_name.ref_dot - attr @import_root_name.def "pop", "definition" - attr @import_root_name.ref "push", "reference" - attr @import_root_name.ref_dot "push" = "." + attr (@import_root_name.def) "pop", "definition" + attr (@import_root_name.ref) "push", "reference" + attr (@import_root_name.ref_dot) "push" = "." } (import_from_statement @@ -152,8 +152,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n . (identifier) @import_root_name))) @stmt { edge @import_root_name.ref -> @import_root_name.ref_dot - attr @import_root_name.ref "push", "reference" - attr @import_root_name.ref_dot "push" = "." + attr (@import_root_name.ref) "push", "reference" + attr (@import_root_name.ref_dot) "push" = "." } (import_from_statement @@ -186,7 +186,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n { edge @stmt.after_scope -> @alias edge @alias -> @name.ref - attr @alias "pop", "definition" + attr (@alias) "pop", "definition" } [ @@ -198,8 +198,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n (identifier) @leaf_name .)) ] { - attr @leaf_name.def "pop", "definition" - attr @leaf_name.ref "push", "reference" + attr (@leaf_name.def) "pop", "definition" + attr (@leaf_name.ref) "push", "reference" edge @leaf_name.def -> @leaf_name.ref } @@ -222,8 +222,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n (dotted_name . (identifier) @name)) { - attr @name.ref "push", "reference" - attr @name.ref_dot "push" = "." + attr (@name.ref) "push", "reference" + attr (@name.ref_dot) "push" = "." edge @name.ref -> @name.ref_dot edge @name.ref_dot -> @prefix.ref } @@ -242,8 +242,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n (identifier) @child_name)) ] { - attr @child_name.ref "push", "reference" - attr @child_name.ref_dot "push" = "." + attr (@child_name.ref) "push", "reference" + attr (@child_name.ref_dot) "push" = "." edge @child_name.ref -> @child_name.ref_dot edge @child_name.ref_dot -> @parent_name.ref } @@ -252,7 +252,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n module_name: (dotted_name . (identifier) @root_name)) { - attr @root_name.ref "push", "reference" + attr (@root_name.ref) "push", "reference" edge @root_name.ref -> root } @@ -263,7 +263,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n { edge @stmt.after_scope -> @star.ref_dot, "precedence" = 1 edge @star.ref_dot -> @leaf_name.ref - attr @star.ref_dot "push" = "." + attr (@star.ref_dot) "push" = "." } [ @@ -289,10 +289,10 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @child_name.ref_dot -> @parent_name.ref edge @parent_name.def -> @parent_name.def_dot edge @parent_name.def_dot -> @child_name.def - attr @child_name.def "pop", "definition" - attr @child_name.ref "push","reference" - attr @parent_name.def_dot "pop" = "." - attr @child_name.ref_dot "push" = "." + attr (@child_name.def) "pop", "definition" + attr (@child_name.ref) "push","reference" + attr (@parent_name.def_dot) "pop" = "." + attr (@child_name.ref_dot) "push" = "." } ;-------- @@ -398,18 +398,18 @@ attribute node_symbol = node => symbol = (source-text node), source_n parameters: (parameters) @params body: (block) @body) @func { - attr @name "definiens" = @func + attr (@name) "definiens" = @func edge @func.after_scope -> @name edge @name -> @func.call edge @func.call -> @func.return_value edge @body.before_scope -> @params.after_scope edge @body.before_scope -> @func.drop_scope edge @func.drop_scope -> @func::bottom - attr @func.drop_scope "drop" - attr @name "pop", "definition" - attr @func.call "pop" = "()", "pop-scope" - attr @params.before_scope "jump-to" - attr @func.return_value "endpoint" + attr (@func.drop_scope) "drop" + attr (@name) "pop", "definition" + attr (@func.call) "pop" = "()", "pop-scope" + attr (@params.before_scope) "jump-to" + attr (@func.return_value) "endpoint" let @func::function_returns = @func.return_value ; Prevent functions defined inside of method bodies from being treated like methods @@ -435,7 +435,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n (class_definition (block (function_definition name: (_)@name))) ] { - attr @name "syntax_type" = "method" + attr (@name) "syntax_type" = "method" } [ @@ -476,7 +476,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n (function_definition (block (function_definition name: (_)@name))) ] { - attr @name "syntax_type" = "function" + attr (@name) "syntax_type" = "function" } ;; @@ -491,13 +491,13 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @param.input -> @param::class_self_scope edge @param::class_member_attr_scope -> @param.output edge @param.output -> @body.after_scope - attr @param.output "push" + attr (@param.output) "push" } (parameter/identifier) @param { - attr @param.input "definition", "pop" - attr @param.param_name "push" + attr (@param.input) "definition", "pop" + attr (@param.param_name) "push" edge @param.input -> @param.param_index edge @param.input -> @param.param_name } @@ -511,8 +511,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n value: (_) @value) @param ] { - attr @name "definition", "pop" - attr @param.param_name "push" = @name + attr (@name) "definition", "pop" + attr (@param.param_name) "push" = @name edge @name -> @param.param_name edge @name -> @param.param_index edge @param.input -> @name @@ -528,8 +528,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n (_) @name) @param ] { - attr @name "definition", "pop" - attr @param.param_name "push" = @name + attr (@name) "definition", "pop" + attr (@param.param_name) "push" = @name edge @name -> @param.param_name edge @name -> @param.param_index edge @param.input -> @name @@ -546,13 +546,13 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @pattern.pattern_index -> @list.input edge @pattern.input -> @pattern.pattern_index - attr @pattern.pattern_index "push" = (child-index @pattern) + attr (@pattern.pattern_index) "push" = (child-index @pattern) } (parameters (_) @param) @params { - attr @param.param_index "push" = (child-index @param) + attr (@param.param_index) "push" = (child-index @param) edge @param.param_index -> @params.before_scope edge @params.after_scope -> @param.input edge @param.param_name -> @params.before_scope @@ -566,8 +566,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n (class_definition name: (identifier) @name) @class { - attr @name "definiens" = @class - attr @name "syntax_type" = "class" + attr (@name) "definiens" = @class + attr (@name) "syntax_type" = "class" edge @class.parent_scope -> @class::class_parent_scope edge @class.parent_scope -> @class::local_scope edge @class.after_scope -> @name @@ -580,13 +580,13 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @class.self_scope -> @class.self_dot edge @class.self_dot -> @class.members edge @class.members -> @class.member_attrs - attr @class.call "pop" = "()", "pop-scope" - attr @class.call_drop "drop" - attr @class.dot "pop" = "." - attr @class.self_dot "pop" = "." - attr @name "pop", "definition" - attr @class.member_attrs "push" = "." - attr @class.self_scope "endpoint" + attr (@class.call) "pop" = "()", "pop-scope" + attr (@class.call_drop) "drop" + attr (@class.dot) "pop" = "." + attr (@class.self_dot) "pop" = "." + attr (@name) "pop", "definition" + attr (@class.member_attrs) "push" = "." + attr (@class.self_scope) "endpoint" let @class::super_scope = @class.super_scope let @class::class_parent_scope = @class.parent_scope let @class::class_self_scope = @class.call_drop @@ -633,7 +633,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n { edge @call.output -> @call.output_args edge @call.output_args -> @fn.output - attr @call.output_args "push" = "()", "push-scope" = @args + attr (@call.output_args) "push" = "()", "push-scope" = @args } (call @@ -645,10 +645,10 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @args -> @arg.arg_index edge @receiver -> @receiver.arg_index - attr @receiver.arg_index "pop" = "0" + attr (@receiver.arg_index) "pop" = "0" edge @receiver.arg_index -> @receiver.output - attr @arg.arg_index "pop" = (+ 1 (child-index @arg)) + attr (@arg.arg_index) "pop" = (+ 1 (child-index @arg)) edge @arg.arg_index -> @arg.output } @@ -659,7 +659,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n value: (_) @val) @arg) @args) @call { edge @args -> @arg.arg_name - attr @arg.arg_name "pop" = @name + attr (@arg.arg_name) "pop" = @name edge @arg.arg_name -> @val.output } @@ -667,7 +667,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n (expression) @arg) @args { edge @args -> @arg.arg_index - attr @arg.arg_index "pop" = (child-index @arg) + attr (@arg.arg_index) "pop" = (child-index @arg) edge @arg.arg_index -> @arg.output } @@ -686,7 +686,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n ] @tuple { edge @tuple.output -> @element.el_index - attr @element.el_index "pop" = (child-index @element) + attr (@element.el_index) "pop" = (child-index @element) edge @element.el_index -> @element.output edge @tuple.new_bindings -> @element.new_bindings @@ -702,22 +702,22 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @object.input -> @expr.input_dot edge @expr.input_dot -> @name.input edge @name.input -> @expr.input - attr @expr.output_dot "push" = "." - attr @expr.input_dot "pop" = "." - attr @name.input "pop" - attr @name.output "push" + attr (@expr.output_dot) "push" = "." + attr (@expr.input_dot) "pop" = "." + attr (@name.input) "pop" + attr (@name.output) "push" } (pattern/attribute attribute: (identifier) @name) { - attr @name.input "definition" + attr (@name.input) "definition" } (primary_expression/attribute attribute: (identifier) @name) { - attr @name.output "reference" + attr (@name.output) "reference" } (primary_expression/identifier) @id @@ -725,10 +725,10 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @id.output -> @id::local_scope edge @id.output -> @id::class_parent_scope edge @id::local_scope -> @id.input - attr @id.input "pop" - attr @id.output "push", "reference" + attr (@id.input) "pop" + attr (@id.output) "push", "reference" - attr @id.new_binding_pop "pop", "definition" + attr (@id.new_binding_pop) "pop", "definition" edge @id.new_bindings -> @id.new_binding_pop } @@ -737,10 +737,10 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @id.output -> @id::local_scope edge @id.output -> @id::class_parent_scope edge @id::local_scope -> @id.input, "precedence" = 1 - attr @id.input "pop", "definition" - attr @id.output "push" + attr (@id.input) "pop", "definition" + attr (@id.output) "push" - attr @id.new_binding_pop "pop", "definition" + attr (@id.new_binding_pop) "pop", "definition" edge @id.new_bindings -> @id.new_binding_pop } @@ -751,8 +751,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @id.output -> @id::local_scope edge @id.output -> @id::class_parent_scope edge @id::local_scope -> @id.input, "precedence" = 1 - attr @id.input "pop", "definition" - attr @id.output "push" + attr (@id.input) "pop", "definition" + attr (@id.output) "push" edge @as_pattern.new_bindings -> @value.new_bindings edge @as_pattern.new_bindings -> @id.new_bindings @@ -762,7 +762,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n { edge @list.output -> @list.called edge @list.called -> @list::global_dot - attr @list.called "push" = "list" + attr (@list.called) "push" = "list" } (list (_) @el) @list @@ -788,7 +788,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n (list_splat (_) @splatted) @splat { -attr @splat.new_bindings_pop "pop" = @splatted, "definition" +attr (@splat.new_bindings_pop) "pop" = @splatted, "definition" edge @splat.new_bindings -> @splat.new_bindings_pop } From d5a97bd101f600745fa71c1562e9d1b1291def13 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 09:49:10 +0200 Subject: [PATCH 024/202] convert: pop_scoped_symbol --- .../src/stack-graphs.tsg | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index f6d557b50..d7b6c33ed 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -58,7 +58,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge module_ref.dot -> module_ref attr (module_def) "pop" = $1 - attr (module_def.dot) "pop" = "." + attr (module_def.dot) pop_symbol = "." attr (module_ref) "push" = $1 attr (module_ref.dot) "push" = "." @@ -82,7 +82,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge module_def.dot -> module_def.next_def attr (module_def) "definition", "pop" = (replace $1 "\\.py" "") - attr (module_def.dot) "pop" = "." + attr (module_def.dot) pop_symbol = "." set module_def = module_def.next_def attr (module_def) empty_source_span @@ -291,7 +291,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @parent_name.def_dot -> @child_name.def attr (@child_name.def) "pop", "definition" attr (@child_name.ref) "push","reference" - attr (@parent_name.def_dot) "pop" = "." + attr (@parent_name.def_dot) pop_symbol = "." attr (@child_name.ref_dot) "push" = "." } @@ -407,7 +407,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @func.drop_scope -> @func::bottom attr (@func.drop_scope) "drop" attr (@name) "pop", "definition" - attr (@func.call) "pop" = "()", "pop-scope" + attr (@func.call) pop_scoped_symbol = "()" attr (@params.before_scope) "jump-to" attr (@func.return_value) "endpoint" let @func::function_returns = @func.return_value @@ -580,10 +580,10 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @class.self_scope -> @class.self_dot edge @class.self_dot -> @class.members edge @class.members -> @class.member_attrs - attr (@class.call) "pop" = "()", "pop-scope" + attr (@class.call) pop_scoped_symbol = "()" attr (@class.call_drop) "drop" - attr (@class.dot) "pop" = "." - attr (@class.self_dot) "pop" = "." + attr (@class.dot) pop_symbol = "." + attr (@class.self_dot) pop_symbol = "." attr (@name) "pop", "definition" attr (@class.member_attrs) "push" = "." attr (@class.self_scope) "endpoint" @@ -645,7 +645,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @args -> @arg.arg_index edge @receiver -> @receiver.arg_index - attr (@receiver.arg_index) "pop" = "0" + attr (@receiver.arg_index) pop_symbol = "0" edge @receiver.arg_index -> @receiver.output attr (@arg.arg_index) "pop" = (+ 1 (child-index @arg)) @@ -703,7 +703,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @expr.input_dot -> @name.input edge @name.input -> @expr.input attr (@expr.output_dot) "push" = "." - attr (@expr.input_dot) "pop" = "." + attr (@expr.input_dot) pop_symbol = "." attr (@name.input) "pop" attr (@name.output) "push" } From 01cf05d84a85afa8d4c944c3ff4ccf01bdca22e6 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 09:50:13 +0200 Subject: [PATCH 025/202] convert: push symbol --- .../src/stack-graphs.tsg | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index d7b6c33ed..e4ef4ada4 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -60,7 +60,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n attr (module_def) "pop" = $1 attr (module_def.dot) pop_symbol = "." attr (module_ref) "push" = $1 - attr (module_ref.dot) "push" = "." + attr (module_ref.dot) push_symbol = "." set grandparent_module_ref = parent_module_ref set parent_module_def = module_def @@ -96,10 +96,10 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @mod.before_scope -> @mod.global_dot edge @mod.global -> root - attr (@mod.global) "push" = "" + attr (@mod.global) push_symbol = "" edge @mod.global_dot -> @mod.global - attr (@mod.global_dot) "push" = "." + attr (@mod.global_dot) push_symbol = "." var @mod::parent_module = parent_module_ref var @mod::grandparent_module = grandparent_module_ref @@ -143,7 +143,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @import_root_name.ref -> @import_root_name.ref_dot attr (@import_root_name.def) "pop", "definition" attr (@import_root_name.ref) "push", "reference" - attr (@import_root_name.ref_dot) "push" = "." + attr (@import_root_name.ref_dot) push_symbol = "." } (import_from_statement @@ -153,7 +153,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n { edge @import_root_name.ref -> @import_root_name.ref_dot attr (@import_root_name.ref) "push", "reference" - attr (@import_root_name.ref_dot) "push" = "." + attr (@import_root_name.ref_dot) push_symbol = "." } (import_from_statement @@ -223,7 +223,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n . (identifier) @name)) { attr (@name.ref) "push", "reference" - attr (@name.ref_dot) "push" = "." + attr (@name.ref_dot) push_symbol = "." edge @name.ref -> @name.ref_dot edge @name.ref_dot -> @prefix.ref } @@ -243,7 +243,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n ] { attr (@child_name.ref) "push", "reference" - attr (@child_name.ref_dot) "push" = "." + attr (@child_name.ref_dot) push_symbol = "." edge @child_name.ref -> @child_name.ref_dot edge @child_name.ref_dot -> @parent_name.ref } @@ -263,7 +263,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n { edge @stmt.after_scope -> @star.ref_dot, "precedence" = 1 edge @star.ref_dot -> @leaf_name.ref - attr (@star.ref_dot) "push" = "." + attr (@star.ref_dot) push_symbol = "." } [ @@ -292,7 +292,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n attr (@child_name.def) "pop", "definition" attr (@child_name.ref) "push","reference" attr (@parent_name.def_dot) pop_symbol = "." - attr (@child_name.ref_dot) "push" = "." + attr (@child_name.ref_dot) push_symbol = "." } ;-------- @@ -585,7 +585,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n attr (@class.dot) pop_symbol = "." attr (@class.self_dot) pop_symbol = "." attr (@name) "pop", "definition" - attr (@class.member_attrs) "push" = "." + attr (@class.member_attrs) push_symbol = "." attr (@class.self_scope) "endpoint" let @class::super_scope = @class.super_scope let @class::class_parent_scope = @class.parent_scope @@ -633,7 +633,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n { edge @call.output -> @call.output_args edge @call.output_args -> @fn.output - attr (@call.output_args) "push" = "()", "push-scope" = @args + attr (@call.output_args) push_scoped_symbol = "()", scope = @args } (call @@ -702,7 +702,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @object.input -> @expr.input_dot edge @expr.input_dot -> @name.input edge @name.input -> @expr.input - attr (@expr.output_dot) "push" = "." + attr (@expr.output_dot) push_symbol = "." attr (@expr.input_dot) pop_symbol = "." attr (@name.input) "pop" attr (@name.output) "push" @@ -762,7 +762,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n { edge @list.output -> @list.called edge @list.called -> @list::global_dot - attr (@list.called) "push" = "list" + attr (@list.called) push_symbol = "list" } (list (_) @el) @list From 3ab39ce7281c4a6a44c6176bde76f1b223c20bea Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 10:04:39 +0200 Subject: [PATCH 026/202] convert: push and pop nodes --- .../src/stack-graphs.tsg | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index e4ef4ada4..ee9d010eb 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -57,9 +57,9 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge module_ref.next_ref -> module_ref.dot edge module_ref.dot -> module_ref - attr (module_def) "pop" = $1 + attr (module_def) pop_symbol = $1 attr (module_def.dot) pop_symbol = "." - attr (module_ref) "push" = $1 + attr (module_ref) push_symbol = $1 attr (module_ref.dot) push_symbol = "." set grandparent_module_ref = parent_module_ref @@ -81,7 +81,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge module_def -> module_def.dot edge module_def.dot -> module_def.next_def - attr (module_def) "definition", "pop" = (replace $1 "\\.py" "") + attr (module_def) symbol_definition = (replace $1 "\\.py" ""), source_node = @mod attr (module_def.dot) pop_symbol = "." set module_def = module_def.next_def @@ -114,8 +114,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n { edge @stmt.after_scope -> @root_name.def, "precedence" = 1 edge @root_name.ref -> root - attr (@root_name.ref) "push", "reference" - attr (@root_name.def) "pop", "definition" + attr (@root_name.ref) node_reference = @root_name + attr (@root_name.def) node_definition = @root_name } (import_statement @@ -124,7 +124,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n { edge @stmt.after_scope -> @root_name.def edge @root_name.ref -> root - attr (@root_name.ref) "push", "reference" + attr (@root_name.ref) node_reference = @root_name } (import_from_statement @@ -132,7 +132,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n . (identifier) @prefix_root_name)) @stmt { edge @prefix_root_name.ref -> root - attr (@prefix_root_name.ref) "push", "reference" + attr (@prefix_root_name.ref) node_reference = @prefix_root_name } (import_from_statement @@ -141,8 +141,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n { edge @stmt.after_scope -> @import_root_name.def, "precedence" = 1 edge @import_root_name.ref -> @import_root_name.ref_dot - attr (@import_root_name.def) "pop", "definition" - attr (@import_root_name.ref) "push", "reference" + attr (@import_root_name.def) node_definition = @import_root_name + attr (@import_root_name.ref) node_reference = @import_root_name attr (@import_root_name.ref_dot) push_symbol = "." } @@ -152,7 +152,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n . (identifier) @import_root_name))) @stmt { edge @import_root_name.ref -> @import_root_name.ref_dot - attr (@import_root_name.ref) "push", "reference" + attr (@import_root_name.ref) node_reference = @import_root_name attr (@import_root_name.ref_dot) push_symbol = "." } @@ -186,7 +186,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n { edge @stmt.after_scope -> @alias edge @alias -> @name.ref - attr (@alias) "pop", "definition" + attr (@alias) node_definition = @alias } [ @@ -198,8 +198,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n (identifier) @leaf_name .)) ] { - attr (@leaf_name.def) "pop", "definition" - attr (@leaf_name.ref) "push", "reference" + attr (@leaf_name.def) node_definition = @leaf_name + attr (@leaf_name.ref) node_reference = @leaf_name edge @leaf_name.def -> @leaf_name.ref } @@ -222,7 +222,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n (dotted_name . (identifier) @name)) { - attr (@name.ref) "push", "reference" + attr (@name.ref) node_reference = @name attr (@name.ref_dot) push_symbol = "." edge @name.ref -> @name.ref_dot edge @name.ref_dot -> @prefix.ref @@ -242,7 +242,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n (identifier) @child_name)) ] { - attr (@child_name.ref) "push", "reference" + attr (@child_name.ref) node_reference = @child_name attr (@child_name.ref_dot) push_symbol = "." edge @child_name.ref -> @child_name.ref_dot edge @child_name.ref_dot -> @parent_name.ref @@ -252,7 +252,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n module_name: (dotted_name . (identifier) @root_name)) { - attr (@root_name.ref) "push", "reference" + attr (@root_name.ref) node_reference = @root_name edge @root_name.ref -> root } @@ -289,8 +289,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @child_name.ref_dot -> @parent_name.ref edge @parent_name.def -> @parent_name.def_dot edge @parent_name.def_dot -> @child_name.def - attr (@child_name.def) "pop", "definition" - attr (@child_name.ref) "push","reference" + attr (@child_name.def) node_definition = @child_name + attr (@child_name.ref) node_reference = @child_name attr (@parent_name.def_dot) pop_symbol = "." attr (@child_name.ref_dot) push_symbol = "." } @@ -406,7 +406,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @body.before_scope -> @func.drop_scope edge @func.drop_scope -> @func::bottom attr (@func.drop_scope) "drop" - attr (@name) "pop", "definition" + attr (@name) node_definition = @name attr (@func.call) pop_scoped_symbol = "()" attr (@params.before_scope) "jump-to" attr (@func.return_value) "endpoint" @@ -491,13 +491,13 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @param.input -> @param::class_self_scope edge @param::class_member_attr_scope -> @param.output edge @param.output -> @body.after_scope - attr (@param.output) "push" + attr (@param.output) push_node = @param } (parameter/identifier) @param { - attr (@param.input) "definition", "pop" - attr (@param.param_name) "push" + attr (@param.input) node_definition = @param + attr (@param.param_name) push_node = @param edge @param.input -> @param.param_index edge @param.input -> @param.param_name } @@ -511,7 +511,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n value: (_) @value) @param ] { - attr (@name) "definition", "pop" + attr (@name) node_definition = @name attr (@param.param_name) "push" = @name edge @name -> @param.param_name edge @name -> @param.param_index @@ -528,7 +528,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n (_) @name) @param ] { - attr (@name) "definition", "pop" + attr (@name) node_definition = @name attr (@param.param_name) "push" = @name edge @name -> @param.param_name edge @name -> @param.param_index @@ -584,7 +584,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n attr (@class.call_drop) "drop" attr (@class.dot) pop_symbol = "." attr (@class.self_dot) pop_symbol = "." - attr (@name) "pop", "definition" + attr (@name) node_definition = @name attr (@class.member_attrs) push_symbol = "." attr (@class.self_scope) "endpoint" let @class::super_scope = @class.super_scope @@ -704,8 +704,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @name.input -> @expr.input attr (@expr.output_dot) push_symbol = "." attr (@expr.input_dot) pop_symbol = "." - attr (@name.input) "pop" - attr (@name.output) "push" + attr (@name.input) pop_node = @name + attr (@name.output) push_node = @name } (pattern/attribute @@ -725,10 +725,10 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @id.output -> @id::local_scope edge @id.output -> @id::class_parent_scope edge @id::local_scope -> @id.input - attr (@id.input) "pop" - attr (@id.output) "push", "reference" + attr (@id.input) pop_node = @id + attr (@id.output) node_reference = @id - attr (@id.new_binding_pop) "pop", "definition" + attr (@id.new_binding_pop) node_definition = @id edge @id.new_bindings -> @id.new_binding_pop } @@ -737,10 +737,10 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @id.output -> @id::local_scope edge @id.output -> @id::class_parent_scope edge @id::local_scope -> @id.input, "precedence" = 1 - attr (@id.input) "pop", "definition" - attr (@id.output) "push" + attr (@id.input) node_definition = @id + attr (@id.output) push_node = @id - attr (@id.new_binding_pop) "pop", "definition" + attr (@id.new_binding_pop) node_definition = @id edge @id.new_bindings -> @id.new_binding_pop } @@ -751,8 +751,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @id.output -> @id::local_scope edge @id.output -> @id::class_parent_scope edge @id::local_scope -> @id.input, "precedence" = 1 - attr (@id.input) "pop", "definition" - attr (@id.output) "push" + attr (@id.input) node_definition = @id + attr (@id.output) push_node = @id edge @as_pattern.new_bindings -> @value.new_bindings edge @as_pattern.new_bindings -> @id.new_bindings From a838d6e8fab1031d5025b41d7fc6b30aec110bc1 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 10:06:08 +0200 Subject: [PATCH 027/202] convert: push and pop with explicit values --- .../src/stack-graphs.tsg | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index ee9d010eb..6f65fdfbd 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -512,7 +512,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n ] { attr (@name) node_definition = @name - attr (@param.param_name) "push" = @name + attr (@param.param_name) push_node = @name edge @name -> @param.param_name edge @name -> @param.param_index edge @param.input -> @name @@ -529,7 +529,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n ] { attr (@name) node_definition = @name - attr (@param.param_name) "push" = @name + attr (@param.param_name) push_node = @name edge @name -> @param.param_name edge @name -> @param.param_index edge @param.input -> @name @@ -546,13 +546,13 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @pattern.pattern_index -> @list.input edge @pattern.input -> @pattern.pattern_index - attr (@pattern.pattern_index) "push" = (child-index @pattern) + attr (@pattern.pattern_index) push_symbol = (child-index @pattern) } (parameters (_) @param) @params { - attr (@param.param_index) "push" = (child-index @param) + attr (@param.param_index) push_symbol = (child-index @param) edge @param.param_index -> @params.before_scope edge @params.after_scope -> @param.input edge @param.param_name -> @params.before_scope @@ -648,7 +648,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n attr (@receiver.arg_index) pop_symbol = "0" edge @receiver.arg_index -> @receiver.output - attr (@arg.arg_index) "pop" = (+ 1 (child-index @arg)) + attr (@arg.arg_index) pop_symbol = (+ 1 (child-index @arg)) edge @arg.arg_index -> @arg.output } @@ -659,7 +659,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n value: (_) @val) @arg) @args) @call { edge @args -> @arg.arg_name - attr (@arg.arg_name) "pop" = @name + attr (@arg.arg_name) pop_node = @name edge @arg.arg_name -> @val.output } @@ -667,7 +667,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n (expression) @arg) @args { edge @args -> @arg.arg_index - attr (@arg.arg_index) "pop" = (child-index @arg) + attr (@arg.arg_index) pop_symbol = (child-index @arg) edge @arg.arg_index -> @arg.output } @@ -686,7 +686,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n ] @tuple { edge @tuple.output -> @element.el_index - attr (@element.el_index) "pop" = (child-index @element) + attr (@element.el_index) pop_symbol = (child-index @element) edge @element.el_index -> @element.output edge @tuple.new_bindings -> @element.new_bindings @@ -788,7 +788,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n (list_splat (_) @splatted) @splat { -attr (@splat.new_bindings_pop) "pop" = @splatted, "definition" +attr (@splat.new_bindings_pop) node_definition = @splatted edge @splat.new_bindings -> @splat.new_bindings_pop } From b3179de0b457b539a6066ede2386fa6a4575b5eb Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 10:08:29 +0200 Subject: [PATCH 028/202] convert: more references and definitions --- .../tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 6f65fdfbd..7088f8b6f 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -73,7 +73,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n "__init__\\.py$" { - attr (parent_module_def) "definition" + attr (parent_module_def) node_definition = @mod } "([^/]+)$" @@ -711,13 +711,13 @@ attribute node_symbol = node => symbol = (source-text node), source_n (pattern/attribute attribute: (identifier) @name) { - attr (@name.input) "definition" + attr (@name.input) node_definition = @name } (primary_expression/attribute attribute: (identifier) @name) { - attr (@name.output) "reference" + attr (@name.output) node_reference = @name } (primary_expression/identifier) @id From 2f2a4ccb601ce10b1b8adc84018717bda7994e08 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 10:11:18 +0200 Subject: [PATCH 029/202] convert: edge precedence --- .../src/stack-graphs.tsg | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 7088f8b6f..b5433f967 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -112,7 +112,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n name: (dotted_name . (identifier) @root_name)) @stmt { - edge @stmt.after_scope -> @root_name.def, "precedence" = 1 + edge @stmt.after_scope -> @root_name.def + attr (@stmt.after_scope -> @root_name.def) precedence = 1 edge @root_name.ref -> root attr (@root_name.ref) node_reference = @root_name attr (@root_name.def) node_definition = @root_name @@ -139,7 +140,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n name: (dotted_name . (identifier) @import_root_name)) @stmt { - edge @stmt.after_scope -> @import_root_name.def, "precedence" = 1 + edge @stmt.after_scope -> @import_root_name.def + attr (@stmt.after_scope -> @import_root_name.def) precedence = 1 edge @import_root_name.ref -> @import_root_name.ref_dot attr (@import_root_name.def) node_definition = @import_root_name attr (@import_root_name.ref) node_reference = @import_root_name @@ -261,7 +263,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n (identifier) @leaf_name .) (wildcard_import) @star) @stmt { - edge @stmt.after_scope -> @star.ref_dot, "precedence" = 1 + edge @stmt.after_scope -> @star.ref_dot + attr (@stmt.after_scope -> @star.ref_dot) precedence = 1 edge @star.ref_dot -> @leaf_name.ref attr (@star.ref_dot) push_symbol = "." } @@ -542,7 +545,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n { let statement_scope = @list::local_scope let @pattern::local_scope = @pattern.pattern_before_scope - edge statement_scope -> @pattern::local_scope, "precedence" = (+ 1 (child-index @pattern)) + edge statement_scope -> @pattern::local_scope + attr (statement_scope -> @pattern::local_scope) precedence = (+ 1 (child-index @pattern)) edge @pattern.pattern_index -> @list.input edge @pattern.input -> @pattern.pattern_index @@ -736,7 +740,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n { edge @id.output -> @id::local_scope edge @id.output -> @id::class_parent_scope - edge @id::local_scope -> @id.input, "precedence" = 1 + edge @id::local_scope -> @id.input + attr (@id::local_scope -> @id.input) precedence = 1 attr (@id.input) node_definition = @id attr (@id.output) push_node = @id @@ -750,7 +755,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n { edge @id.output -> @id::local_scope edge @id.output -> @id::class_parent_scope - edge @id::local_scope -> @id.input, "precedence" = 1 + edge @id::local_scope -> @id.input + attr (@id::local_scope -> @id.input) precedence = 1 attr (@id.input) node_definition = @id attr (@id.output) push_node = @id From 90399c7c91aa5abb6bd16c9b27d830c4dd290b17 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 10:14:54 +0200 Subject: [PATCH 030/202] convert: drop --- .../tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index b5433f967..84e8fddb0 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -408,7 +408,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @body.before_scope -> @params.after_scope edge @body.before_scope -> @func.drop_scope edge @func.drop_scope -> @func::bottom - attr (@func.drop_scope) "drop" + attr (@func.drop_scope) type = "drop_scopes" attr (@name) node_definition = @name attr (@func.call) pop_scoped_symbol = "()" attr (@params.before_scope) "jump-to" @@ -585,7 +585,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @class.self_dot -> @class.members edge @class.members -> @class.member_attrs attr (@class.call) pop_scoped_symbol = "()" - attr (@class.call_drop) "drop" + attr (@class.call_drop) type = "drop_scopes" attr (@class.dot) pop_symbol = "." attr (@class.self_dot) pop_symbol = "." attr (@name) node_definition = @name From cfc004ad453f143d6f2e08bbe17228e5745e6d25 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 10:15:36 +0200 Subject: [PATCH 031/202] convert: endpoint --- .../tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 84e8fddb0..9b959b271 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -412,7 +412,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n attr (@name) node_definition = @name attr (@func.call) pop_scoped_symbol = "()" attr (@params.before_scope) "jump-to" - attr (@func.return_value) "endpoint" + attr (@func.return_value) is_exported let @func::function_returns = @func.return_value ; Prevent functions defined inside of method bodies from being treated like methods @@ -590,7 +590,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n attr (@class.self_dot) pop_symbol = "." attr (@name) node_definition = @name attr (@class.member_attrs) push_symbol = "." - attr (@class.self_scope) "endpoint" + attr (@class.self_scope) is_exported let @class::super_scope = @class.super_scope let @class::class_parent_scope = @class.parent_scope let @class::class_self_scope = @class.call_drop From b14aba9220314697c0c470ff97cc72b4b1a8d7a1 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 10:17:25 +0200 Subject: [PATCH 032/202] convert: definiens --- .../tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 9b959b271..fac43e2b3 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -401,7 +401,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n parameters: (parameters) @params body: (block) @body) @func { - attr (@name) "definiens" = @func + attr (@name) definiens_node = @func edge @func.after_scope -> @name edge @name -> @func.call edge @func.call -> @func.return_value @@ -570,7 +570,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n (class_definition name: (identifier) @name) @class { - attr (@name) "definiens" = @class + attr (@name) definiens_node = @class attr (@name) "syntax_type" = "class" edge @class.parent_scope -> @class::class_parent_scope edge @class.parent_scope -> @class::local_scope From 129aa5d3a651fb025139931aa290f15b92f1c8e6 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 10:18:08 +0200 Subject: [PATCH 033/202] convert: syntax type --- .../tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index fac43e2b3..d86aba3e0 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -438,7 +438,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n (class_definition (block (function_definition name: (_)@name))) ] { - attr (@name) "syntax_type" = "method" + attr (@name) syntax_type = "method" } [ @@ -479,7 +479,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n (function_definition (block (function_definition name: (_)@name))) ] { - attr (@name) "syntax_type" = "function" + attr (@name) syntax_type = "function" } ;; @@ -571,7 +571,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n name: (identifier) @name) @class { attr (@name) definiens_node = @class - attr (@name) "syntax_type" = "class" + attr (@name) syntax_type = "class" edge @class.parent_scope -> @class::class_parent_scope edge @class.parent_scope -> @class::local_scope edge @class.after_scope -> @name From dba45d9ddcc8e9bf60948f62f0ec362bf15d8014 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 10:18:54 +0200 Subject: [PATCH 034/202] convert: jump --- languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index d86aba3e0..0ddad1079 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -411,7 +411,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n attr (@func.drop_scope) type = "drop_scopes" attr (@name) node_definition = @name attr (@func.call) pop_scoped_symbol = "()" - attr (@params.before_scope) "jump-to" + edge @params.before_scope -> JUMP_TO_SCOPE_NODE attr (@func.return_value) is_exported let @func::function_returns = @func.return_value From 6bb4d577d1e811fb76204ac751fbd63db649feb0 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 15:38:22 +0200 Subject: [PATCH 035/202] convert: nodes --- .../src/stack-graphs.tsg | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 0ddad1079..1323bccba 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -36,6 +36,49 @@ attribute symbol_reference = symbol => type = "push_symbol", symbol = symbol attribute node_symbol = node => symbol = (source-text node), source_node = node +;; Nodes +;; ^^^^^ + +(_)@node { + node @node.after_scope + node @node.arg_index + node @node.arg_name + node @node.before_scope + node @node.call + node @node.call_drop + node @node.called + node @node.def + node @node.def_dot + node @node.dot + node @node.drop_scope + node @node.el_index + node @node.file_def + node @node.file_ref + node @node.global + node @node.global_dot + node @node.input + node @node.input_dot + node @node.member_attrs + node @node.members + node @node.new_binding_pop + node @node.new_bindings + node @node.new_bindings_pop + node @node.output + node @node.output_args + node @node.output_dot + node @node.param_index + node @node.param_name + node @node.parent_scope + node @node.pattern_before_scope + node @node.pattern_index + node @node.ref + node @node.ref_dot + node @node.return_value + node @node.self_dot + node @node.self_scope + node @node.super_scope +} + ; Modules and Imports ;--------------------- From da3728c74f269dd8240e45a49ad2090aa183527a Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 19:49:58 +0200 Subject: [PATCH 036/202] convert: scoped variables --- .../src/stack-graphs.tsg | 101 ++++++++++-------- 1 file changed, 58 insertions(+), 43 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 1323bccba..896ab715a 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -79,6 +79,21 @@ attribute node_symbol = node => symbol = (source-text node), source_n node @node.super_scope } +;; Inherited Variables +;; ^^^^^^^^^^^^^^^^^^^ + +inherit .bottom +inherit .class_member_attr_scope +inherit .class_parent_scope +inherit .class_self_scope +inherit .function_returns +inherit .global +inherit .global_dot +inherit .grandparent_module +inherit .local_scope +inherit .parent_module +inherit .super_scope + ; Modules and Imports ;--------------------- @@ -92,7 +107,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n var parent_module_ref = module_ref var grandparent_module_ref = module_ref - scan filepath { + scan FILE_PATH { "([^/]+)/" { edge module_def -> module_def.dot @@ -144,11 +159,11 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @mod.global_dot -> @mod.global attr (@mod.global_dot) push_symbol = "." - var @mod::parent_module = parent_module_ref - var @mod::grandparent_module = grandparent_module_ref - var @mod::bottom = @mod.after_scope - var @mod::global = @mod.global - var @mod::global_dot = @mod.global_dot + let @mod.parent_module = parent_module_ref + let @mod.grandparent_module = grandparent_module_ref + let @mod.bottom = @mod.after_scope + let @mod.global = @mod.global + let @mod.global_dot = @mod.global_dot } (import_statement @@ -252,14 +267,14 @@ attribute node_symbol = node => symbol = (source-text node), source_n (import_prefix) @prefix (#eq? @prefix ".")) @import { - edge @prefix.ref -> @import::parent_module + edge @prefix.ref -> @import.parent_module } (relative_import (import_prefix) @prefix (#eq? @prefix "..")) @import { - edge @prefix.ref -> @import::grandparent_module + edge @prefix.ref -> @import.grandparent_module } (relative_import @@ -367,7 +382,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n ] { edge @stmt.after_scope -> @stmt.before_scope - let @stmt::local_scope = @stmt.before_scope + let @stmt.local_scope = @stmt.before_scope } [ @@ -385,7 +400,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n (function_definition (block) @block) { - edge @block.before_scope -> @block::local_scope + edge @block.before_scope -> @block.local_scope } [ @@ -402,13 +417,13 @@ attribute node_symbol = node => symbol = (source-text node), source_n ]) ] @stmt { - edge @block.before_scope -> @block::local_scope + edge @block.before_scope -> @block.local_scope edge @stmt.after_scope -> @block.after_scope } (match_statement (case_clause) @block) @stmt { - let @block::local_scope = @block.before_scope + let @block.local_scope = @block.before_scope edge @block.before_scope -> @stmt.before_scope edge @stmt.after_scope -> @block.after_scope } @@ -450,17 +465,17 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @func.call -> @func.return_value edge @body.before_scope -> @params.after_scope edge @body.before_scope -> @func.drop_scope - edge @func.drop_scope -> @func::bottom + edge @func.drop_scope -> @func.bottom attr (@func.drop_scope) type = "drop_scopes" attr (@name) node_definition = @name attr (@func.call) pop_scoped_symbol = "()" edge @params.before_scope -> JUMP_TO_SCOPE_NODE attr (@func.return_value) is_exported - let @func::function_returns = @func.return_value + let @func.function_returns = @func.return_value ; Prevent functions defined inside of method bodies from being treated like methods - let @body::class_self_scope = nil - let @body::class_member_attr_scope = nil + let @body.class_self_scope = nil + let @body.class_member_attr_scope = nil } ;; @@ -534,8 +549,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n . (identifier) @param) body: (block) @body) { - edge @param.input -> @param::class_self_scope - edge @param::class_member_attr_scope -> @param.output + edge @param.input -> @param.class_self_scope + edge @param.class_member_attr_scope -> @param.output edge @param.output -> @body.after_scope attr (@param.output) push_node = @param } @@ -586,10 +601,10 @@ attribute node_symbol = node => symbol = (source-text node), source_n (tuple_pattern (_) @pattern) ] @list { - let statement_scope = @list::local_scope - let @pattern::local_scope = @pattern.pattern_before_scope - edge statement_scope -> @pattern::local_scope - attr (statement_scope -> @pattern::local_scope) precedence = (+ 1 (child-index @pattern)) + let statement_scope = @list.local_scope + let @pattern.local_scope = @pattern.pattern_before_scope + edge statement_scope -> @pattern.local_scope + attr (statement_scope -> @pattern.local_scope) precedence = (plus 1 (child-index @pattern)) edge @pattern.pattern_index -> @list.input edge @pattern.input -> @pattern.pattern_index @@ -607,7 +622,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n (return_statement (_) @expr) @stmt { - edge @stmt::function_returns -> @expr.output + edge @stmt.function_returns -> @expr.output } (class_definition @@ -615,8 +630,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n { attr (@name) definiens_node = @class attr (@name) syntax_type = "class" - edge @class.parent_scope -> @class::class_parent_scope - edge @class.parent_scope -> @class::local_scope + edge @class.parent_scope -> @class.class_parent_scope + edge @class.parent_scope -> @class.local_scope edge @class.after_scope -> @name edge @name -> @class.call edge @name -> @class.dot @@ -634,10 +649,10 @@ attribute node_symbol = node => symbol = (source-text node), source_n attr (@name) node_definition = @name attr (@class.member_attrs) push_symbol = "." attr (@class.self_scope) is_exported - let @class::super_scope = @class.super_scope - let @class::class_parent_scope = @class.parent_scope - let @class::class_self_scope = @class.call_drop - let @class::class_member_attr_scope = @class.member_attrs + let @class.super_scope = @class.super_scope + let @class.class_parent_scope = @class.parent_scope + let @class.class_self_scope = @class.call_drop + let @class.class_member_attr_scope = @class.member_attrs } (class_definition @@ -695,7 +710,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n attr (@receiver.arg_index) pop_symbol = "0" edge @receiver.arg_index -> @receiver.output - attr (@arg.arg_index) pop_symbol = (+ 1 (child-index @arg)) + attr (@arg.arg_index) pop_symbol = (plus 1 (child-index @arg)) edge @arg.arg_index -> @arg.output } @@ -724,7 +739,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n (#eq? @fn-name "super") ) { - edge @call.output -> @call::super_scope + edge @call.output -> @call.super_scope } [ @@ -769,9 +784,9 @@ attribute node_symbol = node => symbol = (source-text node), source_n (primary_expression/identifier) @id { - edge @id.output -> @id::local_scope - edge @id.output -> @id::class_parent_scope - edge @id::local_scope -> @id.input + edge @id.output -> @id.local_scope + edge @id.output -> @id.class_parent_scope + edge @id.local_scope -> @id.input attr (@id.input) pop_node = @id attr (@id.output) node_reference = @id @@ -781,10 +796,10 @@ attribute node_symbol = node => symbol = (source-text node), source_n (pattern/identifier) @id { - edge @id.output -> @id::local_scope - edge @id.output -> @id::class_parent_scope - edge @id::local_scope -> @id.input - attr (@id::local_scope -> @id.input) precedence = 1 + edge @id.output -> @id.local_scope + edge @id.output -> @id.class_parent_scope + edge @id.local_scope -> @id.input + attr (@id.local_scope -> @id.input) precedence = 1 attr (@id.input) node_definition = @id attr (@id.output) push_node = @id @@ -796,10 +811,10 @@ attribute node_symbol = node => symbol = (source-text node), source_n (expression) @value alias: (as_pattern_target (primary_expression/identifier) @id)) @as_pattern { - edge @id.output -> @id::local_scope - edge @id.output -> @id::class_parent_scope - edge @id::local_scope -> @id.input - attr (@id::local_scope -> @id.input) precedence = 1 + edge @id.output -> @id.local_scope + edge @id.output -> @id.class_parent_scope + edge @id.local_scope -> @id.input + attr (@id.local_scope -> @id.input) precedence = 1 attr (@id.input) node_definition = @id attr (@id.output) push_node = @id @@ -810,7 +825,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n (list) @list { edge @list.output -> @list.called - edge @list.called -> @list::global_dot + edge @list.called -> @list.global_dot attr (@list.called) push_symbol = "list" } From 39c262494bdf2252cda5c603918f0cec4fb72bf3 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 19:51:04 +0200 Subject: [PATCH 037/202] convert: root --- .../src/stack-graphs.tsg | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 896ab715a..8460d2527 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -148,12 +148,12 @@ inherit .super_scope } } - edge root -> @mod.file_def - edge @mod.file_ref -> root + edge ROOT_NODE -> @mod.file_def + edge @mod.file_ref -> ROOT_NODE edge module_def -> @mod.after_scope edge @mod.before_scope -> @mod.global_dot - edge @mod.global -> root + edge @mod.global -> ROOT_NODE attr (@mod.global) push_symbol = "" edge @mod.global_dot -> @mod.global @@ -172,7 +172,7 @@ inherit .super_scope { edge @stmt.after_scope -> @root_name.def attr (@stmt.after_scope -> @root_name.def) precedence = 1 - edge @root_name.ref -> root + edge @root_name.ref -> ROOT_NODE attr (@root_name.ref) node_reference = @root_name attr (@root_name.def) node_definition = @root_name } @@ -182,7 +182,7 @@ inherit .super_scope (dotted_name . (identifier) @root_name))) @stmt { edge @stmt.after_scope -> @root_name.def - edge @root_name.ref -> root + edge @root_name.ref -> ROOT_NODE attr (@root_name.ref) node_reference = @root_name } @@ -190,7 +190,7 @@ inherit .super_scope module_name: (dotted_name . (identifier) @prefix_root_name)) @stmt { - edge @prefix_root_name.ref -> root + edge @prefix_root_name.ref -> ROOT_NODE attr (@prefix_root_name.ref) node_reference = @prefix_root_name } @@ -313,7 +313,7 @@ inherit .super_scope . (identifier) @root_name)) { attr (@root_name.ref) node_reference = @root_name - edge @root_name.ref -> root + edge @root_name.ref -> ROOT_NODE } (import_from_statement From 8e05b65573ea1c148aaaaa6860105aa0440dbdd4 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 1 Jun 2023 19:53:19 +0200 Subject: [PATCH 038/202] convert: captures --- .../src/stack-graphs.tsg | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 8460d2527..3746841b7 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -188,7 +188,7 @@ inherit .super_scope (import_from_statement module_name: (dotted_name - . (identifier) @prefix_root_name)) @stmt + . (identifier) @prefix_root_name)) { edge @prefix_root_name.ref -> ROOT_NODE attr (@prefix_root_name.ref) node_reference = @prefix_root_name @@ -209,7 +209,7 @@ inherit .super_scope (import_from_statement name: (aliased_import (dotted_name - . (identifier) @import_root_name))) @stmt + . (identifier) @import_root_name))) { edge @import_root_name.ref -> @import_root_name.ref_dot attr (@import_root_name.ref) node_reference = @import_root_name @@ -474,8 +474,8 @@ inherit .super_scope let @func.function_returns = @func.return_value ; Prevent functions defined inside of method bodies from being treated like methods - let @body.class_self_scope = nil - let @body.class_member_attr_scope = nil + let @body.class_self_scope = #null + let @body.class_member_attr_scope = #null } ;; @@ -657,7 +657,7 @@ inherit .super_scope (class_definition body: (block - (_) @last_stmt .) @body) @class + (_) @last_stmt .)) @class { edge @class.members -> @last_stmt.after_scope } @@ -718,7 +718,7 @@ inherit .super_scope arguments: (argument_list (keyword_argument name: (identifier) @name - value: (_) @val) @arg) @args) @call + value: (_) @val) @arg) @args) { edge @args -> @arg.arg_name attr (@arg.arg_name) pop_node = @name @@ -735,8 +735,8 @@ inherit .super_scope ( (call - function: (identifier) @fn-name) @call - (#eq? @fn-name "super") + function: (identifier) @_fn_name) @call + (#eq? @_fn_name "super") ) { edge @call.output -> @call.super_scope From 10e33f794042323e114132de66bff03d4f4701f6 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 2 Jun 2023 10:45:13 +0200 Subject: [PATCH 039/202] convert: module ref and def --- .../src/stack-graphs.tsg | 73 +++++++++++-------- 1 file changed, 43 insertions(+), 30 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 3746841b7..019a21db6 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -100,51 +100,64 @@ inherit .super_scope (module) @mod { var module_def = @mod.file_def - attr (module_def) empty_source_span + + node parent_module_def_node + var parent_module_def = parent_module_def_node + var module_ref = @mod.file_ref - attr (module_ref) empty_source_span - var parent_module_def = module_def - var parent_module_ref = module_ref - var grandparent_module_ref = module_ref + + node parent_module_ref_node + var parent_module_ref = parent_module_ref_node + + node grandparent_module_ref_node + var grandparent_module_ref = grandparent_module_ref_node scan FILE_PATH { "([^/]+)/" { - edge module_def -> module_def.dot - edge module_def.dot -> module_def.next_def - edge module_ref.next_ref -> module_ref.dot - edge module_ref.dot -> module_ref - + node def_dot + attr (def_dot) pop_symbol = "." + node next_def + ; + edge module_def -> def_dot + edge def_dot -> next_def + ; attr (module_def) pop_symbol = $1 - attr (module_def.dot) pop_symbol = "." + ; + set parent_module_def = module_def + set module_def = next_def + + node ref_dot + attr (ref_dot) push_symbol = "." + node next_ref + ; + edge next_ref -> ref_dot + edge ref_dot -> module_ref + ; attr (module_ref) push_symbol = $1 - attr (module_ref.dot) push_symbol = "." - + ; set grandparent_module_ref = parent_module_ref - set parent_module_def = module_def set parent_module_ref = module_ref - set module_ref = module_ref.next_ref - set module_def = module_def.next_def - attr (module_def) empty_source_span - attr (module_ref) empty_source_span + set module_ref = next_ref } - "__init__\\.py$" + "__init__\.py$" { - attr (parent_module_def) node_definition = @mod + attr (parent_module_def) is_definition, source_node = @mod, empty_source_span } - "([^/]+)$" + "([^/]+)\.py$" { - edge module_def -> module_def.dot - edge module_def.dot -> module_def.next_def - - attr (module_def) symbol_definition = (replace $1 "\\.py" ""), source_node = @mod - attr (module_def.dot) pop_symbol = "." - - set module_def = module_def.next_def - attr (module_def) empty_source_span - attr (module_ref) empty_source_span + node def_dot + attr (def_dot) pop_symbol = "." + node next_def + ; + edge module_def -> def_dot + edge def_dot -> next_def + ; + attr (module_def) pop_symbol = $1, is_definition, source_node = @mod, empty_source_span + ; + set module_def = next_def } } From ff21d32e812d4343393909b087a77f355cb0cdb1 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 2 Jun 2023 10:51:30 +0200 Subject: [PATCH 040/202] convert: global/global_dot --- .../src/stack-graphs.tsg | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 019a21db6..93515f30e 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -54,8 +54,6 @@ attribute node_symbol = node => symbol = (source-text node), source_n node @node.el_index node @node.file_def node @node.file_ref - node @node.global - node @node.global_dot node @node.input node @node.input_dot node @node.member_attrs @@ -165,18 +163,21 @@ inherit .super_scope edge @mod.file_ref -> ROOT_NODE edge module_def -> @mod.after_scope - edge @mod.before_scope -> @mod.global_dot - edge @mod.global -> ROOT_NODE - attr (@mod.global) push_symbol = "" + node global + node global_dot - edge @mod.global_dot -> @mod.global - attr (@mod.global_dot) push_symbol = "." + edge @mod.before_scope -> global_dot + edge global -> ROOT_NODE + attr (global) push_symbol = "" + + edge global_dot -> global + attr (global_dot) push_symbol = "." let @mod.parent_module = parent_module_ref let @mod.grandparent_module = grandparent_module_ref let @mod.bottom = @mod.after_scope - let @mod.global = @mod.global - let @mod.global_dot = @mod.global_dot + let @mod.global = global + let @mod.global_dot = global_dot } (import_statement From fb9e45cbadb164be9562d8ee1e389bb9bdc413e7 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 2 Jun 2023 10:55:16 +0200 Subject: [PATCH 041/202] convert: syntax nodes as graph nodes --- .../src/stack-graphs.tsg | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 93515f30e..e3b54923e 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -259,8 +259,8 @@ inherit .super_scope ] @stmt { edge @stmt.after_scope -> @alias - edge @alias -> @name.ref - attr (@alias) node_definition = @alias + edge @alias.def -> @name.ref + attr (@alias.def) node_definition = @alias } [ @@ -473,15 +473,15 @@ inherit .super_scope parameters: (parameters) @params body: (block) @body) @func { - attr (@name) definiens_node = @func - edge @func.after_scope -> @name - edge @name -> @func.call + attr (@name.def) definiens_node = @func + edge @func.after_scope -> @name.def + edge @name.def -> @func.call edge @func.call -> @func.return_value edge @body.before_scope -> @params.after_scope edge @body.before_scope -> @func.drop_scope edge @func.drop_scope -> @func.bottom attr (@func.drop_scope) type = "drop_scopes" - attr (@name) node_definition = @name + attr (@name.def) node_definition = @name attr (@func.call) pop_scoped_symbol = "()" edge @params.before_scope -> JUMP_TO_SCOPE_NODE attr (@func.return_value) is_exported @@ -510,7 +510,7 @@ inherit .super_scope (class_definition (block (function_definition name: (_)@name))) ] { - attr (@name) syntax_type = "method" + attr (@name.def) syntax_type = "method" } [ @@ -551,7 +551,7 @@ inherit .super_scope (function_definition (block (function_definition name: (_)@name))) ] { - attr (@name) syntax_type = "function" + attr (@name.def) syntax_type = "function" } ;; @@ -586,12 +586,12 @@ inherit .super_scope value: (_) @value) @param ] { - attr (@name) node_definition = @name + attr (@name.def) node_definition = @name attr (@param.param_name) push_node = @name - edge @name -> @param.param_name - edge @name -> @param.param_index - edge @param.input -> @name - edge @name -> @value.output + edge @name.def -> @param.param_name + edge @name.def -> @param.param_index + edge @param.input -> @name.def + edge @name.def -> @value.output } [ @@ -603,11 +603,11 @@ inherit .super_scope (_) @name) @param ] { - attr (@name) node_definition = @name + attr (@name.def) node_definition = @name attr (@param.param_name) push_node = @name - edge @name -> @param.param_name - edge @name -> @param.param_index - edge @param.input -> @name + edge @name.def -> @param.param_name + edge @name.def -> @param.param_index + edge @param.input -> @name.def } [ @@ -642,13 +642,13 @@ inherit .super_scope (class_definition name: (identifier) @name) @class { - attr (@name) definiens_node = @class - attr (@name) syntax_type = "class" + attr (@name.def) definiens_node = @class + attr (@name.def) syntax_type = "class" edge @class.parent_scope -> @class.class_parent_scope edge @class.parent_scope -> @class.local_scope - edge @class.after_scope -> @name - edge @name -> @class.call - edge @name -> @class.dot + edge @class.after_scope -> @name.def + edge @name.def -> @class.call + edge @name.def -> @class.dot edge @class.dot -> @class.members edge @class.call -> @class.call_drop edge @class.call_drop -> @class.self_scope @@ -660,7 +660,7 @@ inherit .super_scope attr (@class.call_drop) type = "drop_scopes" attr (@class.dot) pop_symbol = "." attr (@class.self_dot) pop_symbol = "." - attr (@name) node_definition = @name + attr (@name.def) node_definition = @name attr (@class.member_attrs) push_symbol = "." attr (@class.self_scope) is_exported let @class.super_scope = @class.super_scope From e614b60205d9e2c784a33f6aa5cf0038c7d57a42 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 2 Jun 2023 10:58:43 +0200 Subject: [PATCH 042/202] convert: super scope --- .../src/stack-graphs.tsg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index e3b54923e..f9d0fc0e2 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -84,13 +84,13 @@ inherit .bottom inherit .class_member_attr_scope inherit .class_parent_scope inherit .class_self_scope +inherit .class_super_scope inherit .function_returns inherit .global inherit .global_dot inherit .grandparent_module inherit .local_scope inherit .parent_module -inherit .super_scope ; Modules and Imports ;--------------------- @@ -663,10 +663,10 @@ inherit .super_scope attr (@name.def) node_definition = @name attr (@class.member_attrs) push_symbol = "." attr (@class.self_scope) is_exported - let @class.super_scope = @class.super_scope + let @class.class_member_attr_scope = @class.member_attrs let @class.class_parent_scope = @class.parent_scope let @class.class_self_scope = @class.call_drop - let @class.class_member_attr_scope = @class.member_attrs + let @class.class_super_scope = @class.super_scope } (class_definition @@ -680,7 +680,7 @@ inherit .super_scope superclasses: (argument_list (_) @superclass)) @class { - edge @class.super_scope -> @superclass.output + edge @class.class_super_scope -> @superclass.output } (decorated_definition @@ -753,7 +753,7 @@ inherit .super_scope (#eq? @_fn_name "super") ) { - edge @call.output -> @call.super_scope + edge @call.output -> @call.class_super_scope } [ From cd0255c73212b671471152336261c96d65acb20c Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 2 Jun 2023 11:15:53 +0200 Subject: [PATCH 043/202] convert: duplicate edge --- .../tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 5 ----- 1 file changed, 5 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index f9d0fc0e2..e19ffdac0 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -407,11 +407,6 @@ inherit .parent_module edge @stmt.before_scope -> @block.before_scope } -(block (_) @stmt . ) @block -{ - edge @block.after_scope -> @stmt.after_scope -} - (function_definition (block) @block) { edge @block.before_scope -> @block.local_scope From 307e03cb757b47041fd32ac93b463b58261a3474 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 2 Jun 2023 11:17:10 +0200 Subject: [PATCH 044/202] convert: duplicate stanza --- .../tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 8 -------- 1 file changed, 8 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index e19ffdac0..91376a956 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -200,14 +200,6 @@ inherit .parent_module attr (@root_name.ref) node_reference = @root_name } -(import_from_statement - module_name: (dotted_name - . (identifier) @prefix_root_name)) -{ - edge @prefix_root_name.ref -> ROOT_NODE - attr (@prefix_root_name.ref) node_reference = @prefix_root_name -} - (import_from_statement name: (dotted_name . (identifier) @import_root_name)) @stmt From 861fbca8f7473c396251be296182d6ca45e1f1c1 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 2 Jun 2023 11:25:15 +0200 Subject: [PATCH 045/202] convert: one more syntax node used directly as grap hnode --- languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 91376a956..3083dcff6 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -250,7 +250,7 @@ inherit .parent_module alias: (identifier) @alias)) ] @stmt { - edge @stmt.after_scope -> @alias + edge @stmt.after_scope -> @alias.def edge @alias.def -> @name.ref attr (@alias.def) node_definition = @alias } From 7aa54c8bd6bac0d694527c8dc09c50ed1be76f04 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 2 Jun 2023 11:29:06 +0200 Subject: [PATCH 046/202] convert: toplevel dummy values for inherited variables --- .../tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 3083dcff6..851d358ff 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -178,6 +178,14 @@ inherit .parent_module let @mod.bottom = @mod.after_scope let @mod.global = global let @mod.global_dot = global_dot + + ;; add a dummy nodes for inherited variables + node @mod.class_member_attr_scope + node @mod.class_parent_scope + node @mod.class_self_scope + node @mod.class_super_scope + node @mod.function_returns + node @mod.local_scope } (import_statement From 1624d70afd320e5c061100a2167966ad0c76ccb9 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 2 Jun 2023 11:31:11 +0200 Subject: [PATCH 047/202] convert: duplicate attribute --- .../tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 851d358ff..63831ff7d 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -782,13 +782,13 @@ inherit .parent_module (pattern/attribute attribute: (identifier) @name) { - attr (@name.input) node_definition = @name + attr (@name.input) is_definition } (primary_expression/attribute attribute: (identifier) @name) { - attr (@name.output) node_reference = @name + attr (@name.output) is_reference } (primary_expression/identifier) @id From 5318655f366e714e085dbf5fc8818310eaea26f5 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 2 Jun 2023 11:33:55 +0200 Subject: [PATCH 048/202] convert: graph node for argument_list --- .../tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 63831ff7d..de8198d25 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -704,7 +704,7 @@ inherit .parent_module { edge @call.output -> @call.output_args edge @call.output_args -> @fn.output - attr (@call.output_args) push_scoped_symbol = "()", scope = @args + attr (@call.output_args) push_scoped_symbol = "()", scope = @args.def } (call @@ -713,7 +713,7 @@ inherit .parent_module arguments: (argument_list (expression) @arg) @args) { - edge @args -> @arg.arg_index + edge @args.def -> @arg.arg_index edge @receiver -> @receiver.arg_index attr (@receiver.arg_index) pop_symbol = "0" @@ -729,7 +729,7 @@ inherit .parent_module name: (identifier) @name value: (_) @val) @arg) @args) { - edge @args -> @arg.arg_name + edge @args.def -> @arg.arg_name attr (@arg.arg_name) pop_node = @name edge @arg.arg_name -> @val.output } @@ -737,7 +737,7 @@ inherit .parent_module (argument_list (expression) @arg) @args { - edge @args -> @arg.arg_index + edge @args.def -> @arg.arg_index attr (@arg.arg_index) pop_symbol = (child-index @arg) edge @arg.arg_index -> @arg.output } From ec0f61b6cd93232e57ccb8db0606fcf778b70b25 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 2 Jun 2023 11:34:28 +0200 Subject: [PATCH 049/202] convert: function name --- languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index de8198d25..105c576af 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -738,7 +738,7 @@ inherit .parent_module (expression) @arg) @args { edge @args.def -> @arg.arg_index - attr (@arg.arg_index) pop_symbol = (child-index @arg) + attr (@arg.arg_index) pop_symbol = (named-child-index @arg) edge @arg.arg_index -> @arg.output } From 38595361d9b6fbde5567098c98faffad26244c19 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 2 Jun 2023 11:36:01 +0200 Subject: [PATCH 050/202] convert: export scope --- languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 105c576af..d5d980e10 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -705,6 +705,7 @@ inherit .parent_module edge @call.output -> @call.output_args edge @call.output_args -> @fn.output attr (@call.output_args) push_scoped_symbol = "()", scope = @args.def + attr (@args.def) is_exported } (call From 02f4b5e56aa0a22a6aac52c77676c78057fefa5e Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 2 Jun 2023 11:37:19 +0200 Subject: [PATCH 051/202] convert: function name --- .../src/stack-graphs.tsg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index d5d980e10..8b176f66c 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -613,17 +613,17 @@ inherit .parent_module let statement_scope = @list.local_scope let @pattern.local_scope = @pattern.pattern_before_scope edge statement_scope -> @pattern.local_scope - attr (statement_scope -> @pattern.local_scope) precedence = (plus 1 (child-index @pattern)) + attr (statement_scope -> @pattern.local_scope) precedence = (plus 1 (named-child-index @pattern)) edge @pattern.pattern_index -> @list.input edge @pattern.input -> @pattern.pattern_index - attr (@pattern.pattern_index) push_symbol = (child-index @pattern) + attr (@pattern.pattern_index) push_symbol = (named-child-index @pattern) } (parameters (_) @param) @params { - attr (@param.param_index) push_symbol = (child-index @param) + attr (@param.param_index) push_symbol = (named-child-index @param) edge @param.param_index -> @params.before_scope edge @params.after_scope -> @param.input edge @param.param_name -> @params.before_scope @@ -720,7 +720,7 @@ inherit .parent_module attr (@receiver.arg_index) pop_symbol = "0" edge @receiver.arg_index -> @receiver.output - attr (@arg.arg_index) pop_symbol = (plus 1 (child-index @arg)) + attr (@arg.arg_index) pop_symbol = (plus 1 (named-child-index @arg)) edge @arg.arg_index -> @arg.output } @@ -758,7 +758,7 @@ inherit .parent_module ] @tuple { edge @tuple.output -> @element.el_index - attr (@element.el_index) pop_symbol = (child-index @element) + attr (@element.el_index) pop_symbol = (named-child-index @element) edge @element.el_index -> @element.output edge @tuple.new_bindings -> @element.new_bindings From 6e39e4a4787df62abf6d264ad2ef232209f36df2 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 2 Jun 2023 11:53:22 +0200 Subject: [PATCH 052/202] convert: argument lists --- .../src/stack-graphs.tsg | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 8b176f66c..8d1adf538 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -41,8 +41,6 @@ attribute node_symbol = node => symbol = (source-text node), source_n (_)@node { node @node.after_scope - node @node.arg_index - node @node.arg_name node @node.before_scope node @node.call node @node.call_drop @@ -702,10 +700,12 @@ inherit .parent_module function: (_) @fn arguments: (argument_list) @args) @call { + node @args.args + attr (@args.args) is_exported + edge @call.output -> @call.output_args edge @call.output_args -> @fn.output - attr (@call.output_args) push_scoped_symbol = "()", scope = @args.def - attr (@args.def) is_exported + attr (@call.output_args) push_scoped_symbol = "()", scope = @args.args } (call @@ -714,33 +714,37 @@ inherit .parent_module arguments: (argument_list (expression) @arg) @args) { - edge @args.def -> @arg.arg_index - edge @receiver -> @receiver.arg_index - - attr (@receiver.arg_index) pop_symbol = "0" - edge @receiver.arg_index -> @receiver.output + node receiver_arg_index + attr (receiver_arg_index) pop_symbol = "0" + edge @args.args -> receiver_arg_index + edge receiver_arg_index -> @receiver.output - attr (@arg.arg_index) pop_symbol = (plus 1 (named-child-index @arg)) - edge @arg.arg_index -> @arg.output + ;; FIXME the arguments will also exist with their unshifted indices because of the general + ;; rule below! + node arg_index + attr (arg_index) pop_symbol = (plus 1 (named-child-index @arg)) + edge arg_index -> @arg.output } (call arguments: (argument_list (keyword_argument name: (identifier) @name - value: (_) @val) @arg) @args) + value: (_) @val)) @args) { - edge @args.def -> @arg.arg_name - attr (@arg.arg_name) pop_node = @name - edge @arg.arg_name -> @val.output + node arg_name + edge @args.args -> arg_name + attr (arg_name) pop_node = @name + edge arg_name -> @val.output } (argument_list (expression) @arg) @args { - edge @args.def -> @arg.arg_index - attr (@arg.arg_index) pop_symbol = (named-child-index @arg) - edge @arg.arg_index -> @arg.output + node arg_index + edge @args.args -> arg_index + attr (arg_index) pop_symbol = (named-child-index @arg) + edge arg_index -> @arg.output } ( From ac61586343112446eaf3e3f1a60d6306a6402118 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 2 Jun 2023 12:19:10 +0200 Subject: [PATCH 053/202] convert: duplicate edges --- .../tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 8d1adf538..090790af3 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -213,8 +213,6 @@ inherit .parent_module edge @stmt.after_scope -> @import_root_name.def attr (@stmt.after_scope -> @import_root_name.def) precedence = 1 edge @import_root_name.ref -> @import_root_name.ref_dot - attr (@import_root_name.def) node_definition = @import_root_name - attr (@import_root_name.ref) node_reference = @import_root_name attr (@import_root_name.ref_dot) push_symbol = "." } @@ -825,12 +823,8 @@ inherit .parent_module (expression) @value alias: (as_pattern_target (primary_expression/identifier) @id)) @as_pattern { - edge @id.output -> @id.local_scope - edge @id.output -> @id.class_parent_scope - edge @id.local_scope -> @id.input attr (@id.local_scope -> @id.input) precedence = 1 - attr (@id.input) node_definition = @id - attr (@id.output) push_node = @id + attr (@id.input) is_definition edge @as_pattern.new_bindings -> @value.new_bindings edge @as_pattern.new_bindings -> @id.new_bindings From a127916f7511bac46cac77c7ab6aa108925699dd Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 2 Jun 2023 12:33:05 +0200 Subject: [PATCH 054/202] convert: duplicate edges --- languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 2 -- 1 file changed, 2 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 090790af3..1d79c8e1f 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -268,8 +268,6 @@ inherit .parent_module (identifier) @leaf_name .)) ] { - attr (@leaf_name.def) node_definition = @leaf_name - attr (@leaf_name.ref) node_reference = @leaf_name edge @leaf_name.def -> @leaf_name.ref } From 6407b1dba56dfd876827ad2b8a2fb809e39a3011 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 2 Jun 2023 12:34:46 +0200 Subject: [PATCH 055/202] convert: always create .args --- .../tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 1d79c8e1f..a88151398 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -696,9 +696,6 @@ inherit .parent_module function: (_) @fn arguments: (argument_list) @args) @call { - node @args.args - attr (@args.args) is_exported - edge @call.output -> @call.output_args edge @call.output_args -> @fn.output attr (@call.output_args) push_scoped_symbol = "()", scope = @args.args @@ -734,6 +731,11 @@ inherit .parent_module edge arg_name -> @val.output } +(argument_list) @args { + node @args.args + attr (@args.args) is_exported +} + (argument_list (expression) @arg) @args { From d5d312ecebab9f351b2727d2af93e6fe009fd0d7 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 2 Jun 2023 12:36:13 +0200 Subject: [PATCH 056/202] Enable tests --- .../test/{legacy.skip => }/aliased_imports.py | 0 .../test/{legacy.skip => }/attributes.py | 0 .../test/{legacy.skip => }/blocks.py | 0 .../test/{legacy.skip => }/chained_functions.py | 0 .../{legacy.skip/chained_methods.py => chained_methods.py.skip} | 0 .../test/{legacy.skip => }/class_members.py | 0 .../test/{legacy.skip => }/decorators.py | 0 .../test/{legacy.skip => }/exceptions.py | 0 .../test/{legacy.skip => }/functions.py | 0 .../test/{legacy.skip => }/imported_functions.py | 0 .../test/{legacy.skip => }/imports.py | 0 .../test/{legacy.skip => }/instance_members.py | 0 .../test/{legacy.skip => }/loops.py | 0 .../test/{legacy.skip => }/many_definitions.py | 0 .../test/{legacy.skip => }/pattern_matching.py | 0 .../test/{legacy.skip => }/redundant_reexport.py | 0 .../test/{legacy.skip => }/relative_imports.py | 0 .../test/{legacy.skip => }/statement_bindings.py | 0 .../test/{legacy.skip => }/superclasses.py | 0 .../test/{legacy.skip => }/test.py | 0 .../test/{legacy.skip => }/tuples.py | 0 .../test/{legacy.skip => }/wildcard_import.py | 0 22 files changed, 0 insertions(+), 0 deletions(-) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/aliased_imports.py (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/attributes.py (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/blocks.py (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/chained_functions.py (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip/chained_methods.py => chained_methods.py.skip} (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/class_members.py (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/decorators.py (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/exceptions.py (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/functions.py (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/imported_functions.py (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/imports.py (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/instance_members.py (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/loops.py (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/many_definitions.py (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/pattern_matching.py (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/redundant_reexport.py (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/relative_imports.py (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/statement_bindings.py (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/superclasses.py (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/test.py (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/tuples.py (100%) rename languages/tree-sitter-stack-graphs-python/test/{legacy.skip => }/wildcard_import.py (100%) diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/aliased_imports.py b/languages/tree-sitter-stack-graphs-python/test/aliased_imports.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/aliased_imports.py rename to languages/tree-sitter-stack-graphs-python/test/aliased_imports.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/attributes.py b/languages/tree-sitter-stack-graphs-python/test/attributes.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/attributes.py rename to languages/tree-sitter-stack-graphs-python/test/attributes.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/blocks.py b/languages/tree-sitter-stack-graphs-python/test/blocks.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/blocks.py rename to languages/tree-sitter-stack-graphs-python/test/blocks.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/chained_functions.py b/languages/tree-sitter-stack-graphs-python/test/chained_functions.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/chained_functions.py rename to languages/tree-sitter-stack-graphs-python/test/chained_functions.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/chained_methods.py b/languages/tree-sitter-stack-graphs-python/test/chained_methods.py.skip similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/chained_methods.py rename to languages/tree-sitter-stack-graphs-python/test/chained_methods.py.skip diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/class_members.py b/languages/tree-sitter-stack-graphs-python/test/class_members.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/class_members.py rename to languages/tree-sitter-stack-graphs-python/test/class_members.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/decorators.py b/languages/tree-sitter-stack-graphs-python/test/decorators.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/decorators.py rename to languages/tree-sitter-stack-graphs-python/test/decorators.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/exceptions.py b/languages/tree-sitter-stack-graphs-python/test/exceptions.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/exceptions.py rename to languages/tree-sitter-stack-graphs-python/test/exceptions.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/functions.py b/languages/tree-sitter-stack-graphs-python/test/functions.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/functions.py rename to languages/tree-sitter-stack-graphs-python/test/functions.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/imported_functions.py b/languages/tree-sitter-stack-graphs-python/test/imported_functions.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/imported_functions.py rename to languages/tree-sitter-stack-graphs-python/test/imported_functions.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/imports.py b/languages/tree-sitter-stack-graphs-python/test/imports.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/imports.py rename to languages/tree-sitter-stack-graphs-python/test/imports.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/instance_members.py b/languages/tree-sitter-stack-graphs-python/test/instance_members.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/instance_members.py rename to languages/tree-sitter-stack-graphs-python/test/instance_members.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/loops.py b/languages/tree-sitter-stack-graphs-python/test/loops.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/loops.py rename to languages/tree-sitter-stack-graphs-python/test/loops.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/many_definitions.py b/languages/tree-sitter-stack-graphs-python/test/many_definitions.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/many_definitions.py rename to languages/tree-sitter-stack-graphs-python/test/many_definitions.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/pattern_matching.py b/languages/tree-sitter-stack-graphs-python/test/pattern_matching.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/pattern_matching.py rename to languages/tree-sitter-stack-graphs-python/test/pattern_matching.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/redundant_reexport.py b/languages/tree-sitter-stack-graphs-python/test/redundant_reexport.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/redundant_reexport.py rename to languages/tree-sitter-stack-graphs-python/test/redundant_reexport.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/relative_imports.py b/languages/tree-sitter-stack-graphs-python/test/relative_imports.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/relative_imports.py rename to languages/tree-sitter-stack-graphs-python/test/relative_imports.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/statement_bindings.py b/languages/tree-sitter-stack-graphs-python/test/statement_bindings.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/statement_bindings.py rename to languages/tree-sitter-stack-graphs-python/test/statement_bindings.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/superclasses.py b/languages/tree-sitter-stack-graphs-python/test/superclasses.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/superclasses.py rename to languages/tree-sitter-stack-graphs-python/test/superclasses.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/test.py b/languages/tree-sitter-stack-graphs-python/test/test.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/test.py rename to languages/tree-sitter-stack-graphs-python/test/test.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/tuples.py b/languages/tree-sitter-stack-graphs-python/test/tuples.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/tuples.py rename to languages/tree-sitter-stack-graphs-python/test/tuples.py diff --git a/languages/tree-sitter-stack-graphs-python/test/legacy.skip/wildcard_import.py b/languages/tree-sitter-stack-graphs-python/test/wildcard_import.py similarity index 100% rename from languages/tree-sitter-stack-graphs-python/test/legacy.skip/wildcard_import.py rename to languages/tree-sitter-stack-graphs-python/test/wildcard_import.py From 8d8c7e07b4ca3e9515af1bf58c2f1e22e036e332 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 2 Jun 2023 19:06:30 +0200 Subject: [PATCH 057/202] convert: comment out syntax_type and definiens_node which are not yet supported --- .../src/stack-graphs.tsg | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index a88151398..23b69b499 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -462,7 +462,7 @@ inherit .parent_module parameters: (parameters) @params body: (block) @body) @func { - attr (@name.def) definiens_node = @func +; attr (@name.def) definiens_node = @func edge @func.after_scope -> @name.def edge @name.def -> @func.call edge @func.call -> @func.return_value @@ -495,52 +495,52 @@ inherit .parent_module ;; [ - (class_definition (block (decorated_definition (function_definition name: (_)@name)))) - (class_definition (block (function_definition name: (_)@name))) + (class_definition (block (decorated_definition (function_definition name: (_)@_name)))) + (class_definition (block (function_definition name: (_)@_name))) ] { - attr (@name.def) syntax_type = "method" +; attr (@name.def) syntax_type = "method" } [ - (module (decorated_definition (function_definition name: (_)@name))) - (module (function_definition name: (_)@name)) + (module (decorated_definition (function_definition name: (_)@_name))) + (module (function_definition name: (_)@_name)) - (if_statement (block (decorated_definition (function_definition name: (_)@name)))) - (if_statement (block (function_definition name: (_)@name))) + (if_statement (block (decorated_definition (function_definition name: (_)@_name)))) + (if_statement (block (function_definition name: (_)@_name))) - (elif_clause (block (decorated_definition (function_definition name: (_)@name)))) - (elif_clause (block (function_definition name: (_)@name))) + (elif_clause (block (decorated_definition (function_definition name: (_)@_name)))) + (elif_clause (block (function_definition name: (_)@_name))) - (else_clause (block (decorated_definition (function_definition name: (_)@name)))) - (else_clause (block (function_definition name: (_)@name))) + (else_clause (block (decorated_definition (function_definition name: (_)@_name)))) + (else_clause (block (function_definition name: (_)@_name))) - (case_clause (block (decorated_definition (function_definition name: (_)@name)))) - (case_clause (block (function_definition name: (_)@name))) + (case_clause (block (decorated_definition (function_definition name: (_)@_name)))) + (case_clause (block (function_definition name: (_)@_name))) - (for_statement (block (decorated_definition (function_definition name: (_)@name)))) - (for_statement (block (function_definition name: (_)@name))) + (for_statement (block (decorated_definition (function_definition name: (_)@_name)))) + (for_statement (block (function_definition name: (_)@_name))) - (while_statement (block (decorated_definition (function_definition name: (_)@name)))) - (while_statement (block (function_definition name: (_)@name))) + (while_statement (block (decorated_definition (function_definition name: (_)@_name)))) + (while_statement (block (function_definition name: (_)@_name))) - (try_statement (block (decorated_definition (function_definition name: (_)@name)))) - (try_statement (block (function_definition name: (_)@name))) + (try_statement (block (decorated_definition (function_definition name: (_)@_name)))) + (try_statement (block (function_definition name: (_)@_name))) - (except_clause (block (decorated_definition (function_definition name: (_)@name)))) - (except_clause (block (function_definition name: (_)@name))) + (except_clause (block (decorated_definition (function_definition name: (_)@_name)))) + (except_clause (block (function_definition name: (_)@_name))) - (finally_clause (block (decorated_definition (function_definition name: (_)@name)))) - (finally_clause (block (function_definition name: (_)@name))) + (finally_clause (block (decorated_definition (function_definition name: (_)@_name)))) + (finally_clause (block (function_definition name: (_)@_name))) - (with_statement (block (decorated_definition (function_definition name: (_)@name)))) - (with_statement (block (function_definition name: (_)@name))) + (with_statement (block (decorated_definition (function_definition name: (_)@_name)))) + (with_statement (block (function_definition name: (_)@_name))) - (function_definition (block (decorated_definition (function_definition name: (_)@name)))) - (function_definition (block (function_definition name: (_)@name))) + (function_definition (block (decorated_definition (function_definition name: (_)@_name)))) + (function_definition (block (function_definition name: (_)@_name))) ] { - attr (@name.def) syntax_type = "function" +; attr (@name.def) syntax_type = "function" } ;; @@ -631,8 +631,8 @@ inherit .parent_module (class_definition name: (identifier) @name) @class { - attr (@name.def) definiens_node = @class - attr (@name.def) syntax_type = "class" +; attr (@name.def) definiens_node = @class +; attr (@name.def) syntax_type = "class" edge @class.parent_scope -> @class.class_parent_scope edge @class.parent_scope -> @class.local_scope edge @class.after_scope -> @name.def From e44bad923c8f91e788e6a3ed18e093e6ca7f4ba4 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 15 Nov 2023 12:06:56 +0100 Subject: [PATCH 058/202] Re-enable syntax_type and definiens_node --- .../src/stack-graphs.tsg | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 23b69b499..a88151398 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -462,7 +462,7 @@ inherit .parent_module parameters: (parameters) @params body: (block) @body) @func { -; attr (@name.def) definiens_node = @func + attr (@name.def) definiens_node = @func edge @func.after_scope -> @name.def edge @name.def -> @func.call edge @func.call -> @func.return_value @@ -495,52 +495,52 @@ inherit .parent_module ;; [ - (class_definition (block (decorated_definition (function_definition name: (_)@_name)))) - (class_definition (block (function_definition name: (_)@_name))) + (class_definition (block (decorated_definition (function_definition name: (_)@name)))) + (class_definition (block (function_definition name: (_)@name))) ] { -; attr (@name.def) syntax_type = "method" + attr (@name.def) syntax_type = "method" } [ - (module (decorated_definition (function_definition name: (_)@_name))) - (module (function_definition name: (_)@_name)) + (module (decorated_definition (function_definition name: (_)@name))) + (module (function_definition name: (_)@name)) - (if_statement (block (decorated_definition (function_definition name: (_)@_name)))) - (if_statement (block (function_definition name: (_)@_name))) + (if_statement (block (decorated_definition (function_definition name: (_)@name)))) + (if_statement (block (function_definition name: (_)@name))) - (elif_clause (block (decorated_definition (function_definition name: (_)@_name)))) - (elif_clause (block (function_definition name: (_)@_name))) + (elif_clause (block (decorated_definition (function_definition name: (_)@name)))) + (elif_clause (block (function_definition name: (_)@name))) - (else_clause (block (decorated_definition (function_definition name: (_)@_name)))) - (else_clause (block (function_definition name: (_)@_name))) + (else_clause (block (decorated_definition (function_definition name: (_)@name)))) + (else_clause (block (function_definition name: (_)@name))) - (case_clause (block (decorated_definition (function_definition name: (_)@_name)))) - (case_clause (block (function_definition name: (_)@_name))) + (case_clause (block (decorated_definition (function_definition name: (_)@name)))) + (case_clause (block (function_definition name: (_)@name))) - (for_statement (block (decorated_definition (function_definition name: (_)@_name)))) - (for_statement (block (function_definition name: (_)@_name))) + (for_statement (block (decorated_definition (function_definition name: (_)@name)))) + (for_statement (block (function_definition name: (_)@name))) - (while_statement (block (decorated_definition (function_definition name: (_)@_name)))) - (while_statement (block (function_definition name: (_)@_name))) + (while_statement (block (decorated_definition (function_definition name: (_)@name)))) + (while_statement (block (function_definition name: (_)@name))) - (try_statement (block (decorated_definition (function_definition name: (_)@_name)))) - (try_statement (block (function_definition name: (_)@_name))) + (try_statement (block (decorated_definition (function_definition name: (_)@name)))) + (try_statement (block (function_definition name: (_)@name))) - (except_clause (block (decorated_definition (function_definition name: (_)@_name)))) - (except_clause (block (function_definition name: (_)@_name))) + (except_clause (block (decorated_definition (function_definition name: (_)@name)))) + (except_clause (block (function_definition name: (_)@name))) - (finally_clause (block (decorated_definition (function_definition name: (_)@_name)))) - (finally_clause (block (function_definition name: (_)@_name))) + (finally_clause (block (decorated_definition (function_definition name: (_)@name)))) + (finally_clause (block (function_definition name: (_)@name))) - (with_statement (block (decorated_definition (function_definition name: (_)@_name)))) - (with_statement (block (function_definition name: (_)@_name))) + (with_statement (block (decorated_definition (function_definition name: (_)@name)))) + (with_statement (block (function_definition name: (_)@name))) - (function_definition (block (decorated_definition (function_definition name: (_)@_name)))) - (function_definition (block (function_definition name: (_)@_name))) + (function_definition (block (decorated_definition (function_definition name: (_)@name)))) + (function_definition (block (function_definition name: (_)@name))) ] { -; attr (@name.def) syntax_type = "function" + attr (@name.def) syntax_type = "function" } ;; @@ -631,8 +631,8 @@ inherit .parent_module (class_definition name: (identifier) @name) @class { -; attr (@name.def) definiens_node = @class -; attr (@name.def) syntax_type = "class" + attr (@name.def) definiens_node = @class + attr (@name.def) syntax_type = "class" edge @class.parent_scope -> @class.class_parent_scope edge @class.parent_scope -> @class.local_scope edge @class.after_scope -> @name.def From 5a63def5d66fd5ef048d219f3abf3525dbc7e380 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 15 Nov 2023 12:07:26 +0100 Subject: [PATCH 059/202] Don't crash visualization on self edges --- stack-graphs/src/visualization/visualization.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/stack-graphs/src/visualization/visualization.js b/stack-graphs/src/visualization/visualization.js index 116850791..6fdab1ef6 100644 --- a/stack-graphs/src/visualization/visualization.js +++ b/stack-graphs/src/visualization/visualization.js @@ -24,6 +24,7 @@ class StackGraph { this.graph = graph; this.paths = paths; + this.cleanup_data(); this.compute_data(); this.current_node = null; @@ -33,6 +34,19 @@ class StackGraph { this.render(); } + cleanup_data() { + let idx = 0; + while (idx < this.graph.edges.length) { + let edge = this.graph.edges[idx]; + if (edge.source.file === edge.sink.file && edge.source.local_id === edge.sink.local_id) { + console.log("ignoring self loop", edge); + this.graph.edges.splice(idx, 1); + } else { + idx += 1; + } + } + } + compute_data() { this.F = {}; this.ID = {}; @@ -47,7 +61,6 @@ class StackGraph { const file = graph.files[i]; this.F[file] = i; } - console.log(this.F); } compute_node_data() { From fe70ba08f34bfec2aa9cb485117ba4ceb827fc65 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 15 Nov 2023 12:21:09 +0100 Subject: [PATCH 060/202] Cleanup accidental self loop --- .../src/stack-graphs.tsg | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index a88151398..d538431b0 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -64,7 +64,6 @@ attribute node_symbol = node => symbol = (source-text node), source_n node @node.output_dot node @node.param_index node @node.param_name - node @node.parent_scope node @node.pattern_before_scope node @node.pattern_index node @node.ref @@ -633,8 +632,6 @@ inherit .parent_module { attr (@name.def) definiens_node = @class attr (@name.def) syntax_type = "class" - edge @class.parent_scope -> @class.class_parent_scope - edge @class.parent_scope -> @class.local_scope edge @class.after_scope -> @name.def edge @name.def -> @class.call edge @name.def -> @class.dot @@ -652,10 +649,17 @@ inherit .parent_module attr (@name.def) node_definition = @name attr (@class.member_attrs) push_symbol = "." attr (@class.self_scope) is_exported - let @class.class_member_attr_scope = @class.member_attrs - let @class.class_parent_scope = @class.parent_scope - let @class.class_self_scope = @class.call_drop - let @class.class_super_scope = @class.super_scope +} + +(class_definition + body: (_) @body) @class +{ + let @body.class_member_attr_scope = @class.member_attrs + node @body.class_parent_scope + edge @body.class_parent_scope -> @class.class_parent_scope + edge @body.class_parent_scope -> @class.local_scope + let @body.class_self_scope = @class.call_drop + let @body.class_super_scope = @class.super_scope } (class_definition @@ -669,7 +673,7 @@ inherit .parent_module superclasses: (argument_list (_) @superclass)) @class { - edge @class.class_super_scope -> @superclass.output + edge @class.super_scope -> @superclass.output } (decorated_definition From dbfb1720f2347ba6afb38cab6c27402c2d10bca1 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 15 Nov 2023 12:40:08 +0100 Subject: [PATCH 061/202] Fix module start lines and do not expect definitions at assertion position --- .../test/aliased_imports.py | 2 +- .../tree-sitter-stack-graphs-python/test/imports.py | 10 +++++----- .../test/relative_imports.py | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/test/aliased_imports.py b/languages/tree-sitter-stack-graphs-python/test/aliased_imports.py index d988757a5..0373a33be 100644 --- a/languages/tree-sitter-stack-graphs-python/test/aliased_imports.py +++ b/languages/tree-sitter-stack-graphs-python/test/aliased_imports.py @@ -24,7 +24,7 @@ class D: # ^ defined: print f.B -# ^ defined: 2, 15 +# ^ defined: 3, 15 # ^ defined: 7 print foo diff --git a/languages/tree-sitter-stack-graphs-python/test/imports.py b/languages/tree-sitter-stack-graphs-python/test/imports.py index 2f21795da..96d561813 100644 --- a/languages/tree-sitter-stack-graphs-python/test/imports.py +++ b/languages/tree-sitter-stack-graphs-python/test/imports.py @@ -15,17 +15,17 @@ #------ path: main.py -------------# from one.two import d, e.c -# ^ defined: 2 -# ^ defined: 6, 17 -# ^ defined: 4, 8, 17 +# ^ defined: 3 +# ^ defined: 6 +# ^ defined: 4, 8 import three -# ^ defined: 11, 22 +# ^ defined: 12 print(d, e.c) # ^ defined: 6, 17 # ^ defined: 4, 17 print three.f -# ^ defined: 11, 22 +# ^ defined: 12, 22 # ^ defined: 13 diff --git a/languages/tree-sitter-stack-graphs-python/test/relative_imports.py b/languages/tree-sitter-stack-graphs-python/test/relative_imports.py index 2d6e14eb4..f14571575 100644 --- a/languages/tree-sitter-stack-graphs-python/test/relative_imports.py +++ b/languages/tree-sitter-stack-graphs-python/test/relative_imports.py @@ -6,7 +6,7 @@ from ..c.d import D print a.A -# ^ defined: 3, 24 +# ^ defined: 3, 25 # ^ defined: 26 print B.bee @@ -52,9 +52,9 @@ class D: # module from .g import G -# ^ defined: 49, 54 +# ^ defined: 49 from ..c import see -# ^ defined: 37, 57 +# ^ defined: 37 E = 1 From 2d8fd6bf0a9fd064782a8a4900d4b75276de9772 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 15 Nov 2023 12:47:47 +0100 Subject: [PATCH 062/202] Factor out identifier rules --- .../src/stack-graphs.tsg | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index d538431b0..80a0a2625 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -192,17 +192,13 @@ inherit .parent_module edge @stmt.after_scope -> @root_name.def attr (@stmt.after_scope -> @root_name.def) precedence = 1 edge @root_name.ref -> ROOT_NODE - attr (@root_name.ref) node_reference = @root_name - attr (@root_name.def) node_definition = @root_name } (import_statement name: (aliased_import - (dotted_name . (identifier) @root_name))) @stmt + (dotted_name . (identifier) @root_name))) { - edge @stmt.after_scope -> @root_name.def edge @root_name.ref -> ROOT_NODE - attr (@root_name.ref) node_reference = @root_name } (import_from_statement @@ -221,7 +217,6 @@ inherit .parent_module . (identifier) @import_root_name))) { edge @import_root_name.ref -> @import_root_name.ref_dot - attr (@import_root_name.ref) node_reference = @import_root_name attr (@import_root_name.ref_dot) push_symbol = "." } @@ -255,7 +250,6 @@ inherit .parent_module { edge @stmt.after_scope -> @alias.def edge @alias.def -> @name.ref - attr (@alias.def) node_definition = @alias } [ @@ -289,7 +283,6 @@ inherit .parent_module (dotted_name . (identifier) @name)) { - attr (@name.ref) node_reference = @name attr (@name.ref_dot) push_symbol = "." edge @name.ref -> @name.ref_dot edge @name.ref_dot -> @prefix.ref @@ -309,7 +302,6 @@ inherit .parent_module (identifier) @child_name)) ] { - attr (@child_name.ref) node_reference = @child_name attr (@child_name.ref_dot) push_symbol = "." edge @child_name.ref -> @child_name.ref_dot edge @child_name.ref_dot -> @parent_name.ref @@ -319,7 +311,6 @@ inherit .parent_module module_name: (dotted_name . (identifier) @root_name)) { - attr (@root_name.ref) node_reference = @root_name edge @root_name.ref -> ROOT_NODE } @@ -357,8 +348,6 @@ inherit .parent_module edge @child_name.ref_dot -> @parent_name.ref edge @parent_name.def -> @parent_name.def_dot edge @parent_name.def_dot -> @child_name.def - attr (@child_name.def) node_definition = @child_name - attr (@child_name.ref) node_reference = @child_name attr (@parent_name.def_dot) pop_symbol = "." attr (@child_name.ref_dot) push_symbol = "." } @@ -442,6 +431,10 @@ inherit .parent_module ; Definitions ;------------- +(identifier) @name { + attr (@name.def) node_definition = @name +} + [ (assignment left: (_) @pattern @@ -469,7 +462,6 @@ inherit .parent_module edge @body.before_scope -> @func.drop_scope edge @func.drop_scope -> @func.bottom attr (@func.drop_scope) type = "drop_scopes" - attr (@name.def) node_definition = @name attr (@func.call) pop_scoped_symbol = "()" edge @params.before_scope -> JUMP_TO_SCOPE_NODE attr (@func.return_value) is_exported @@ -574,7 +566,6 @@ inherit .parent_module value: (_) @value) @param ] { - attr (@name.def) node_definition = @name attr (@param.param_name) push_node = @name edge @name.def -> @param.param_name edge @name.def -> @param.param_index @@ -591,7 +582,6 @@ inherit .parent_module (_) @name) @param ] { - attr (@name.def) node_definition = @name attr (@param.param_name) push_node = @name edge @name.def -> @param.param_name edge @name.def -> @param.param_index @@ -646,7 +636,6 @@ inherit .parent_module attr (@class.call_drop) type = "drop_scopes" attr (@class.dot) pop_symbol = "." attr (@class.self_dot) pop_symbol = "." - attr (@name.def) node_definition = @name attr (@class.member_attrs) push_symbol = "." attr (@class.self_scope) is_exported } @@ -696,6 +685,10 @@ inherit .parent_module ; Expressions ;------------- +(identifier) @name { + attr (@name.ref) node_reference = @name +} + (call function: (_) @fn arguments: (argument_list) @args) @call From fd57fbd4b462d82889464984b1e9fdecd974f668 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 15 Nov 2023 13:07:03 +0100 Subject: [PATCH 063/202] Add bug test --- .../relative_import_resolves_to_itself.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 languages/tree-sitter-stack-graphs-python/test/bugs.skip/relative_import_resolves_to_itself.py diff --git a/languages/tree-sitter-stack-graphs-python/test/bugs.skip/relative_import_resolves_to_itself.py b/languages/tree-sitter-stack-graphs-python/test/bugs.skip/relative_import_resolves_to_itself.py new file mode 100644 index 000000000..838595ab7 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/bugs.skip/relative_import_resolves_to_itself.py @@ -0,0 +1,14 @@ +#--- path: a/__init__.py ---# +from . import b +# ^ defined: 6 + +#--- path: a/b/__init__.py ---# +B = 'b' + +#--- path: main.py ---# +from a import b +# ^ defined: 6 + +print b.B +# ^ defined: 9, 6 +# ^ defined: 6 \ No newline at end of file From 2f619fa3d72524bca0d7eb64db37596d01eed036 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 15 Nov 2023 13:10:20 +0100 Subject: [PATCH 064/202] Fix Python grammar versions --- languages/tree-sitter-stack-graphs-python/Cargo.toml | 2 +- tree-sitter-stack-graphs/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/Cargo.toml b/languages/tree-sitter-stack-graphs-python/Cargo.toml index 9270879c0..ca123cc0f 100644 --- a/languages/tree-sitter-stack-graphs-python/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-python/Cargo.toml @@ -31,7 +31,7 @@ cli = ["anyhow", "clap", "tree-sitter-stack-graphs/cli"] anyhow = { version = "1.0", optional = true } clap = { version = "4", optional = true, features = ["derive"] } tree-sitter-stack-graphs = { version = "0.7", path = "../../tree-sitter-stack-graphs" } -tree-sitter-python = "0.20.2" +tree-sitter-python = "=0.20.2" [dev-dependencies] anyhow = "1.0" diff --git a/tree-sitter-stack-graphs/Cargo.toml b/tree-sitter-stack-graphs/Cargo.toml index 2de26a86f..d5429304a 100644 --- a/tree-sitter-stack-graphs/Cargo.toml +++ b/tree-sitter-stack-graphs/Cargo.toml @@ -82,4 +82,4 @@ walkdir = { version = "2.3", optional = true } [dev-dependencies] pretty_assertions = "0.7" -tree-sitter-python = "0.19.1" +tree-sitter-python = "=0.19.1" From aae723f0fdf97678224fe91c63542edbe9391054 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 15 Nov 2023 14:18:43 +0100 Subject: [PATCH 065/202] Remove obsolete nodes because of general identifier rules --- .../tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 80a0a2625..945428672 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -56,7 +56,6 @@ attribute node_symbol = node => symbol = (source-text node), source_n node @node.input_dot node @node.member_attrs node @node.members - node @node.new_binding_pop node @node.new_bindings node @node.new_bindings_pop node @node.output @@ -799,8 +798,7 @@ inherit .parent_module attr (@id.input) pop_node = @id attr (@id.output) node_reference = @id - attr (@id.new_binding_pop) node_definition = @id - edge @id.new_bindings -> @id.new_binding_pop + edge @id.new_bindings -> @id.def } (pattern/identifier) @id @@ -812,8 +810,7 @@ inherit .parent_module attr (@id.input) node_definition = @id attr (@id.output) push_node = @id - attr (@id.new_binding_pop) node_definition = @id - edge @id.new_bindings -> @id.new_binding_pop + edge @id.new_bindings -> @id.def } (as_pattern From 0b54f6c38a1c031a70c8bdc7aebea59608bd91fc Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 15 Nov 2023 14:30:28 +0100 Subject: [PATCH 066/202] Fix rule to make it similar to others --- languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 945428672..b1845109c 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -854,8 +854,7 @@ inherit .parent_module (list_splat (_) @splatted) @splat { -attr (@splat.new_bindings_pop) node_definition = @splatted -edge @splat.new_bindings -> @splat.new_bindings_pop + edge @splat.new_bindings -> @splatted.new_bindings } (binary_operator From a899983928d3a0be7bae4fcbfce86ae3b9204e6f Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 15 Nov 2023 16:45:48 +0100 Subject: [PATCH 067/202] Reuse general definition for parameters --- .../src/stack-graphs.tsg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index b1845109c..f86683c8c 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -542,18 +542,18 @@ inherit .parent_module . (identifier) @param) body: (block) @body) { - edge @param.input -> @param.class_self_scope + edge @param.def -> @param.class_self_scope edge @param.class_member_attr_scope -> @param.output edge @param.output -> @body.after_scope attr (@param.output) push_node = @param } -(parameter/identifier) @param +(parameter/identifier) @param @name { - attr (@param.input) node_definition = @param attr (@param.param_name) push_node = @param - edge @param.input -> @param.param_index - edge @param.input -> @param.param_name + edge @name.def -> @param.param_name + edge @name.def -> @param.param_index + edge @param.input -> @name.def } [ From 1668eece08d779b5083e319687f65976d1eb27b2 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 15 Nov 2023 17:01:07 +0100 Subject: [PATCH 068/202] Lower .before_scope and .after_scope --- .../src/stack-graphs.tsg | 56 ++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index f86683c8c..588f7bcf4 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -39,9 +39,63 @@ attribute node_symbol = node => symbol = (source-text node), source_n ;; Nodes ;; ^^^^^ -(_)@node { +(module) @node { + node @node.after_scope + node @node.before_scope +} + +[ + ; _simple_statement + (future_import_statement) + (import_statement) + (import_from_statement) + (print_statement) + (assert_statement) + (expression_statement) + (return_statement) + (delete_statement) + (raise_statement) + (pass_statement) + (break_statement) + (continue_statement) + (global_statement) + (nonlocal_statement) + (exec_statement) + ; _compund_statement + (if_statement) + (for_statement) + (while_statement) + (try_statement) + (with_statement) + (function_definition) + (class_definition) + (decorated_definition) + (match_statement) + ; block + (block) + ; statement clauses + (elif_clause) + (else_clause) + (case_clause) + (except_clause) + (finally_clause) + (with_clause) +] @node { node @node.after_scope node @node.before_scope +} + +(parameters) @node { + node @node.after_scope + node @node.before_scope +} + +(comment) @node { + node @node.after_scope + node @node.before_scope +} + +(_)@node { node @node.call node @node.call_drop node @node.called From e1a0dcfe805205439b02d7df6258d8c0a1993eea Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 15 Nov 2023 17:06:15 +0100 Subject: [PATCH 069/202] Lower .input and .output --- .../src/stack-graphs.tsg | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 588f7bcf4..740f08233 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -90,9 +90,24 @@ attribute node_symbol = node => symbol = (source-text node), source_n node @node.before_scope } +[ + (identifier) + (expression) + (expression_list) + (primary_expression) + (pattern) + (pattern_list) + (parameter) +] @node { + node @node.input + node @node.output +} + (comment) @node { node @node.after_scope node @node.before_scope + node @node.input + node @node.output } (_)@node { @@ -106,13 +121,11 @@ attribute node_symbol = node => symbol = (source-text node), source_n node @node.el_index node @node.file_def node @node.file_ref - node @node.input node @node.input_dot node @node.member_attrs node @node.members node @node.new_bindings node @node.new_bindings_pop - node @node.output node @node.output_args node @node.output_dot node @node.param_index From 94365dcac5aed77022178c1038f393997a7b10e9 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 15 Nov 2023 17:13:25 +0100 Subject: [PATCH 070/202] Lower more nodes --- .../src/stack-graphs.tsg | 50 ++++++++++++------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 740f08233..424cb2349 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -92,6 +92,18 @@ attribute node_symbol = node => symbol = (source-text node), source_n [ (identifier) + (import_prefix) + (wildcard_import) +] @node { + node @node.def + node @node.def_dot + node @node.ref + node @node.ref_dot +} + +[ + (identifier) + (wildcard_import) (expression) (expression_list) (primary_expression) @@ -106,34 +118,30 @@ attribute node_symbol = node => symbol = (source-text node), source_n (comment) @node { node @node.after_scope node @node.before_scope + node @node.def + node @node.def_dot node @node.input node @node.output + node @node.ref + node @node.ref_dot } (_)@node { node @node.call node @node.call_drop node @node.called - node @node.def - node @node.def_dot node @node.dot node @node.drop_scope node @node.el_index - node @node.file_def - node @node.file_ref - node @node.input_dot node @node.member_attrs node @node.members node @node.new_bindings node @node.new_bindings_pop node @node.output_args - node @node.output_dot node @node.param_index node @node.param_name node @node.pattern_before_scope node @node.pattern_index - node @node.ref - node @node.ref_dot node @node.return_value node @node.self_dot node @node.self_scope @@ -160,12 +168,15 @@ inherit .parent_module (module) @mod { - var module_def = @mod.file_def + node mod_file_def + node mod_file_ref + + var module_def = mod_file_def node parent_module_def_node var parent_module_def = parent_module_def_node - var module_ref = @mod.file_ref + var module_ref = mod_file_ref node parent_module_ref_node var parent_module_ref = parent_module_ref_node @@ -222,8 +233,8 @@ inherit .parent_module } } - edge ROOT_NODE -> @mod.file_def - edge @mod.file_ref -> ROOT_NODE + edge ROOT_NODE -> mod_file_def + edge mod_file_ref -> ROOT_NODE edge module_def -> @mod.after_scope node global @@ -833,14 +844,17 @@ inherit .parent_module object: (_) @object attribute: (identifier) @name) @expr { + node input_dot + node output_dot + edge @expr.output -> @name.output - edge @name.output -> @expr.output_dot - edge @expr.output_dot -> @object.output - edge @object.input -> @expr.input_dot - edge @expr.input_dot -> @name.input + edge @name.output -> output_dot + edge output_dot -> @object.output + edge @object.input -> input_dot + edge input_dot -> @name.input edge @name.input -> @expr.input - attr (@expr.output_dot) push_symbol = "." - attr (@expr.input_dot) pop_symbol = "." + attr (output_dot) push_symbol = "." + attr (input_dot) pop_symbol = "." attr (@name.input) pop_node = @name attr (@name.output) push_node = @name } From bb0f034ed92ec2d082ad211a7b7333e41ebe0a3b Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 15 Nov 2023 17:34:48 +0100 Subject: [PATCH 071/202] Lower final set of nodes --- .../src/stack-graphs.tsg | 123 ++++++++++-------- 1 file changed, 68 insertions(+), 55 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 424cb2349..0028994c2 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -109,9 +109,16 @@ attribute node_symbol = node => symbol = (source-text node), source_n (primary_expression) (pattern) (pattern_list) + (case_pattern) (parameter) + (pair) + (list_splat) + (parenthesized_list_splat) + (dictionary_splat) + (keyword_argument) ] @node { node @node.input + node @node.new_bindings node @node.output } @@ -121,33 +128,12 @@ attribute node_symbol = node => symbol = (source-text node), source_n node @node.def node @node.def_dot node @node.input + node @node.new_bindings node @node.output node @node.ref node @node.ref_dot } -(_)@node { - node @node.call - node @node.call_drop - node @node.called - node @node.dot - node @node.drop_scope - node @node.el_index - node @node.member_attrs - node @node.members - node @node.new_bindings - node @node.new_bindings_pop - node @node.output_args - node @node.param_index - node @node.param_name - node @node.pattern_before_scope - node @node.pattern_index - node @node.return_value - node @node.self_dot - node @node.self_scope - node @node.super_scope -} - ;; Inherited Variables ;; ^^^^^^^^^^^^^^^^^^^ @@ -531,18 +517,22 @@ inherit .parent_module parameters: (parameters) @params body: (block) @body) @func { + node call + node drop_scope + node return_value + attr (@name.def) definiens_node = @func edge @func.after_scope -> @name.def - edge @name.def -> @func.call - edge @func.call -> @func.return_value + edge @name.def -> call + edge call -> return_value edge @body.before_scope -> @params.after_scope - edge @body.before_scope -> @func.drop_scope - edge @func.drop_scope -> @func.bottom - attr (@func.drop_scope) type = "drop_scopes" - attr (@func.call) pop_scoped_symbol = "()" + edge @body.before_scope -> drop_scope + edge drop_scope -> @func.bottom + attr (drop_scope) type = "drop_scopes" + attr (call) pop_scoped_symbol = "()" edge @params.before_scope -> JUMP_TO_SCOPE_NODE - attr (@func.return_value) is_exported - let @func.function_returns = @func.return_value + attr (return_value) is_exported + let @func.function_returns = return_value ; Prevent functions defined inside of method bodies from being treated like methods let @body.class_self_scope = #null @@ -670,19 +660,24 @@ inherit .parent_module (tuple_pattern (_) @pattern) ] @list { + node pattern_index + let statement_scope = @list.local_scope - let @pattern.local_scope = @pattern.pattern_before_scope + node @pattern.local_scope edge statement_scope -> @pattern.local_scope attr (statement_scope -> @pattern.local_scope) precedence = (plus 1 (named-child-index @pattern)) - edge @pattern.pattern_index -> @list.input - edge @pattern.input -> @pattern.pattern_index - attr (@pattern.pattern_index) push_symbol = (named-child-index @pattern) + edge pattern_index -> @list.input + edge @pattern.input -> pattern_index + attr (pattern_index) push_symbol = (named-child-index @pattern) } (parameters (_) @param) @params { + node @param.param_index + node @param.param_name + attr (@param.param_index) push_symbol = (named-child-index @param) edge @param.param_index -> @params.before_scope edge @params.after_scope -> @param.input @@ -694,27 +689,39 @@ inherit .parent_module edge @stmt.function_returns -> @expr.output } +(class_definition) @class { + node @class.call_drop + node @class.member_attrs + node @class.members + node @class.super_scope +} + (class_definition name: (identifier) @name) @class { + node call + node self_dot + node self_scope + node members_dot + attr (@name.def) definiens_node = @class attr (@name.def) syntax_type = "class" edge @class.after_scope -> @name.def - edge @name.def -> @class.call - edge @name.def -> @class.dot - edge @class.dot -> @class.members - edge @class.call -> @class.call_drop - edge @class.call_drop -> @class.self_scope - edge @class.self_scope -> @class.super_scope - edge @class.self_scope -> @class.self_dot - edge @class.self_dot -> @class.members + edge @name.def -> call + edge @name.def -> members_dot + edge members_dot -> @class.members + edge call -> @class.call_drop + edge @class.call_drop -> self_scope + edge self_scope -> @class.super_scope + edge self_scope -> self_dot + edge self_dot -> @class.members edge @class.members -> @class.member_attrs - attr (@class.call) pop_scoped_symbol = "()" + attr (call) pop_scoped_symbol = "()" attr (@class.call_drop) type = "drop_scopes" - attr (@class.dot) pop_symbol = "." - attr (@class.self_dot) pop_symbol = "." + attr (members_dot) pop_symbol = "." + attr (self_dot) pop_symbol = "." attr (@class.member_attrs) push_symbol = "." - attr (@class.self_scope) is_exported + attr (self_scope) is_exported } (class_definition @@ -770,9 +777,11 @@ inherit .parent_module function: (_) @fn arguments: (argument_list) @args) @call { - edge @call.output -> @call.output_args - edge @call.output_args -> @fn.output - attr (@call.output_args) push_scoped_symbol = "()", scope = @args.args + node output_args + + edge @call.output -> output_args + edge output_args -> @fn.output + attr (output_args) push_scoped_symbol = "()", scope = @args.args } (call @@ -833,9 +842,11 @@ inherit .parent_module (expression_list (_) @element) ] @tuple { - edge @tuple.output -> @element.el_index - attr (@element.el_index) pop_symbol = (named-child-index @element) - edge @element.el_index -> @element.output + node el_index + + edge @tuple.output -> el_index + attr (el_index) pop_symbol = (named-child-index @element) + edge el_index -> @element.output edge @tuple.new_bindings -> @element.new_bindings } @@ -907,9 +918,11 @@ inherit .parent_module (list) @list { - edge @list.output -> @list.called - edge @list.called -> @list.global_dot - attr (@list.called) push_symbol = "list" + node called + + edge @list.output -> called + edge called -> @list.global_dot + attr (called) push_symbol = "list" } (list (_) @el) @list From d15cb9b23403907611a093e82e84f4061a7e0c19 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 17 Nov 2023 12:15:55 +0100 Subject: [PATCH 072/202] Add tests --- .../relative_import_resolves_to_itself.py | 14 -------------- .../imports/import_from_module_a_submodule.py | 14 ++++++++++++++ .../test/imports/import_from_module_a_value.py | 13 +++++++++++++ .../import_from_module_a_value_aliased.py | 13 +++++++++++++ .../imports/import_from_module_wildcard.py | 13 +++++++++++++ .../imports/import_from_submodule_a_value.py | 16 ++++++++++++++++ .../import_from_super_package_a_value.py | 10 ++++++++++ ...ort_from_super_package_submodule_a_value.py | 10 ++++++++++ .../import_from_this_package_a_value.py | 10 ++++++++++ ...port_from_this_package_submodule_a_value.py | 10 ++++++++++ .../test/imports/import_module.py | 11 +++++++++++ .../test/imports/import_module_aliased.py | 14 ++++++++++++++ .../test/imports/import_submodule.py | 15 +++++++++++++++ .../imports/import_submodule_aliased.py.skip | 17 +++++++++++++++++ .../relative_import_resolves_to_itself.py.skip | 14 ++++++++++++++ .../require_explicit_submodule_import.py.skip | 18 ++++++++++++++++++ 16 files changed, 198 insertions(+), 14 deletions(-) delete mode 100644 languages/tree-sitter-stack-graphs-python/test/bugs.skip/relative_import_resolves_to_itself.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_submodule.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_value.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_value_aliased.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_wildcard.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/imports/import_from_submodule_a_value.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/imports/import_from_super_package_a_value.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/imports/import_from_super_package_submodule_a_value.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/imports/import_from_this_package_a_value.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/imports/import_from_this_package_submodule_a_value.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/imports/import_module.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/imports/import_module_aliased.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/imports/import_submodule.py create mode 100644 languages/tree-sitter-stack-graphs-python/test/imports/import_submodule_aliased.py.skip create mode 100644 languages/tree-sitter-stack-graphs-python/test/imports/relative_import_resolves_to_itself.py.skip create mode 100644 languages/tree-sitter-stack-graphs-python/test/imports/require_explicit_submodule_import.py.skip diff --git a/languages/tree-sitter-stack-graphs-python/test/bugs.skip/relative_import_resolves_to_itself.py b/languages/tree-sitter-stack-graphs-python/test/bugs.skip/relative_import_resolves_to_itself.py deleted file mode 100644 index 838595ab7..000000000 --- a/languages/tree-sitter-stack-graphs-python/test/bugs.skip/relative_import_resolves_to_itself.py +++ /dev/null @@ -1,14 +0,0 @@ -#--- path: a/__init__.py ---# -from . import b -# ^ defined: 6 - -#--- path: a/b/__init__.py ---# -B = 'b' - -#--- path: main.py ---# -from a import b -# ^ defined: 6 - -print b.B -# ^ defined: 9, 6 -# ^ defined: 6 \ No newline at end of file diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_submodule.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_submodule.py new file mode 100644 index 000000000..ea51f9450 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_submodule.py @@ -0,0 +1,14 @@ +# --- path: foo/bar.py --- + +BAR = 42 + +# --- path: test.py --- + +from foo import bar + +bar.BAR +# ^ defined: 7, 3 +# ^ defined: 3 + +foo +# ^ defined: diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_value.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_value.py new file mode 100644 index 000000000..1eb97ffe2 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_value.py @@ -0,0 +1,13 @@ +# --- path: foo.py --- + +FOO = 42 + +# --- path: test.py --- + +from foo import FOO + +FOO +# ^ defined: 7, 3 + +foo +# ^ defined: diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_value_aliased.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_value_aliased.py new file mode 100644 index 000000000..088ca9544 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_a_value_aliased.py @@ -0,0 +1,13 @@ +# --- path: foo.py --- + +FOO = 42 + +# --- path: test.py --- + +from foo import FOO as QUX + +QUX +# ^ defined: 7, 3 + +FOO +# ^ defined: diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_wildcard.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_wildcard.py new file mode 100644 index 000000000..3a1de4ffe --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_module_wildcard.py @@ -0,0 +1,13 @@ +# --- path: foo.py --- + +FOO = 42 + +# --- path: test.py --- + +from foo import * + +FOO +# ^ defined: 3 + +foo +# ^ defined: diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_from_submodule_a_value.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_submodule_a_value.py new file mode 100644 index 000000000..8d89d8538 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_submodule_a_value.py @@ -0,0 +1,16 @@ +# --- path: foo/bar.py --- + +BAR = 42 + +# --- path: test.py --- + +from foo.bar import BAR + +BAR +# ^ defined: 7, 3 + +foo +# ^ defined: + +bar +# ^ defined: diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_from_super_package_a_value.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_super_package_a_value.py new file mode 100644 index 000000000..961cd1622 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_super_package_a_value.py @@ -0,0 +1,10 @@ +# --- path: foo/__init__.py --- + +FOO = 42 + +# --- path: foo/bar/test.py --- + +from .. import FOO + +FOO +# ^ defined: 7, 3 diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_from_super_package_submodule_a_value.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_super_package_submodule_a_value.py new file mode 100644 index 000000000..75652f7cd --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_super_package_submodule_a_value.py @@ -0,0 +1,10 @@ +# --- path: foo/bar.py --- + +BAR = 42 + +# --- path: foo/baz/test.py --- + +from ..bar import BAR + +BAR +# ^ defined: 7, 3 diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_from_this_package_a_value.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_this_package_a_value.py new file mode 100644 index 000000000..f8de8042c --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_this_package_a_value.py @@ -0,0 +1,10 @@ +# --- path: foo/__init__.py --- + +FOO = 42 + +# --- path: foo/test.py --- + +from . import FOO + +FOO +# ^ defined: 7, 3 diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_from_this_package_submodule_a_value.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_this_package_submodule_a_value.py new file mode 100644 index 000000000..dc64ce387 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_from_this_package_submodule_a_value.py @@ -0,0 +1,10 @@ +# --- path: foo/bar.py --- + +BAR = 42 + +# --- path: foo/test.py --- + +from .bar import BAR + +BAR +# ^ defined: 7, 3 diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_module.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_module.py new file mode 100644 index 000000000..897acdf63 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_module.py @@ -0,0 +1,11 @@ +# --- path: foo.py --- + +FOO = 42 + +# --- path: test.py --- + +import foo + +foo.FOO +# ^ defined: 7, 3 +# ^ defined: 3 diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_module_aliased.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_module_aliased.py new file mode 100644 index 000000000..220a6b72d --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_module_aliased.py @@ -0,0 +1,14 @@ +# --- path: foo.py --- + +FOO = 42 + +# --- path: test.py --- + +import foo as qux + +qux.FOO +# ^ defined: 7, 3 +# ^ defined: 3 + +foo +# ^ defined: diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_submodule.py b/languages/tree-sitter-stack-graphs-python/test/imports/import_submodule.py new file mode 100644 index 000000000..312cd66a1 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_submodule.py @@ -0,0 +1,15 @@ +# --- path: foo/bar.py --- + +BAR = 42 + +# --- path: test.py --- + +import foo.bar + +foo.bar.BAR +# ^ defined: 7 +# ^ defined: 7, 3 +# ^ defined: 3 + +bar +# ^ defined: diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_submodule_aliased.py.skip b/languages/tree-sitter-stack-graphs-python/test/imports/import_submodule_aliased.py.skip new file mode 100644 index 000000000..dd84f39b5 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_submodule_aliased.py.skip @@ -0,0 +1,17 @@ +# --- path: foo/bar.py --- + +BAR = 42 + +# --- path: test.py --- + +import foo.bar as qux + +qux.BAR +# ^ defined: 7 +# ^ defined: 3 + +foo +# ^ defined: + +bar +# ^ defined: diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/relative_import_resolves_to_itself.py.skip b/languages/tree-sitter-stack-graphs-python/test/imports/relative_import_resolves_to_itself.py.skip new file mode 100644 index 000000000..2cdb2cf66 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/imports/relative_import_resolves_to_itself.py.skip @@ -0,0 +1,14 @@ +# --- path: foo/__init__.py --- +from . import bar +# ^ defined: 6 + +# --- path: foo/bar/__init__.py --- +BAR = 'b' + +# --- path: main.py --- +from foo import bar +# ^ defined: 6 + +bar.BAR +# ^ defined: 9, 6 +# ^ defined: 6 diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/require_explicit_submodule_import.py.skip b/languages/tree-sitter-stack-graphs-python/test/imports/require_explicit_submodule_import.py.skip new file mode 100644 index 000000000..a9d12848c --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/imports/require_explicit_submodule_import.py.skip @@ -0,0 +1,18 @@ +# --- path: foo/__init__.py --- + +FOO = 42 + +# --- path: foo/bar.py --- + +BAR = 42 + +# --- path: test.py --- + +import foo + +foo.FOO +# ^ defined: 11, 3 +# ^ defined: 3 + +foo.bar +# ^ defined: From 34eba6ea3fc32f424c05d990634e318109d121b5 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 18 Jan 2024 15:13:42 +0100 Subject: [PATCH 073/202] Update README --- .../tree-sitter-stack-graphs-python/README.md | 100 ++++++++++++------ 1 file changed, 70 insertions(+), 30 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/README.md b/languages/tree-sitter-stack-graphs-python/README.md index 3bf115da0..b5fbc2f32 100644 --- a/languages/tree-sitter-stack-graphs-python/README.md +++ b/languages/tree-sitter-stack-graphs-python/README.md @@ -4,27 +4,73 @@ This project defines tree-sitter-stack-graphs rules for Python using the [tree-s [tree-sitter-python]: https://crates.io/crates/tree-sitter-python -## Usage +- [API documentation](https://docs.rs/tree-sitter-stack-graphs-python/) +- [Release notes](https://github.com/github/stack-graphs/blob/main/languages/tree-sitter-stack-graphs-python/CHANGELOG.md) + +## Using the API To use this library, add the following to your `Cargo.toml`: -``` toml +```toml [dependencies] tree-sitter-stack-graphs-python = "0.1.0" ``` Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs-python/*/) for more details on how to use this library. -## Command-line Program +## Using the Command-line Program The command-line program for `tree-sitter-stack-graphs-python` lets you do stack graph based analysis and lookup from the command line. -Install the program using `cargo install` as follows: +The CLI can be run as follows: -``` sh -$ cargo install --features cli tree-sitter-stack-graphs-python -$ tree-sitter-stack-graphs-python --help -``` +1. _(Installed)_ Install the CLI using Cargo as follows: + + ```sh + cargo install --features cli tree-sitter-stack-graphs-python + ``` + + After this, the CLI should be available as `tree-sitter-stack-graphs-python`. + +2. _(From source)_ Instead of installing the CLI, it can also be run directly from the crate directory, as a replacement for a `tree-sitter-stack-graphs-python` invocation, as follows: + + ```sh + cargo run --features cli -- + ``` + +The basic CLI workflow for the command-line program is to index source code and issue queries against the resulting database: + +1. Index a source folder as follows: + + ```sh + tree-sitter-stack-graphs-python index SOURCE_DIR + ``` + + _Indexing will skip any files that have already be indexed. To force a re-index, add the `-f` flag._ + + To check the status if a source folder, run: + + ```sh + tree-sitter-stack-graphs-python status SOURCE_DIR + ``` + + To clean the database and start with a clean slate, run: + + ```sh + tree-sitter-stack-graphs-python clean + ``` + + _Pass the `--delete` flag to not just empty the database, but also delete it. This is useful to resolve `unsupported database version` errors that may occur after a version update._ + +2. Run a query to find the definition(s) for a reference on a given line and column, run: + + ```sh + tree-sitter-stack-graphs-python query definition SOURCE_PATH:LINE:COLUMN + ``` + + Resulting definitions are printed, including a source line if the source file is available. + +Discover all available commands and flags by passing the `-h` flag to the CLI directly, or to any of the subcommands. ## Development @@ -35,35 +81,29 @@ The project is written in Rust, and requires a recent version installed. Rust c The project is organized as follows: - The stack graph rules are defined in `src/stack-graphs.tsg`. -- Builtins sources and configuration are defined in `src/builtins.py` and `builtins.cfg` respectively. +- Builtins sources and configuration are defined in `src/builtins.it` and `builtins.cfg` respectively. - Tests are put into the `test` directory. -### Building and Running Tests - -Build the project by running: - -``` sh -$ cargo build -``` +### Running Tests Run the tests as follows: -``` sh -$ cargo test +```sh +cargo test ``` The project consists of a library and a CLI. By default, running `cargo` only applies to the library. To run `cargo` commands on the CLI as well, add `--features cli` or `--all-features`. Run the CLI from source as follows: -``` sh -$ cargo run --features cli -- ARGS +```sh +cargo run --features cli -- ARGS ``` Sources are formatted using the standard Rust formatted, which is applied by running: -``` sh -$ cargo fmt +```sh +cargo fmt ``` ### Writing TSG @@ -78,21 +118,21 @@ which contain self-contained TSG rules for specific language features. A VSCode Parse and test a single file by executing the following commands: -``` sh -$ cargo run --features cli -- parse FILES... -$ cargo run --features cli -- test TESTFILES... +```sh +cargo run --features cli -- parse FILES... +cargo run --features cli -- test TESTFILES... ``` Generate a visualization to debug failing tests by passing the `-V` flag: -``` sh -$ cargo run --features cli -- test -V TESTFILES... +```sh +cargo run --features cli -- test -V TESTFILES... ``` To generate the visualization regardless of test outcome, execute: -``` sh -$ cargo run --features cli -- test -V --output-mode=always TESTFILES... +```sh +cargo run --features cli -- test -V --output-mode=always TESTFILES... ``` -Go to https://crates.io/crates/tree-sitter-stack-graphs for links to examples and documentation. +Go to for links to examples and documentation. From c23f7ca23d354b08ba9b80adee5433f0f815513b Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 16 Nov 2023 12:33:46 +0100 Subject: [PATCH 074/202] Upgrade Python and reorganize rules according to syntax categories --- .../Cargo.toml | 2 +- .../src/stack-graphs.tsg | 726 ++++++++++++------ .../test/pattern_matching.py | 7 +- 3 files changed, 517 insertions(+), 218 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/Cargo.toml b/languages/tree-sitter-stack-graphs-python/Cargo.toml index ca123cc0f..4ac4c0633 100644 --- a/languages/tree-sitter-stack-graphs-python/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-python/Cargo.toml @@ -31,7 +31,7 @@ cli = ["anyhow", "clap", "tree-sitter-stack-graphs/cli"] anyhow = { version = "1.0", optional = true } clap = { version = "4", optional = true, features = ["derive"] } tree-sitter-stack-graphs = { version = "0.7", path = "../../tree-sitter-stack-graphs" } -tree-sitter-python = "=0.20.2" +tree-sitter-python = "=0.20.4" [dev-dependencies] anyhow = "1.0" diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 0028994c2..00314b687 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -45,6 +45,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n } [ + ; _statement ; _simple_statement (future_import_statement) (import_statement) @@ -61,7 +62,8 @@ attribute node_symbol = node => symbol = (source-text node), source_n (global_statement) (nonlocal_statement) (exec_statement) - ; _compund_statement + (type_alias_statement) + ; _compound_statement (if_statement) (for_statement) (while_statement) @@ -74,18 +76,23 @@ attribute node_symbol = node => symbol = (source-text node), source_n ; block (block) ; statement clauses + (if_clause) (elif_clause) (else_clause) - (case_clause) + (except_group_clause) (except_clause) (finally_clause) (with_clause) + (case_clause) ] @node { node @node.after_scope node @node.before_scope } -(parameters) @node { +[ + (parameters) + (lambda_parameters) +] @node { node @node.after_scope node @node.before_scope } @@ -102,20 +109,95 @@ attribute node_symbol = node => symbol = (source-text node), source_n } [ + ; expressions + (comparison_operator) + (not_operator) + (boolean_operator) + (lambda) + ;(primary_expression) ; unfolded below + (conditional_expression) + (named_expression) + (as_pattern) + ; primary_expression + (await) + (binary_operator) (identifier) - (wildcard_import) - (expression) + ;(keyword_identifier) ; invalid query pattern? + (string) + (concatenated_string) + (integer) + (float) + (true) + (false) + (none) + (unary_operator) + (attribute) + (subscript) + (call) + (list) + (list_comprehension) + (dictionary) + (dictionary_comprehension) + (set) + (set_comprehension) + (tuple) + (parenthesized_expression) + (generator_expression) + (ellipsis) + (list_splat) + + ; expression list (expression_list) - (primary_expression) - (pattern) - (pattern_list) + + ; pattern + (pattern/identifier) + ;(keyword_identifier) ; invalid query pattern? + ;(subscript) + ;(attribute) + (list_splat_pattern) + (tuple_pattern) + (list_pattern) + ; _simple_patterns + (class_pattern) + (splat_pattern) + (union_pattern) + ;(list_pattern) ; already in pattern + ;(tuple_pattern) ; already in pattern + (dict_pattern) + ;(string) ; already in primary_expression + ;(concatenated_string) ; already in primary_expression + ;(true) ; already in primary_expression + ;(false) ; already in primary_expression + ;(none) ; already in primary_expression + ;(integer) ; already in primary_expression + ;(float) ; already in primary_expression + (complex_pattern) + (dotted_name) + ; _as_attern + (as_pattern) + ; keyword pattern + (keyword_pattern) + ; case pattern (case_pattern) - (parameter) - (pair) - (list_splat) - (parenthesized_list_splat) - (dictionary_splat) - (keyword_argument) + ; with item + (with_item) + + ; pattern list + (pattern_list) + + ; parameter + ;(identifier) ; already in expressions + (typed_parameter) + (default_parameter) + (typed_default_parameter) + ;(list_splat_pattern) ; already in patterns + ;(tuple_pattern) ; already in patterns + (keyword_separator) + (positional_separator) + (dictionary_splat_pattern) + + ; parameters + (parameters) ] @node { node @node.input node @node.new_bindings @@ -149,8 +231,16 @@ inherit .grandparent_module inherit .local_scope inherit .parent_module -; Modules and Imports -;--------------------- +;; +;; # # +;; ## ## #### ##### # # # ###### #### +;; # # # # # # # # # # # # # +;; # # # # # # # # # # ##### #### +;; # # # # # # # # # # # +;; # # # # # # # # # # # # +;; # # #### ##### #### ###### ###### #### +;; +;; Modules (module) @mod { @@ -248,6 +338,18 @@ inherit .parent_module node @mod.local_scope } +;; +;; ### +;; # # # ##### #### ##### ##### #### +;; # ## ## # # # # # # # # +;; # # ## # # # # # # # # #### +;; # # # ##### # # ##### # # +;; # # # # # # # # # # # +;; ### # # # #### # # # #### +;; +;; Imports + +;; import _.X (import_statement name: (dotted_name . (identifier) @root_name)) @stmt @@ -257,6 +359,7 @@ inherit .parent_module edge @root_name.ref -> ROOT_NODE } +;; import _.X as _ (import_statement name: (aliased_import (dotted_name . (identifier) @root_name))) @@ -264,6 +367,7 @@ inherit .parent_module edge @root_name.ref -> ROOT_NODE } +;; from _ import _.X (import_from_statement name: (dotted_name . (identifier) @import_root_name)) @stmt @@ -274,6 +378,7 @@ inherit .parent_module attr (@import_root_name.ref_dot) push_symbol = "." } +;; from _ import _.X as _ (import_from_statement name: (aliased_import (dotted_name @@ -283,6 +388,11 @@ inherit .parent_module attr (@import_root_name.ref_dot) push_symbol = "." } +;; from X._ import _ +;; from ._.X import _ +;; from .._.X import _ +;; from . import _ +;; from .. import _ (import_from_statement module_name: [ (dotted_name (identifier) @prefix_leaf_name .) @@ -300,6 +410,8 @@ inherit .parent_module edge @import_root_name.ref_dot -> @prefix_leaf_name.ref } +;; from _ import _.X as Y +;; import _.X as Y [ (import_from_statement (aliased_import @@ -315,6 +427,8 @@ inherit .parent_module edge @alias.def -> @name.ref } +;; import _.X +;; from _ import _.X [ (import_statement name: (dotted_name @@ -327,6 +441,7 @@ inherit .parent_module edge @leaf_name.def -> @leaf_name.ref } +;; . (relative_import (import_prefix) @prefix (#eq? @prefix ".")) @import @@ -334,6 +449,7 @@ inherit .parent_module edge @prefix.ref -> @import.parent_module } +;; .. (relative_import (import_prefix) @prefix (#eq? @prefix "..")) @import @@ -341,6 +457,8 @@ inherit .parent_module edge @prefix.ref -> @import.grandparent_module } +;; .X +;; ..X (relative_import (import_prefix) @prefix (dotted_name @@ -351,6 +469,7 @@ inherit .parent_module edge @name.ref_dot -> @prefix.ref } +;; from . [ (import_from_statement module_name: (relative_import @@ -370,6 +489,7 @@ inherit .parent_module edge @child_name.ref_dot -> @parent_name.ref } +;; from X._ import _ (import_from_statement module_name: (dotted_name . (identifier) @root_name)) @@ -377,6 +497,7 @@ inherit .parent_module edge @root_name.ref -> ROOT_NODE } +;; from _.X import * (import_from_statement module_name: (dotted_name (identifier) @leaf_name .) @@ -388,6 +509,9 @@ inherit .parent_module attr (@star.ref_dot) push_symbol = "." } +;; import _.X.Y._ +;; from _ import _.X.Y._ +;; from _ import _.X.Y._ as _ [ (import_statement name: (dotted_name @@ -415,9 +539,16 @@ inherit .parent_module attr (@child_name.ref_dot) push_symbol = "." } -;-------- -; Scopes -;-------- +;; +;; ###### +;; # # # #### #### # # #### +;; # # # # # # # # # # +;; ###### # # # # #### #### +;; # # # # # # # # # +;; # # # # # # # # # # # +;; ###### ###### #### #### # # #### +;; +;; Blocks [ (module (_) @last_stmt .) @@ -475,7 +606,7 @@ inherit .parent_module edge @stmt.after_scope -> @block.after_scope } -(match_statement (case_clause) @block) @stmt +(match_statement body: (_) @block) @stmt { let @block.local_scope = @block.before_scope edge @block.before_scope -> @stmt.before_scope @@ -490,26 +621,77 @@ inherit .parent_module edge @stmt.before_scope -> @stmt.after_scope } -;------------- -; Definitions -;------------- +;; +;; ##### +;; # # ##### ## ##### ###### # # ###### # # ##### #### +;; # # # # # # ## ## # ## # # # +;; ##### # # # # ##### # ## # ##### # # # # #### +;; # # ###### # # # # # # # # # # +;; # # # # # # # # # # # ## # # # +;; ##### # # # # ###### # # ###### # # # #### +;; +;; Statements -(identifier) @name { - attr (@name.def) node_definition = @name -} +;;;; Simple Statements -[ - (assignment - left: (_) @pattern - right: (_) @value) - (with_item - value: - (as_pattern - (_) @value - alias: (as_pattern_target (_) @pattern))) -] +(print_statement) {} + +(assert_statement) {} + +(expression_statement) {} + +(return_statement (_) @expr) @stmt { - edge @pattern.input -> @value.output + edge @stmt.function_returns -> @expr.output +} + +(delete_statement) {} + +(raise_statement) {} + +(pass_statement) {} + +(break_statement) {} + +(continue_statement) {} + +(global_statement) {} + +(nonlocal_statement) {} + +(exec_statement) {} + +(type_alias_statement) {} + +;;;; Compound Statements + +(if_statement) {} + +(if_clause) {} + +(elif_clause) {} + +(else_clause) {} + +(for_statement) {} + +(while_statement) {} + +(try_statement) {} + +(except_group_clause) {} + +(except_clause) {} + +(finally_clause) {} + +(with_statement) {} + +(with_clause) {} + +(function_definition + name: (identifier) @name) { + attr (@name.def) node_definition = @name } (function_definition @@ -539,72 +721,6 @@ inherit .parent_module let @body.class_member_attr_scope = #null } -;; -;; BEGIN BIG GNARLY DISJUNCTION -;; -;; The following pair of rules is intended to capture the following behavior: -;; -;; If a function definition is used to define a method, by being inside a class -;; definition, then we make its syntax type `method`. Otherwise, we make it's -;; syntax type `function`. Unfortunately, because of the limitations on negation -;; and binding in tree sitter queries, we cannot negate `class_definition` or -;; similar things directly. Instead, we have to manually push the negation down -;; to form the finite disjunction it corresponds to. -;; - -[ - (class_definition (block (decorated_definition (function_definition name: (_)@name)))) - (class_definition (block (function_definition name: (_)@name))) -] -{ - attr (@name.def) syntax_type = "method" -} - -[ - (module (decorated_definition (function_definition name: (_)@name))) - (module (function_definition name: (_)@name)) - - (if_statement (block (decorated_definition (function_definition name: (_)@name)))) - (if_statement (block (function_definition name: (_)@name))) - - (elif_clause (block (decorated_definition (function_definition name: (_)@name)))) - (elif_clause (block (function_definition name: (_)@name))) - - (else_clause (block (decorated_definition (function_definition name: (_)@name)))) - (else_clause (block (function_definition name: (_)@name))) - - (case_clause (block (decorated_definition (function_definition name: (_)@name)))) - (case_clause (block (function_definition name: (_)@name))) - - (for_statement (block (decorated_definition (function_definition name: (_)@name)))) - (for_statement (block (function_definition name: (_)@name))) - - (while_statement (block (decorated_definition (function_definition name: (_)@name)))) - (while_statement (block (function_definition name: (_)@name))) - - (try_statement (block (decorated_definition (function_definition name: (_)@name)))) - (try_statement (block (function_definition name: (_)@name))) - - (except_clause (block (decorated_definition (function_definition name: (_)@name)))) - (except_clause (block (function_definition name: (_)@name))) - - (finally_clause (block (decorated_definition (function_definition name: (_)@name)))) - (finally_clause (block (function_definition name: (_)@name))) - - (with_statement (block (decorated_definition (function_definition name: (_)@name)))) - (with_statement (block (function_definition name: (_)@name))) - - (function_definition (block (decorated_definition (function_definition name: (_)@name)))) - (function_definition (block (function_definition name: (_)@name))) -] -{ - attr (@name.def) syntax_type = "function" -} - -;; -;; END BIG GNARLY DISJUNCTION -;; - (function_definition parameters: (parameters . (identifier) @param) @@ -616,6 +732,22 @@ inherit .parent_module attr (@param.output) push_node = @param } +(parameters + (_) @param) @params +{ + node @param.param_index + node @param.param_name + + attr (@param.param_index) push_symbol = (named-child-index @param) + edge @param.param_index -> @params.before_scope + edge @params.after_scope -> @param.input + edge @param.param_name -> @params.before_scope +} + +(parameter/identifier) @name { + attr (@name.def) node_definition = @name +} + (parameter/identifier) @param @name { attr (@param.param_name) push_node = @param @@ -655,40 +787,6 @@ inherit .parent_module edge @param.input -> @name.def } -[ - (pattern_list (_) @pattern) - (tuple_pattern (_) @pattern) -] @list -{ - node pattern_index - - let statement_scope = @list.local_scope - node @pattern.local_scope - edge statement_scope -> @pattern.local_scope - attr (statement_scope -> @pattern.local_scope) precedence = (plus 1 (named-child-index @pattern)) - - edge pattern_index -> @list.input - edge @pattern.input -> pattern_index - attr (pattern_index) push_symbol = (named-child-index @pattern) -} - -(parameters - (_) @param) @params -{ - node @param.param_index - node @param.param_name - - attr (@param.param_index) push_symbol = (named-child-index @param) - edge @param.param_index -> @params.before_scope - edge @params.after_scope -> @param.input - edge @param.param_name -> @params.before_scope -} - -(return_statement (_) @expr) @stmt -{ - edge @stmt.function_returns -> @expr.output -} - (class_definition) @class { node @class.call_drop node @class.member_attrs @@ -696,6 +794,11 @@ inherit .parent_module node @class.super_scope } +(class_definition + name: (identifier) @name) { + attr (@name.def) node_definition = @name +} + (class_definition name: (identifier) @name) @class { @@ -756,23 +859,107 @@ inherit .parent_module edge @stmt.after_scope -> @def.after_scope } +(match_statement) {} + (case_clause - pattern: (_) @pattern - consequence: (_) @consequence) @clause + (case_pattern) @pattern + consequence: (_) @consequence) { edge @consequence.before_scope -> @pattern.new_bindings +} + +(case_clause + consequence: (_) @consequence) @clause +{ edge @consequence.before_scope -> @clause.before_scope edge @clause.after_scope -> @consequence.after_scope } -;------------- -; Expressions -;------------- +;; +;; ####### +;; # # # ##### ##### ###### #### #### # #### # # #### +;; # # # # # # # # # # # # # ## # # +;; ##### ## # # # # ##### #### #### # # # # # # #### +;; # ## ##### ##### # # # # # # # # # # +;; # # # # # # # # # # # # # # # ## # # +;; ####### # # # # # ###### #### #### # #### # # #### +;; +;; Expressions + +(conditional_expression) {} + +(named_expression) {} + +(as_pattern) {} + +(await) {} + +(binary_operator + (_) @left + (_) @right) @binop +{ + edge @binop.new_bindings -> @left.new_bindings + edge @binop.new_bindings -> @right.new_bindings +} -(identifier) @name { +(primary_expression/identifier) @name { attr (@name.ref) node_reference = @name } +(primary_expression/identifier) @name +{ + edge @name.output -> @name.local_scope + edge @name.output -> @name.class_parent_scope + edge @name.local_scope -> @name.input + attr (@name.input) pop_node = @name + attr (@name.output) node_reference = @name + + edge @name.new_bindings -> @name.def +} + +(string) {} + +(concatenated_string) {} + +(integer) {} + +(float) {} + +(true) {} + +(false) {} + +(none) {} + +(unary_operator) {} + +(attribute + object: (_) @object + attribute: (identifier) @name) @expr +{ + node input_dot + node output_dot + + edge @expr.output -> @name.output + edge @name.output -> output_dot + edge output_dot -> @object.output + edge @object.input -> input_dot + edge input_dot -> @name.input + edge @name.input -> @expr.input + attr (output_dot) push_symbol = "." + attr (input_dot) pop_symbol = "." + attr (@name.input) pop_node = @name + attr (@name.output) push_node = @name +} + +(primary_expression/attribute + attribute: (identifier) @name) +{ + attr (@name.output) is_reference +} + +(subscript) {} + (call function: (_) @fn arguments: (argument_list) @args) @call @@ -837,6 +1024,42 @@ inherit .parent_module edge @call.output -> @call.class_super_scope } +(list) @list +{ + node called + + edge @list.output -> called + edge called -> @list.global_dot + attr (called) push_symbol = "list" +} + +(list (_) @el) @list +{ + edge @list.new_bindings -> @el.new_bindings +} + +(list_comprehension) {} + +(dictionary (pair) @pair) @dict +{ + edge @dict.new_bindings -> @pair.new_bindings +} + +(pair + value: (_) @value) @pair +{ + edge @pair.new_bindings -> @value.new_bindings +} + +(dictionary_comprehension) {} + +(set (_) @el) @set +{ + edge @set.new_bindings -> @el.new_bindings +} + +(set_comprehension) {} + [ (tuple (_) @element) (expression_list (_) @element) @@ -851,115 +1074,188 @@ inherit .parent_module edge @tuple.new_bindings -> @element.new_bindings } -(attribute - object: (_) @object - attribute: (identifier) @name) @expr +(parenthesized_expression) {} + +(generator_expression) {} + +(ellipsis) {} + +(list_splat (_) @splatted) @splat { - node input_dot - node output_dot + edge @splat.new_bindings -> @splatted.new_bindings +} - edge @expr.output -> @name.output - edge @name.output -> output_dot - edge output_dot -> @object.output - edge @object.input -> input_dot - edge input_dot -> @name.input - edge @name.input -> @expr.input - attr (output_dot) push_symbol = "." - attr (input_dot) pop_symbol = "." - attr (@name.input) pop_node = @name +;; +;; ###### +;; # # ## ##### ##### ###### ##### # # #### +;; # # # # # # # # # ## # # +;; ###### # # # # ##### # # # # # #### +;; # ###### # # # ##### # # # # +;; # # # # # # # # # ## # # +;; # # # # # ###### # # # # #### +;; +;; Patterns + +(pattern/identifier) @name { + attr (@name.def) node_definition = @name +} + +(pattern/identifier) @name +{ + edge @name.output -> @name.local_scope + edge @name.output -> @name.class_parent_scope + edge @name.local_scope -> @name.input + attr (@name.local_scope -> @name.input) precedence = 1 + attr (@name.input) node_definition = @name attr (@name.output) push_node = @name + + edge @name.new_bindings -> @name.def } +(pattern/subscript) {} + (pattern/attribute attribute: (identifier) @name) { attr (@name.input) is_definition } -(primary_expression/attribute - attribute: (identifier) @name) -{ - attr (@name.output) is_reference -} -(primary_expression/identifier) @id +(list_splat_pattern) {} + +[ + (pattern_list (_) @pattern) + (tuple_pattern (_) @pattern) + (list_pattern (_) @pattern) +] @list { - edge @id.output -> @id.local_scope - edge @id.output -> @id.class_parent_scope - edge @id.local_scope -> @id.input - attr (@id.input) pop_node = @id - attr (@id.output) node_reference = @id + node pattern_index - edge @id.new_bindings -> @id.def + let statement_scope = @list.local_scope + node @pattern.local_scope + edge statement_scope -> @pattern.local_scope + attr (statement_scope -> @pattern.local_scope) precedence = (plus 1 (named-child-index @pattern)) + + edge pattern_index -> @list.input + edge @pattern.input -> pattern_index + attr (pattern_index) push_symbol = (named-child-index @pattern) } -(pattern/identifier) @id -{ - edge @id.output -> @id.local_scope - edge @id.output -> @id.class_parent_scope - edge @id.local_scope -> @id.input - attr (@id.local_scope -> @id.input) precedence = 1 - attr (@id.input) node_definition = @id - attr (@id.output) push_node = @id +(class_pattern) {} - edge @id.new_bindings -> @id.def -} +(splat_pattern) {} + +(union_pattern) {} + +(dict_pattern) {} + +(complex_pattern) {} (as_pattern (expression) @value - alias: (as_pattern_target (primary_expression/identifier) @id)) @as_pattern + alias: (as_pattern_target (primary_expression/identifier) @name)) @as_pattern { - attr (@id.local_scope -> @id.input) precedence = 1 - attr (@id.input) is_definition + attr (@name.local_scope -> @name.input) precedence = 1 + attr (@name.input) is_definition edge @as_pattern.new_bindings -> @value.new_bindings - edge @as_pattern.new_bindings -> @id.new_bindings + edge @as_pattern.new_bindings -> @name.new_bindings } -(list) @list -{ - node called - - edge @list.output -> called - edge called -> @list.global_dot - attr (called) push_symbol = "list" -} +(keyword_pattern) {} -(list (_) @el) @list +(case_pattern (_) @expr) @pat { - edge @list.new_bindings -> @el.new_bindings + edge @pat.new_bindings -> @expr.new_bindings } -(dictionary (pair) @pair) @dict +[ + (assignment + left: (_) @pattern + right: (_) @value) + (with_item + value: + (as_pattern + (_) @value + alias: (as_pattern_target (_) @pattern))) +] { - edge @dict.new_bindings -> @pair.new_bindings + edge @pattern.input -> @value.output } -(pair - value: (_) @value) @pair -{ - edge @pair.new_bindings -> @value.new_bindings -} +;; +;; ##### ####### +;; # # # # # # ##### ## # # # # # ##### ###### #### +;; # # # ## # # # # # # # # # # # # # +;; ##### # # # # # # # ## # # # # ##### #### +;; # # # # # # ###### ## # # ##### # # +;; # # # # ## # # # # # # # # # # # +;; ##### # # # # # # # # # # # ###### #### +;; +;; Syntax Types -(set (_) @el) @set -{ - edge @set.new_bindings -> @el.new_bindings -} +;; +;; BEGIN BIG GNARLY DISJUNCTION +;; +;; The following pair of rules is intended to capture the following behavior: +;; +;; If a function definition is used to define a method, by being inside a class +;; definition, then we make its syntax type `method`. Otherwise, we make it's +;; syntax type `function`. Unfortunately, because of the limitations on negation +;; and binding in tree sitter queries, we cannot negate `class_definition` or +;; similar things directly. Instead, we have to manually push the negation down +;; to form the finite disjunction it corresponds to. +;; -(list_splat (_) @splatted) @splat +[ + (class_definition (block (decorated_definition (function_definition name: (_)@name)))) + (class_definition (block (function_definition name: (_)@name))) +] { - edge @splat.new_bindings -> @splatted.new_bindings + attr (@name.def) syntax_type = "method" } -(binary_operator - (_) @left - (_) @right) @binop -{ - edge @binop.new_bindings -> @left.new_bindings - edge @binop.new_bindings -> @right.new_bindings -} +[ + (module (decorated_definition (function_definition name: (_)@name))) + (module (function_definition name: (_)@name)) -(case_pattern (_) @expr) @pat + (if_statement (block (decorated_definition (function_definition name: (_)@name)))) + (if_statement (block (function_definition name: (_)@name))) + + (elif_clause (block (decorated_definition (function_definition name: (_)@name)))) + (elif_clause (block (function_definition name: (_)@name))) + + (else_clause (block (decorated_definition (function_definition name: (_)@name)))) + (else_clause (block (function_definition name: (_)@name))) + + (case_clause (block (decorated_definition (function_definition name: (_)@name)))) + (case_clause (block (function_definition name: (_)@name))) + + (for_statement (block (decorated_definition (function_definition name: (_)@name)))) + (for_statement (block (function_definition name: (_)@name))) + + (while_statement (block (decorated_definition (function_definition name: (_)@name)))) + (while_statement (block (function_definition name: (_)@name))) + + (try_statement (block (decorated_definition (function_definition name: (_)@name)))) + (try_statement (block (function_definition name: (_)@name))) + + (except_clause (block (decorated_definition (function_definition name: (_)@name)))) + (except_clause (block (function_definition name: (_)@name))) + + (finally_clause (block (decorated_definition (function_definition name: (_)@name)))) + (finally_clause (block (function_definition name: (_)@name))) + + (with_statement (block (decorated_definition (function_definition name: (_)@name)))) + (with_statement (block (function_definition name: (_)@name))) + + (function_definition (block (decorated_definition (function_definition name: (_)@name)))) + (function_definition (block (function_definition name: (_)@name))) +] { - edge @pat.new_bindings -> @expr.new_bindings + attr (@name.def) syntax_type = "function" } + +;; +;; END BIG GNARLY DISJUNCTION +;; diff --git a/languages/tree-sitter-stack-graphs-python/test/pattern_matching.py b/languages/tree-sitter-stack-graphs-python/test/pattern_matching.py index 58c0d16fc..d6b8980a3 100644 --- a/languages/tree-sitter-stack-graphs-python/test/pattern_matching.py +++ b/languages/tree-sitter-stack-graphs-python/test/pattern_matching.py @@ -21,11 +21,11 @@ case { "foo": foo }: print(foo) # ^ defined: 21 - case {bar,quux}: + case {"bar": bar, "quux": quux}: print(bar,quux) # ^ defined: 24 # ^ defined: 24 - case ["grab", { "key": {garply}}]: + case ["grab", { "key": {"garply": garply}}]: print(garply) # ^ defined: 28 case ["drop", *objs]: @@ -37,3 +37,6 @@ case ["go", ("north" | "south" | "east" | "west") as direction2]: current_room = current_room.neighbor(direction2) # ^ defined: 37 + case (foo, "bar"): + print(foo) + # ^ defined: 40 From 41c8f32fa628c86dfdd76e75a3f9debac65c4d0a Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 17 Nov 2023 19:09:37 +0100 Subject: [PATCH 075/202] Reorganize imports --- .../src/stack-graphs.tsg | 393 ++++++++++-------- ...ed.py.skip => import_submodule_aliased.py} | 2 +- 2 files changed, 232 insertions(+), 163 deletions(-) rename languages/tree-sitter-stack-graphs-python/test/imports/{import_submodule_aliased.py.skip => import_submodule_aliased.py} (89%) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 00314b687..2c8c1e847 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -99,8 +99,6 @@ attribute node_symbol = node => symbol = (source-text node), source_n [ (identifier) - (import_prefix) - (wildcard_import) ] @node { node @node.def node @node.def_dot @@ -108,6 +106,19 @@ attribute node_symbol = node => symbol = (source-text node), source_n node @node.ref_dot } +[ + (dotted_name) + (aliased_import) + (relative_import) + (wildcard_import) + (import_prefix) +] @node { + node @node.after_scope + node @node.before_scope + node @node.def + node @node.ref +} + [ ; expressions (comparison_operator) @@ -349,194 +360,252 @@ inherit .parent_module ;; ;; Imports -;; import _.X -(import_statement - name: (dotted_name - . (identifier) @root_name)) @stmt -{ - edge @stmt.after_scope -> @root_name.def - attr (@stmt.after_scope -> @root_name.def) precedence = 1 - edge @root_name.ref -> ROOT_NODE +;; Import References +;; ^^^^^^^^^^^^^^^^^ + +;;;; Dotted Names +;; +;; (dotted_name).ref node to connect to to use the reference +;; (dotted_name).before_scope node to connect from to ensure the reference resolves + +;; all names are references +[ + (import_statement name: (dotted_name (identifier) @name)) + (future_import_statement name: (dotted_name (identifier) @name)) + (import_from_statement name: (dotted_name (identifier) @name)) + (import_statement name: (aliased_import name: (dotted_name (identifier) @name))) + (future_import_statement name: (aliased_import name: (dotted_name (identifier) @name))) + (import_from_statement name: (aliased_import name: (dotted_name (identifier) @name))) + (import_from_statement module_name: (dotted_name (identifier) @name)) + (import_from_statement module_name: (relative_import (dotted_name (identifier) @name))) +] { + attr (@name.ref) node_reference = @name } -;; import _.X as _ -(import_statement - name: (aliased_import - (dotted_name . (identifier) @root_name))) -{ - edge @root_name.ref -> ROOT_NODE +;; references are chained +[ + (import_statement name: (dotted_name (identifier) @left . (identifier) @right)) + (future_import_statement name: (dotted_name (identifier) @left . (identifier) @right)) + (import_from_statement name: (dotted_name (identifier) @left . (identifier) @right)) + (import_statement name: (aliased_import name: (dotted_name (identifier) @left . (identifier) @right))) + (future_import_statement name: (aliased_import name: (dotted_name (identifier) @left . (identifier) @right))) + (import_from_statement name: (aliased_import name: (dotted_name (identifier) @left . (identifier) @right))) + (import_from_statement module_name: (dotted_name (identifier) @left . (identifier) @right)) + (import_from_statement module_name: (relative_import (dotted_name (identifier) @left . (identifier) @right))) +] { + node push_dot + attr (push_dot) push_symbol = "." + + edge @right.ref -> push_dot + edge push_dot -> @left.ref +} + +;; lookup first reference +[ + (import_statement name: (dotted_name . (identifier) @first) @dotted) + (future_import_statement name: (dotted_name . (identifier) @first) @dotted) + (import_from_statement name: (dotted_name . (identifier) @first) @dotted) + (import_statement name: (aliased_import name: (dotted_name . (identifier) @first) @dotted)) + (future_import_statement name: (aliased_import name: (dotted_name . (identifier) @first) @dotted)) + (import_from_statement name: (aliased_import name: (dotted_name . (identifier) @first) @dotted)) + (import_from_statement module_name: (dotted_name . (identifier) @first) @dotted) + (import_from_statement module_name: (relative_import (dotted_name . (identifier) @first) @dotted)) +] { + edge @first.ref -> @dotted.before_scope +} + +;; expose last reference +[ + (import_statement name: (dotted_name (identifier) @last .) @dotted) + (future_import_statement name: (dotted_name (identifier) @last .) @dotted) + (import_from_statement name: (dotted_name (identifier) @last .) @dotted) + (import_statement name: (aliased_import name: (dotted_name (identifier) @last .) @dotted)) + (future_import_statement name: (aliased_import name: (dotted_name (identifier) @last .) @dotted)) + (import_from_statement name: (aliased_import name: (dotted_name (identifier) @last .) @dotted)) + (import_from_statement module_name: (dotted_name (identifier) @last .) @dotted) + (import_from_statement module_name: (relative_import (dotted_name (identifier) @last .) @dotted)) +] { + edge @dotted.ref -> @last.ref +} + +;;;; Aliased Import +;; +;; An aliased import behaves like its wrapped dotted_name as a reference +;; +;; (aliased_import).ref node to connect to, to use the reference +;; (aliased_import).before_scope node to connect from to ensure the reference resolves + +(aliased_import name: (dotted_name) @dotted) @aliased { + edge @aliased.ref -> @dotted.ref + edge @dotted.before_scope -> @aliased.before_scope } -;; from _ import _.X -(import_from_statement - name: (dotted_name - . (identifier) @import_root_name)) @stmt -{ - edge @stmt.after_scope -> @import_root_name.def - attr (@stmt.after_scope -> @import_root_name.def) precedence = 1 - edge @import_root_name.ref -> @import_root_name.ref_dot - attr (@import_root_name.ref_dot) push_symbol = "." +;;;; Relative Import +;; +;; A relative import behaves like its wrapped dotted_name as a reference +;; +;; (relative_import).ref node to connect to, to use the reference +;; (relative_import).before_scope node to connect from to ensure the reference resolves + +(relative_import (import_prefix) . (dotted_name) @dotted) @relative { + edge @relative.ref -> @dotted.ref + + node push_dot + attr (push_dot) push_symbol = "." + + edge @dotted.before_scope -> push_dot + edge push_dot -> @relative.before_scope } -;; from _ import _.X as _ -(import_from_statement - name: (aliased_import - (dotted_name - . (identifier) @import_root_name))) -{ - edge @import_root_name.ref -> @import_root_name.ref_dot - attr (@import_root_name.ref_dot) push_symbol = "." -} - -;; from X._ import _ -;; from ._.X import _ -;; from .._.X import _ -;; from . import _ -;; from .. import _ -(import_from_statement - module_name: [ - (dotted_name (identifier) @prefix_leaf_name .) - (relative_import (dotted_name (identifier) @prefix_leaf_name .)) - (relative_import (import_prefix) @prefix_leaf_name .) - ] - name: [ - (dotted_name - . (identifier) @import_root_name) - (aliased_import - (dotted_name - . (identifier) @import_root_name)) - ]) -{ - edge @import_root_name.ref_dot -> @prefix_leaf_name.ref +(relative_import (import_prefix) .) @relative { + edge @relative.ref -> @relative.before_scope +} + +;;;; Wildcard Import +;; +;; A wildcard import simply passes through +;; +;; (wildcard_import).ref node to connect to, to use the reference +;; (wildcard_import).before_scope node to connect from to ensure the reference resolves + +(wildcard_import) @wildcard { + edge @wildcard.ref -> @wildcard.before_scope } -;; from _ import _.X as Y -;; import _.X as Y +;;;; Import from +;; +;; The imported references are resolved in the from module + [ - (import_from_statement - (aliased_import - name: (dotted_name (identifier) @name .) - alias: (identifier) @alias)) - (import_statement - (aliased_import - name: (dotted_name (identifier) @name .) - alias: (identifier) @alias)) -] @stmt -{ - edge @stmt.after_scope -> @alias.def - edge @alias.def -> @name.ref + (import_from_statement module_name: (_) @left name: (_) @right) + (import_from_statement module_name: (_) @left (wildcard_import) @right) +] { + node push_dot + attr (push_dot) push_symbol = "." + + edge @right.before_scope -> push_dot + edge push_dot -> @left.ref } -;; import _.X -;; from _ import _.X +;;;; Non-relative Imports +;; +;; Non-relative imports are resolved in the root scope + [ - (import_statement - name: (dotted_name - (identifier) @leaf_name .)) - (import_from_statement - name: (dotted_name - (identifier) @leaf_name .)) -] -{ - edge @leaf_name.def -> @leaf_name.ref + (import_statement name: (_) @name) + (import_from_statement module_name: (dotted_name) @name) +] { + edge @name.before_scope -> ROOT_NODE } -;; . -(relative_import - (import_prefix) @prefix - (#eq? @prefix ".")) @import -{ - edge @prefix.ref -> @import.parent_module +;;;; Relative Imports +;; +;; Relative imports are resolved in scopes related to the current module + +;; . imports resolve in parent module scope +(import_from_statement module_name: (relative_import (import_prefix) @prefix (#eq? @prefix ".")) @relative) { + edge @relative.before_scope -> @prefix.parent_module } -;; .. -(relative_import - (import_prefix) @prefix - (#eq? @prefix "..")) @import -{ - edge @prefix.ref -> @import.grandparent_module +;; .. imports resolve in grandparent module scope +(import_from_statement module_name: (relative_import (import_prefix) @prefix (#eq? @prefix "..")) @relative) { + edge @relative.before_scope -> @prefix.grandparent_module } -;; .X -;; ..X -(relative_import - (import_prefix) @prefix - (dotted_name - . (identifier) @name)) -{ - attr (@name.ref_dot) push_symbol = "." - edge @name.ref -> @name.ref_dot - edge @name.ref_dot -> @prefix.ref +;;;; Future Imports +;; +;; We don't know the future, so we cannot connect references of future imports anywhere. Maybe one day? + +;; Import Definitions +;; ^^^^^^^^^^^^^^^^^^ + +;;;; Dotted Names & Aliased Imports +;; +;; (dotted_name).after_scope node to connect to, to expose the definition +;; (dotted_name).def node to connect from, to give definition content + +;; unaliased names and aliases are definitions +[ + (import_statement name: (dotted_name (identifier) @name)) + (future_import_statement name: (dotted_name (identifier) @name)) + (import_from_statement name: (dotted_name (identifier) @name)) + (import_statement name: (aliased_import alias: (identifier) @name)) + (future_import_statement name: (aliased_import alias: (identifier) @name)) + (import_from_statement name: (aliased_import alias: (identifier) @name)) +] { + attr (@name.def) node_definition = @name } -;; from . +;; definitions are chained [ - (import_from_statement - module_name: (relative_import - (dotted_name - (identifier) @parent_name - . - (identifier) @child_name))) - (import_from_statement - module_name: (dotted_name - (identifier) @parent_name - . - (identifier) @child_name)) -] -{ - attr (@child_name.ref_dot) push_symbol = "." - edge @child_name.ref -> @child_name.ref_dot - edge @child_name.ref_dot -> @parent_name.ref + (import_statement name: (dotted_name (identifier) @left . (identifier) @right)) + (future_import_statement name: (dotted_name (identifier) @left . (identifier) @right)) + (import_from_statement name: (dotted_name (identifier) @left . (identifier) @right)) +] { + node pop_dot + attr (pop_dot) pop_symbol = "." + + edge @left.def -> pop_dot + edge pop_dot -> @right.def } -;; from X._ import _ -(import_from_statement - module_name: (dotted_name - . (identifier) @root_name)) -{ - edge @root_name.ref -> ROOT_NODE +;; connect last definition +[ + (import_statement name: (dotted_name (identifier) @last .) @outer) + (future_import_statement name: (dotted_name (identifier) @last .) @outer) + (import_from_statement name: (dotted_name (identifier) @last .) @outer) + (import_statement name: (aliased_import alias: (identifier) @last ) @outer) + (future_import_statement name: (aliased_import alias: (identifier) @last ) @outer) + (import_from_statement name: (aliased_import alias: (identifier) @last ) @outer) +] { + edge @last.def -> @outer.def } -;; from _.X import * -(import_from_statement - module_name: (dotted_name - (identifier) @leaf_name .) - (wildcard_import) @star) @stmt -{ - edge @stmt.after_scope -> @star.ref_dot - attr (@stmt.after_scope -> @star.ref_dot) precedence = 1 - edge @star.ref_dot -> @leaf_name.ref - attr (@star.ref_dot) push_symbol = "." +;; expose first definition +[ + (import_statement name: (dotted_name . (identifier) @first) @outer) + (future_import_statement name: (dotted_name . (identifier) @first) @outer) + (import_from_statement name: (dotted_name . (identifier) @first) @outer) + (import_statement name: (aliased_import alias: (identifier) @first ) @outer) + (future_import_statement name: (aliased_import alias: (identifier) @first ) @outer) + (import_from_statement name: (aliased_import alias: (identifier) @first ) @outer) +] { + edge @outer.after_scope -> @first.def +} + +;;;; Wildcard Import +;; +;; Wildcard imports simply pass through + +(wildcard_import) @wildcard { + edge @wildcard.after_scope -> @wildcard.def } -;; import _.X.Y._ -;; from _ import _.X.Y._ -;; from _ import _.X.Y._ as _ +;;;; Import Definitions -> References +;; +;; The definitions introduced by imports are connected to the corresponding references + [ - (import_statement - name: (dotted_name - (identifier) @parent_name - . - (identifier) @child_name)) - (import_from_statement - name: (dotted_name - (identifier) @parent_name - . - (identifier) @child_name)) - (import_from_statement - name: (aliased_import - name: (dotted_name - (identifier) @parent_name - . - (identifier) @child_name))) -] -{ - edge @child_name.ref -> @child_name.ref_dot - edge @child_name.ref_dot -> @parent_name.ref - edge @parent_name.def -> @parent_name.def_dot - edge @parent_name.def_dot -> @child_name.def - attr (@parent_name.def_dot) pop_symbol = "." - attr (@child_name.ref_dot) push_symbol = "." + (import_statement name: (_) @name) + (future_import_statement name: (_) @name) + (import_from_statement name: (_) @name) + (import_from_statement (wildcard_import) @name) +] { + edge @name.def -> @name.ref +} + +;;;; Imports +;; +;; The definitions introduced by imports are visible after the import statement + +[ + (import_statement name: (_) @name) + (future_import_statement name: (_) @name) + (import_from_statement name: (_) @name) + (import_from_statement (wildcard_import) @name) +] @stmt { + edge @stmt.after_scope -> @name.after_scope + attr (@stmt.after_scope -> @name.after_scope) precedence = 1 } ;; diff --git a/languages/tree-sitter-stack-graphs-python/test/imports/import_submodule_aliased.py.skip b/languages/tree-sitter-stack-graphs-python/test/imports/import_submodule_aliased.py similarity index 89% rename from languages/tree-sitter-stack-graphs-python/test/imports/import_submodule_aliased.py.skip rename to languages/tree-sitter-stack-graphs-python/test/imports/import_submodule_aliased.py index dd84f39b5..b6bfdf7b7 100644 --- a/languages/tree-sitter-stack-graphs-python/test/imports/import_submodule_aliased.py.skip +++ b/languages/tree-sitter-stack-graphs-python/test/imports/import_submodule_aliased.py @@ -7,7 +7,7 @@ import foo.bar as qux qux.BAR -# ^ defined: 7 +# ^ defined: 7, 3 # ^ defined: 3 foo From 9135ff5cb66a71e9cda1f11af85e1903066ee4ed Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 30 Nov 2023 17:59:53 +0100 Subject: [PATCH 076/202] Fix parameter definitions --- .../src/stack-graphs.tsg | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 2c8c1e847..e784c37fc 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -813,12 +813,10 @@ inherit .parent_module edge @param.param_name -> @params.before_scope } -(parameter/identifier) @name { - attr (@name.def) node_definition = @name -} (parameter/identifier) @param @name { + attr (@name.def) node_definition = @name attr (@param.param_name) push_node = @param edge @name.def -> @param.param_name edge @name.def -> @param.param_index @@ -827,13 +825,13 @@ inherit .parent_module [ (parameter/default_parameter - name: (identifier) @name + name: (_) @name value: (_) @value) @param (parameter/typed_default_parameter name: (_) @name value: (_) @value) @param -] -{ +] { + attr (@name.def) node_definition = @name attr (@param.param_name) push_node = @name edge @name.def -> @param.param_name edge @name.def -> @param.param_index @@ -848,8 +846,8 @@ inherit .parent_module (_) @name) @param (parameter/dictionary_splat_pattern (_) @name) @param -] -{ +] { + attr (@name.def) node_definition = @name attr (@param.param_name) push_node = @name edge @name.def -> @param.param_name edge @name.def -> @param.param_index From 0f4bf9b5e14a71f451663c0383a6f26fe9c566c1 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 30 Nov 2023 23:47:41 +0100 Subject: [PATCH 077/202] Fixes for pattern identifiers --- .../src/stack-graphs.tsg | 58 ++++++++++++------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index e784c37fc..7cddd6783 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -1163,20 +1163,28 @@ inherit .parent_module ;; ;; Patterns -(pattern/identifier) @name { - attr (@name.def) node_definition = @name -} -(pattern/identifier) @name -{ - edge @name.output -> @name.local_scope - edge @name.output -> @name.class_parent_scope - edge @name.local_scope -> @name.input - attr (@name.local_scope -> @name.input) precedence = 1 - attr (@name.input) node_definition = @name - attr (@name.output) push_node = @name +[ + (pattern/identifier) @name @pattern + ; identifiers in patterns + (as_pattern (identifier) @name .) @pattern + (keyword_pattern (identifier) @name) @pattern + (splat_pattern (identifier) @name) @pattern + ; every context where _simple_pattern is used, because matching + ; pattern/dotted_name does not work + (case_pattern (dotted_name . (_) @name .) @pattern) + (keyword_pattern (dotted_name . (_) @name .) @pattern) + (union_pattern (dotted_name . (_) @name .) @pattern) +] { + attr (@name.def) node_definition = @name + edge @pattern.output -> @pattern.local_scope + edge @pattern.output -> @pattern.class_parent_scope + edge @pattern.local_scope -> @pattern.input + attr (@pattern.local_scope -> @pattern.input) precedence = 1 + attr (@pattern.input) node_definition = @name + attr (@pattern.output) push_node = @name - edge @name.new_bindings -> @name.def + edge @pattern.new_bindings -> @name.def } (pattern/subscript) {} @@ -1188,7 +1196,9 @@ inherit .parent_module } -(list_splat_pattern) {} +(list_splat_pattern (_) @pattern) @list { + edge @list.new_bindings -> @pattern.new_bindings +} [ (pattern_list (_) @pattern) @@ -1208,19 +1218,27 @@ inherit .parent_module attr (pattern_index) push_symbol = (named-child-index @pattern) } -(class_pattern) {} +(class_pattern (case_pattern) @pattern) @class { + edge @class.new_bindings -> @pattern.new_bindings +} -(splat_pattern) {} +(splat_pattern (_) @pattern) @splat { + edge @splat.new_bindings -> @pattern.new_bindings +} -(union_pattern) {} +(union_pattern (_) @pattern) @union { + edge @union.new_bindings -> @pattern.new_bindings +} -(dict_pattern) {} +(dict_pattern (_) @pattern) @dict { + edge @dict.new_bindings -> @pattern.new_bindings +} (complex_pattern) {} (as_pattern (expression) @value - alias: (as_pattern_target (primary_expression/identifier) @name)) @as_pattern + alias: (as_pattern_target (identifier) @name)) @as_pattern { attr (@name.local_scope -> @name.input) precedence = 1 attr (@name.input) is_definition @@ -1231,9 +1249,9 @@ inherit .parent_module (keyword_pattern) {} -(case_pattern (_) @expr) @pat +(case_pattern (_) @pattern) @case { - edge @pat.new_bindings -> @expr.new_bindings + edge @case.new_bindings -> @pattern.new_bindings } [ From 25ecd41bbaa97bbfe7e7a1f3f2a7665b08b4ccdb Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 10:56:29 -0500 Subject: [PATCH 078/202] Object patterns. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index 99a0f98b2..4036a2cd6 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -69,6 +69,7 @@ x++; 1 + 1; -2; (x = 1); +({ x: y } = 1); x += 1; (1, 2); 1 ? 2 : 3; From c6fe01a91f43dbaaf878809733a4262da76f9f91 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 10:57:00 -0500 Subject: [PATCH 079/202] Object patterns with comments. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index 4036a2cd6..817d41eaa 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -70,6 +70,7 @@ x++; -2; (x = 1); ({ x: y } = 1); +({/**/x: y } = 1); x += 1; (1, 2); 1 ? 2 : 3; From 95dda7decd09d6419c9cdf01dd27cfa7a62fe74f Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 11:00:16 -0500 Subject: [PATCH 080/202] Allow comments occurring in object patterns. --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 5d4100acb..25df7238d 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -399,6 +399,7 @@ inherit .return_or_yield node @comment.before_scope node @comment.value node @comment.covalue + node @comment.new_bindings ; for object patterns edge @comment.after_scope -> @comment.before_scope } From 1c2b0b04f7c50c9e13c933414e4e3e21c309fd0c Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 11:04:47 -0500 Subject: [PATCH 081/202] Add a parameter. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index 99a0f98b2..f5986e241 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -8,6 +8,7 @@ debugger; var x; let x; function foo() { } +function foo(a) { } function* foo() { } class Foo { } { } From 5a22ebb33e597b3c23e40fc322edc16deaba4866 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 11:05:45 -0500 Subject: [PATCH 082/202] What if the parameter was named all collisiony? --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index f5986e241..b659631e5 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -9,6 +9,7 @@ var x; let x; function foo() { } function foo(a) { } +function foo(undefined) { } function* foo() { } class Foo { } { } From 3638c3010c91f5cb9cb95e7755208580bbd673e2 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 11:08:24 -0500 Subject: [PATCH 083/202] Hax! --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 5d4100acb..51a60c684 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -2412,6 +2412,9 @@ inherit .return_or_yield ; the value of undefined is the undefined primitive edge @undefined.value -> @undefined.builtins_undefined + + ; HACK: `undefined` is a perfectly cromulent name for a parameter, but the parser thinks it means this node instead. For the moment, work around the problem this causes by giving all `undefined` nodes covalues like parameters enjoy. + node @undefined.covalue } From fbc9e1745212baf9679e537752a5d9e6930b099b Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 11:15:01 -0500 Subject: [PATCH 084/202] Array patterns. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index 99a0f98b2..e9828c76c 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -69,6 +69,7 @@ x++; 1 + 1; -2; (x = 1); +([x] = 1); x += 1; (1, 2); 1 ? 2 : 3; From 0ff55a0cc4020623459daaee05bbb1da940427e9 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 11:15:34 -0500 Subject: [PATCH 085/202] Subscripts in patterns. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index e9828c76c..c5a1b459c 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -70,6 +70,7 @@ x++; -2; (x = 1); ([x] = 1); +([x[i]] = 1); x += 1; (1, 2); 1 ? 2 : 3; From 8b3862fc025698dc6d9aad1a64b7d9aea67e0ccf Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 11:21:29 -0500 Subject: [PATCH 086/202] Subscript expressions get covalues. --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 5d4100acb..5b30aa556 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -3132,6 +3132,8 @@ inherit .return_or_yield edge @subscript_expr.value -> @subscript_expr.index_push edge @subscript_expr.index_push -> subscript_expr_push_dot + ; subscript expressions can appear in array patterns, on the left, and thus require a covalue + node @subscript_expr.covalue } (subscript_expression From 9e1b1fd529836d64a71e341bfa8cb4b0dcd94db0 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 11:22:07 -0500 Subject: [PATCH 087/202] Subscript expressions get bindings. --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 5b30aa556..69d1737ae 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -3132,8 +3132,9 @@ inherit .return_or_yield edge @subscript_expr.value -> @subscript_expr.index_push edge @subscript_expr.index_push -> subscript_expr_push_dot - ; subscript expressions can appear in array patterns, on the left, and thus require a covalue + ; subscript expressions can appear in array patterns, on the left, and thus require a covalue & bindings node @subscript_expr.covalue + node @subscript_expr.new_bindings } (subscript_expression From 39490e385290414367c2bf1b4f217cade4981728 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 11:23:46 -0500 Subject: [PATCH 088/202] Simplify the test. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index c5a1b459c..ba2101250 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -69,8 +69,8 @@ x++; 1 + 1; -2; (x = 1); +(x[i] = 1); ([x] = 1); -([x[i]] = 1); x += 1; (1, 2); 1 ? 2 : 3; From 19bba869d9fe983050de2530c4fa899f81c04a87 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 11:32:30 -0500 Subject: [PATCH 089/202] Blank. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index 99a0f98b2..cac4d04df 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -77,4 +77,5 @@ class { }; <>doo {garply} + {} \ No newline at end of file From 0f2ab27fc4454845aee0c6c437c008456aa1de8e Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 11:37:51 -0500 Subject: [PATCH 090/202] Space. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index cac4d04df..ee7e35755 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -77,5 +77,5 @@ class { }; <>doo {garply} - {} + { } \ No newline at end of file From 8bf750acd511923d9900ce8b1eff31780cbbaf1e Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 11:38:05 -0500 Subject: [PATCH 091/202] Comment. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index ee7e35755..fe122fd94 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -78,4 +78,5 @@ class { }; <>doo {garply} { } + {/**/x} \ No newline at end of file From b218bad5b8879fa7896dba046846d805d86da7b3 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 11:39:51 -0500 Subject: [PATCH 092/202] Allow for comments in JSX expressions. --- .../src/stack-graphs.tsg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 5d4100acb..1b6b3e778 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -3675,11 +3675,15 @@ inherit .return_or_yield } -(jsx_expression (_)?@child)@jsx_expression { +(jsx_expression)@jsx_expression { node @jsx_expression.before_scope node @jsx_expression.after_scope +} + +(jsx_expression (_)?@child)@jsx_expression { + if none @child { edge @jsx_expression.after_scope -> @jsx_expression.before_scope } else { From 3efe33ef883653334e2c52ee88216963c81711c9 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 11:46:43 -0500 Subject: [PATCH 093/202] Member expressions in patterns. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index 99a0f98b2..dde20b4a1 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -69,6 +69,7 @@ x++; 1 + 1; -2; (x = 1); +({x:y.z} = 1); x += 1; (1, 2); 1 ? 2 : 3; From a6ebb27be5ab47fa9b093487ae9104991efa8197 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 11:47:43 -0500 Subject: [PATCH 094/202] Member expressions get covalues. --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 5d4100acb..8c126984c 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -3108,6 +3108,8 @@ inherit .return_or_yield edge @member_expr.value -> property_push edge member_push -> @object.value + ; (member_expression) nodes can occur in patterns + node @member_expr.covalue } ;; ##### Subscript Expressions From a0d8fb64711d2b794e1b9a416fe8155749318318 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 11:48:02 -0500 Subject: [PATCH 095/202] Member expressions get bindings. --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 8c126984c..f4ee64588 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -3110,6 +3110,7 @@ inherit .return_or_yield ; (member_expression) nodes can occur in patterns node @member_expr.covalue + node @member_expr.new_bindings } ;; ##### Subscript Expressions From 5bfd95af033c9c66e84e2d939cf460cf33480a5d Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 11:54:40 -0500 Subject: [PATCH 096/202] Tests returns of values from the top-level scope. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index 99a0f98b2..4213068ea 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -27,6 +27,7 @@ with (x) { } break; continue; return; +return x; ; foo: x; From 198e06ce1b4b562e4691a13df3e29b7af254c26d Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 11:55:09 -0500 Subject: [PATCH 097/202] Plumb the program node for returns. --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 5d4100acb..e182aa5ef 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -282,6 +282,9 @@ inherit .return_or_yield node @prog.after_scope node @prog.before_scope let @prog.closure_point = @prog.after_scope + + ; apparently it's perfectly cromulent to `return` from the top level scope (because control flow happens there too), so we make a top-level return node. + node @prog.return_or_yield } ;; ### Program Queries From cf5a9f6fe774295531fe9a11820e65d2fe38cc3a Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Jan 2024 12:46:17 -0500 Subject: [PATCH 098/202] Emphatically hacky. --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 51a60c684..fccd318d9 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -2413,7 +2413,7 @@ inherit .return_or_yield ; the value of undefined is the undefined primitive edge @undefined.value -> @undefined.builtins_undefined - ; HACK: `undefined` is a perfectly cromulent name for a parameter, but the parser thinks it means this node instead. For the moment, work around the problem this causes by giving all `undefined` nodes covalues like parameters enjoy. + ; !!!! HACK: `undefined` is a perfectly cromulent name for a parameter, but the parser thinks it means this node instead. For the moment, work around the problem this causes by giving all `undefined` nodes covalues like parameters enjoy. node @undefined.covalue } From 16efa5cc91ee5aa7af498096d7b08a934164d6c3 Mon Sep 17 00:00:00 2001 From: Rebecca Valentine Date: Thu, 1 Feb 2024 12:33:58 -0800 Subject: [PATCH 099/202] Adds missing function syntax type --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index d8b383c35..9bc0831b8 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -4792,6 +4792,7 @@ inherit .containing_class_value attr (left_ignore_guard) pop_symbol = "GUARD:GANDALF" attr (left_definiens_hook) node_definition = @left attr (left_definiens_hook) definiens_node = @assignment_expr + attr (left_definiens_hook) syntax_type = "function" edge @assignment_expr.pkg_pop -> left_ignore_guard edge left_ignore_guard -> left_definiens_hook From fea338920dc3d8b1a4c1cea74eab404903a6eab0 Mon Sep 17 00:00:00 2001 From: Rebecca Valentine Date: Thu, 1 Feb 2024 13:35:29 -0800 Subject: [PATCH 100/202] Fixes predicate bug --- .../src/stack-graphs.tsg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 9bc0831b8..17de7f014 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -4761,8 +4761,8 @@ inherit .containing_class_value property:(_)@left ) right: (_))@assignment_expr - (#not-eq @_object "module") - (#not-eq @left "exports") + (#not-eq? @_object "module") + (#not-eq? @left "exports") ) { node left_definiens_hook @@ -4782,8 +4782,8 @@ inherit .containing_class_value property:(_)@left ) right: (_))@assignment_expr - (#eq @_object "module") - (#eq @left "exports") + (#eq? @_object "module") + (#eq? @left "exports") ) { node left_definiens_hook From 94de9153970f0a2f8b509cca504a875f45378a5c Mon Sep 17 00:00:00 2001 From: Rebecca Valentine Date: Thu, 1 Feb 2024 14:36:18 -0800 Subject: [PATCH 101/202] Revert "Adds missing function syntax type" This reverts commit 16efa5cc91ee5aa7af498096d7b08a934164d6c3. --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 1 - 1 file changed, 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 17de7f014..273e2388e 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -4792,7 +4792,6 @@ inherit .containing_class_value attr (left_ignore_guard) pop_symbol = "GUARD:GANDALF" attr (left_definiens_hook) node_definition = @left attr (left_definiens_hook) definiens_node = @assignment_expr - attr (left_definiens_hook) syntax_type = "function" edge @assignment_expr.pkg_pop -> left_ignore_guard edge left_ignore_guard -> left_definiens_hook From 26bc1b12b4ad4bd448b3e5adfd53cb7a040a8ca9 Mon Sep 17 00:00:00 2001 From: Rebecca Valentine Date: Thu, 1 Feb 2024 15:12:45 -0800 Subject: [PATCH 102/202] Fixes syntax types for exports --- .../src/stack-graphs.tsg | 240 +++++++++++++++--- 1 file changed, 204 insertions(+), 36 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 273e2388e..e67bfe332 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -557,6 +557,54 @@ inherit .containing_class_value } +(export_statement "default" + value:(_)@value)@export_stmt { + + node @export_stmt.pop_guard_default + attr (@export_stmt.pop_guard_default) symbol_definition = "GUARD:DEFAULT", source_node = @value, definiens_node = @export_stmt.export_statement + edge @export_stmt.exports -> @export_stmt.pop_guard_default + edge @export_stmt.pop_guard_default -> @value.value + + ; !!!! HACK These detour nodes are a massive hack to allow find all refs land on defs + ; for the default values of modules that have useful names like the module name or + ; package name + + node detour_push + node @export_stmt.detour_pop + + scan FILE_PATH { + + "^(.+/)?([^/]+)/index\.js$" { + let module_name = $2 + attr (detour_push) push_symbol = module_name + attr (@export_stmt.detour_pop) symbol_definition = module_name, source_node = @value, definiens_node = @export_stmt + edge @export_stmt.pop_guard_default -> detour_push + edge detour_push -> @export_stmt.detour_pop + edge @export_stmt.detour_pop -> @value.value + } + + "^(.+/)?([^/]+)\.js$" { + let module_name = $2 + attr (detour_push) push_symbol = module_name + attr (@export_stmt.detour_pop) symbol_definition = module_name, source_node = @value, definiens_node = @export_stmt + edge @export_stmt.pop_guard_default -> detour_push + edge detour_push -> @export_stmt.detour_pop + edge @export_stmt.detour_pop -> @value.value + } + + } + + node default_detour_push + node @export_stmt.default_detour_pop + + attr (default_detour_push) push_symbol = "default" + attr (@export_stmt.default_detour_pop) symbol_definition = "default", source_node = @value, definiens_node = @value + edge @export_stmt.pop_guard_default -> default_detour_push + edge default_detour_push -> @export_stmt.default_detour_pop + edge @export_stmt.default_detour_pop -> @value.value + +} + (export_statement declaration: [ (function_declaration name:(identifier)@name) @@ -4438,7 +4486,7 @@ inherit .containing_class_value node pop_default_guard node pop_dot - node pop_name + node @assignment_expr.pop_name attr (pop_default_guard) symbol_definition = "GUARD:DEFAULT", source_node = @exports edge @assignment_expr.exports -> pop_default_guard @@ -4446,47 +4494,47 @@ inherit .containing_class_value attr (pop_dot) pop_symbol = "GUARD:MEMBER" edge pop_default_guard -> pop_dot - attr (pop_name) node_definition = @property - attr (pop_name) definiens_node = @assignment_expr - edge pop_dot -> pop_name - edge pop_name -> @right.value + attr (@assignment_expr.pop_name) node_definition = @property + attr (@assignment_expr.pop_name) definiens_node = @assignment_expr + edge pop_dot -> @assignment_expr.pop_name + edge @assignment_expr.pop_name -> @right.value ;; For ES6 interoperability, expose members as named exports - edge @assignment_expr.exports -> pop_name + edge @assignment_expr.exports -> @assignment_expr.pop_name node detour_push - node detour_pop + node @assignment_expr.detour_pop scan FILE_PATH { "^(.+/)?([^/]+)/index\.js$" { let module_name = $2 attr (detour_push) push_symbol = module_name - attr (detour_pop) symbol_definition = module_name, source_node = @assignment_expr, definiens_node = @assignment_expr + attr (@assignment_expr.detour_pop) symbol_definition = module_name, source_node = @assignment_expr, definiens_node = @assignment_expr edge pop_default_guard -> detour_push - edge detour_push -> detour_pop - edge detour_pop -> @right.value + edge detour_push -> @assignment_expr.detour_pop + edge @assignment_expr.detour_pop -> @right.value } "^(.+/)?([^/]+)\.js$" { let module_name = $2 attr (detour_push) push_symbol = module_name - attr (detour_pop) symbol_definition = module_name, source_node = @assignment_expr, definiens_node = @assignment_expr + attr (@assignment_expr.detour_pop) symbol_definition = module_name, source_node = @assignment_expr, definiens_node = @assignment_expr edge pop_default_guard -> detour_push - edge detour_push -> detour_pop - edge detour_pop -> @right.value + edge detour_push -> @assignment_expr.detour_pop + edge @assignment_expr.detour_pop -> @right.value } } node default_detour_push - node default_detour_pop + node @assignment_expr.default_detour_pop attr (default_detour_push) push_symbol = "default" - attr (default_detour_pop) symbol_definition = "default", source_node = @assignment_expr, definiens_node = @assignment_expr + attr (@assignment_expr.default_detour_pop) symbol_definition = "default", source_node = @assignment_expr, definiens_node = @assignment_expr edge pop_default_guard -> default_detour_push - edge default_detour_push -> default_detour_pop - edge default_detour_pop -> @right.value + edge default_detour_push -> @assignment_expr.default_detour_pop + edge @assignment_expr.default_detour_pop -> @right.value } @@ -4500,13 +4548,13 @@ inherit .containing_class_value (#eq? @exports "exports") ) { - node pop_default_guard + node @assignment_expr.pop_default_guard node pop_dot - attr (pop_default_guard) symbol_definition = "GUARD:DEFAULT", source_node = @exports - attr (pop_default_guard) definiens_node = @assignment_expr - edge @assignment_expr.exports -> pop_default_guard - edge pop_default_guard -> @right.value + attr (@assignment_expr.pop_default_guard) symbol_definition = "GUARD:DEFAULT", source_node = @exports + attr (@assignment_expr.pop_default_guard) definiens_node = @assignment_expr + edge @assignment_expr.exports -> @assignment_expr.pop_default_guard + edge @assignment_expr.pop_default_guard -> @right.value ;; For ES6 interoperability, expose members as named exports attr (pop_dot) pop_symbol = "GUARD:MEMBER" @@ -4514,38 +4562,38 @@ inherit .containing_class_value edge pop_dot -> @right.value node detour_push - node detour_pop + node @assignment_expr.detour_pop scan FILE_PATH { "^(.+/)?([^/]+)/index\.js$" { let module_name = $2 attr (detour_push) push_symbol = module_name - attr (detour_pop) symbol_definition = module_name, source_node = @assignment_expr, definiens_node = @assignment_expr - edge pop_default_guard -> detour_push - edge detour_push -> detour_pop - edge detour_pop -> @right.value + attr (@assignment_expr.detour_pop) symbol_definition = module_name, source_node = @assignment_expr, definiens_node = @assignment_expr + edge @assignment_expr.pop_default_guard -> detour_push + edge detour_push -> @assignment_expr.detour_pop + edge @assignment_expr.detour_pop -> @right.value } "^(.+/)?([^/]+)\.js$" { let module_name = $2 attr (detour_push) push_symbol = module_name - attr (detour_pop) symbol_definition = module_name, source_node = @assignment_expr, definiens_node = @assignment_expr - edge pop_default_guard -> detour_push - edge detour_push -> detour_pop - edge detour_pop -> @right.value + attr (@assignment_expr.detour_pop) symbol_definition = module_name, source_node = @assignment_expr, definiens_node = @assignment_expr + edge @assignment_expr.pop_default_guard -> detour_push + edge detour_push -> @assignment_expr.detour_pop + edge @assignment_expr.detour_pop -> @right.value } } node default_detour_push - node default_detour_pop + node @assignment_expr.default_detour_pop attr (default_detour_push) push_symbol = "default" - attr (default_detour_pop) symbol_definition = "default", source_node = @assignment_expr, definiens_node = @assignment_expr - edge pop_default_guard -> default_detour_push - edge default_detour_push -> default_detour_pop - edge default_detour_pop -> @right.value + attr (@assignment_expr.default_detour_pop) symbol_definition = "default", source_node = @assignment_expr, definiens_node = @assignment_expr + edge @assignment_expr.pop_default_guard -> default_detour_push + edge default_detour_push -> @assignment_expr.default_detour_pop + edge @assignment_expr.default_detour_pop -> @right.value } @@ -4846,6 +4894,72 @@ inherit .containing_class_value } +( + (assignment_expression + left: [ + ( ; exports.foo = ... + (member_expression + object:(_)@_exports + property:(_)@_property) + (#eq? @_exports "exports") + ) + ( ; module.exports.foo = ... + (member_expression + object:(member_expression + object:(_)@_module + property:(_)@_exports) + property:(_)@_property) + (#eq? @_module "module") + (#eq? @_exports "exports") + ) + ] + right: [ + (function) + (generator_function) + (arrow_function) + ])@assignment_expr + +) { + + attr (@assignment_expr.pop_name) syntax_type = "function" + attr (@assignment_expr.detour_pop) syntax_type = "function" + attr (@assignment_expr.default_detour_pop) syntax_type = "function" + +} + +( + (assignment_expression + left: (member_expression + object:(_)@_module + property:(_)@_exports) + right: [ + (function) + (generator_function) + (arrow_function) + ])@assignment_expr + (#eq? @_module "module") + (#eq? @_exports "exports") +) { + + attr (@assignment_expr.pop_default_guard) syntax_type = "function" + attr (@assignment_expr.detour_pop) syntax_type = "function" + attr (@assignment_expr.default_detour_pop) syntax_type = "function" + +} + +(export_statement "default" + value:[ + (function) + (generator_function) + (arrow_function) + ])@export_stmt { + + attr (@export_stmt.pop_guard_default) syntax_type = "function" + attr (@export_stmt.detour_pop) syntax_type = "function" + attr (@export_stmt.default_detour_pop) syntax_type = "function" + +} + (pair key: (_)@name value: [ @@ -4880,6 +4994,60 @@ inherit .containing_class_value } +( + (assignment_expression + left: [ + ( ; exports.foo = ... + (member_expression + object:(_)@_exports + property:(_)@_property) + (#eq? @_exports "exports") + ) + ( ; module.exports.foo = ... + (member_expression + object:(member_expression + object:(_)@_module + property:(_)@_exports) + property:(_)@_property) + (#eq? @_module "module") + (#eq? @_exports "exports") + ) + ] + right: (class))@assignment_expr + +) { + + attr (@assignment_expr.pop_name) syntax_type = "class" + attr (@assignment_expr.detour_pop) syntax_type = "class" + attr (@assignment_expr.default_detour_pop) syntax_type = "class" + +} + +( + (assignment_expression + left: (member_expression + object:(_)@_module + property:(_)@_exports) + right: (class))@assignment_expr + (#eq? @_module "module") + (#eq? @_exports "exports") +) { + + attr (@assignment_expr.pop_default_guard) syntax_type = "class" + attr (@assignment_expr.detour_pop) syntax_type = "class" + attr (@assignment_expr.default_detour_pop) syntax_type = "class" + +} + +(export_statement "default" + value:(class))@export_stmt { + + attr (@export_stmt.pop_guard_default) syntax_type = "class" + attr (@export_stmt.detour_pop) syntax_type = "class" + attr (@export_stmt.default_detour_pop) syntax_type = "class" + +} + (pair key: (_)@name value: (class)) { From 5b7b4d657ace1f20592a115b78ae415db32f41dd Mon Sep 17 00:00:00 2001 From: Rebecca Valentine Date: Thu, 1 Feb 2024 15:55:29 -0800 Subject: [PATCH 103/202] Fixes minor export statement definiens bugs --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index e67bfe332..907a1cb47 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -550,7 +550,7 @@ inherit .containing_class_value node default_detour_pop attr (default_detour_push) push_symbol = "default" - attr (default_detour_pop) symbol_definition = "default", source_node = @decl, definiens_node = @decl + attr (default_detour_pop) symbol_definition = "default", source_node = @decl, definiens_node = @export_stmt edge pop_guard_default -> default_detour_push edge default_detour_push -> default_detour_pop ; edge default_detour_pop -> @decl.value ;; FIXME declarations have no .value @@ -598,7 +598,7 @@ inherit .containing_class_value node @export_stmt.default_detour_pop attr (default_detour_push) push_symbol = "default" - attr (@export_stmt.default_detour_pop) symbol_definition = "default", source_node = @value, definiens_node = @value + attr (@export_stmt.default_detour_pop) symbol_definition = "default", source_node = @value, definiens_node = @export_stmt edge @export_stmt.pop_guard_default -> default_detour_push edge default_detour_push -> @export_stmt.default_detour_pop edge @export_stmt.default_detour_pop -> @value.value From 6bdf56879ed999e4e9a847dfb671c9c91ba0a944 Mon Sep 17 00:00:00 2001 From: Rebecca Valentine Date: Thu, 1 Feb 2024 15:55:48 -0800 Subject: [PATCH 104/202] Fixes unneeded scoped variable --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 907a1cb47..28497a917 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -513,7 +513,7 @@ inherit .containing_class_value (declaration)@decl)@export_stmt { node pop_guard_default - attr (pop_guard_default) symbol_definition = "GUARD:DEFAULT", source_node = @decl, definiens_node = @export_stmt.export_statement + attr (pop_guard_default) symbol_definition = "GUARD:DEFAULT", source_node = @decl, definiens_node = @export_stmt edge @export_stmt.exports -> pop_guard_default ;; edge export_stmt_pop_guard_default -> @decl.value ;; FIXME declarations have no .value @@ -561,7 +561,7 @@ inherit .containing_class_value value:(_)@value)@export_stmt { node @export_stmt.pop_guard_default - attr (@export_stmt.pop_guard_default) symbol_definition = "GUARD:DEFAULT", source_node = @value, definiens_node = @export_stmt.export_statement + attr (@export_stmt.pop_guard_default) symbol_definition = "GUARD:DEFAULT", source_node = @value, definiens_node = @export_stmt edge @export_stmt.exports -> @export_stmt.pop_guard_default edge @export_stmt.pop_guard_default -> @value.value From 840d9f8fa58a70d915f469097d3687ac6c3fedb5 Mon Sep 17 00:00:00 2001 From: Rebecca Valentine Date: Thu, 1 Feb 2024 16:22:58 -0800 Subject: [PATCH 105/202] Removes redundant default nodes --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 5 ----- 1 file changed, 5 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 28497a917..be7041697 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -790,13 +790,8 @@ inherit .containing_class_value (export_statement value:(_)@default_expr)@export_stmt { - node pop_default_guard - - attr (pop_default_guard) symbol_definition = "GUARD:DEFAULT", source_node = @export_stmt, definiens_node = @export_stmt.export_statement edge @default_expr.before_scope -> @export_stmt.before_scope edge @export_stmt.after_scope -> @default_expr.after_scope - edge @export_stmt.exports -> pop_default_guard - edge pop_default_guard -> @default_expr.value } From 187f972a06aa56d0104fed6a7079afa02c532fb2 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Fri, 2 Feb 2024 10:23:32 -0500 Subject: [PATCH 106/202] Test an identifier decorator. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index fde1656aa..4e61d5389 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -12,6 +12,7 @@ function foo(a) { } function foo(undefined) { } function* foo() { } class Foo { } +@Foo class Bar { } { } if (true) { } if (true) { } else { } From 8e9114e78e0ae61b110dfe04bdd0fda6ca461ae6 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Fri, 2 Feb 2024 10:24:19 -0500 Subject: [PATCH 107/202] Test a call expression decorator. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index 4e61d5389..8eb29e333 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -13,6 +13,7 @@ function foo(undefined) { } function* foo() { } class Foo { } @Foo class Bar { } +@Foo() class Bar { } { } if (true) { } if (true) { } else { } From 55ba0852f12fd979917387ab8bce918c5a6f9fd3 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Fri, 2 Feb 2024 10:43:31 -0500 Subject: [PATCH 108/202] Test member expression decorators. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index 8eb29e333..e3c659745 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -13,6 +13,7 @@ function foo(undefined) { } function* foo() { } class Foo { } @Foo class Bar { } +@Foo.Quux class Bar { } @Foo() class Bar { } { } if (true) { } From 1350957293760199b94f72e21e175d80cfcbfabc Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Fri, 2 Feb 2024 10:44:49 -0500 Subject: [PATCH 109/202] Test member expression in call expression decorators. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index e3c659745..cc4076cf5 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -15,6 +15,7 @@ class Foo { } @Foo class Bar { } @Foo.Quux class Bar { } @Foo() class Bar { } +@Foo.Quux() class Bar { } { } if (true) { } if (true) { } else { } From 0b386a1fa84373dca1cb29643c5e66a08651d09b Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Fri, 2 Feb 2024 13:13:07 -0500 Subject: [PATCH 110/202] Handle identifiers more or less uniformly. --- .../src/stack-graphs.tsg | 32 ++++++------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index d8b383c35..4b2aef557 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -411,6 +411,15 @@ inherit .containing_class_value edge @comment.after_scope -> @comment.before_scope } +(identifier) @identifier { + node @identifier.before_scope + node @identifier.after_scope + node @identifier.value + node @identifier.covalue + node @identifier.new_bindings + edge @identifier.after_scope -> @identifier.before_scope +} + @@ -2226,7 +2235,6 @@ inherit .containing_class_value (member_expression) (parenthesized_expression) (undefined) - (primary_expression/identifier) (this) (super) (number) @@ -2355,9 +2363,6 @@ inherit .containing_class_value ;; #### Variables (primary_expression/identifier)@variable { - ; scopes don't change - edge @variable.after_scope -> @variable.before_scope - ; value is a lookup, ie a push attr (@variable.value) node_reference = @variable edge @variable.value -> @variable.before_scope @@ -2864,16 +2869,9 @@ inherit .containing_class_value (arrow_function parameter:(_)@param)@fun { - - node @param.after_scope node param_arg_index - node @param.before_scope - node @param.covalue node param_pop - ; scope flows from the param right back out - edge @param.after_scope -> @param.before_scope - ; but augmented with a pop, b/c it's not a pattern attr (param_pop) node_definition = @param edge param_pop -> @param.covalue @@ -3742,12 +3740,6 @@ inherit .containing_class_value name:(identifier)@element_name) ] { - - node @element_name.before_scope - node @element_name.after_scope - - edge @element_name.after_scope -> @element_name.before_scope - scan (source-text @element_name) { ; standard HTML elements "^(a|abbr|acronym|address|applet|area|article|aside|audio|b|base|basefont|bdi|bdo|big|blockquote|body|br|button|canvas|caption|center|cite|code|col|colgroup|data|datalist|dd|del|details|dfn|dialog|dir|div|dl|dt|em|embed|fieldset|figcaption|figure|font|footer|form|frame|frameset|h1|h2|h3|h4|h5|h6|head|header|hgroup|hr|html|i|iframe|input|ins|kbd|label|legend|li|link|main|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|picture|pre|progress|q|rp|rt|ruby|s|samp|script|search|section|select|small|source|span|strike|strong|style|sub|summary|sup|svg|table|tbody|td|template|textarea|tfoot|th|thead|time|title|tr|track|tt|u|ul|var|video|wbr)$" { @@ -3776,8 +3768,6 @@ inherit .containing_class_value (identifier)@first_part (identifier)@second_part)@nested_identifier { - node @first_part.value - node @second_part.value node guard_member attr (@first_part.value) node_reference = @first_part @@ -3794,7 +3784,6 @@ inherit .containing_class_value (nested_identifier)@first_part (identifier)@second_part)@nested_identifier { - node @second_part.value node guard_member attr (@second_part.value) node_reference = @second_part @@ -4086,13 +4075,11 @@ inherit .containing_class_value ;; ### Attributes Defined on Patterns ;; TODO [ - (assignment_expression left:(identifier)@pattern) (assignment_pattern)@pattern (object_pattern)@pattern (array_pattern)@pattern (rest_pattern)@pattern (pair_pattern)@pattern - (pattern/identifier)@pattern (pattern/property_identifier)@pattern (object_assignment_pattern)@pattern (shorthand_property_identifier_pattern)@pattern @@ -4117,7 +4104,6 @@ inherit .containing_class_value ; scope flows through, binding via a pop edge that goes to an unknown value attr (ident_pat_pop) node_definition = @ident_pat edge ident_pat_pop -> @ident_pat.covalue - edge @ident_pat.after_scope -> @ident_pat.before_scope edge @ident_pat.after_scope -> ident_pat_pop edge @ident_pat.new_bindings -> ident_pat_pop From 76e4b05d9a11e6ccd4a09f240a7e37700a2671fe Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Tue, 6 Feb 2024 12:08:23 -0500 Subject: [PATCH 111/202] Test fields. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index cc4076cf5..686dfb340 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -11,7 +11,9 @@ function foo() { } function foo(a) { } function foo(undefined) { } function* foo() { } -class Foo { } +class Foo { + #x = null; +} @Foo class Bar { } @Foo.Quux class Bar { } @Foo() class Bar { } From 5563c01a9c8310ce1af729661800614fbd2effe2 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Tue, 6 Feb 2024 12:13:57 -0500 Subject: [PATCH 112/202] Always give field defs scopes. --- .../src/stack-graphs.tsg | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 6680f4a90..84b11546f 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -1661,11 +1661,14 @@ inherit .containing_class_value +(field_definition)@field_def { + node @field_def.after_scope + node @field_def.before_scope +} + (field_definition property:(property_identifier)@property)@field_def { - node @field_def.after_scope - node @field_def.before_scope node @property.pop node property_pop_dot From 82679f8acfd9b63b5dd60a134c89d39a6711a5de Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Tue, 6 Feb 2024 12:15:48 -0500 Subject: [PATCH 113/202] Generalize to accept private properties. --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 84b11546f..956cd0406 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -1667,7 +1667,7 @@ inherit .containing_class_value } (field_definition - property:(property_identifier)@property)@field_def { + property:(_)@property)@field_def { node @property.pop node property_pop_dot From b01ce15ea301937a8a501e8404ff34c9d1c33405 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Thu, 8 Feb 2024 12:53:13 -0500 Subject: [PATCH 114/202] Test comments in export lists. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index 686dfb340..44e7727c4 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -3,6 +3,10 @@ // foo export let x = 1; +export { + // x + A +}; import "foo"; debugger; var x; From 0e6ef5be587b649ed64d1d8e7172f821db527b61 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Thu, 8 Feb 2024 12:56:35 -0500 Subject: [PATCH 115/202] Support comments in export clauses. --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 956cd0406..677436013 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -409,6 +409,7 @@ inherit .containing_class_value node @comment.covalue node @comment.new_bindings ; for object patterns edge @comment.after_scope -> @comment.before_scope + node @comment.source ; for export clauses with multiple exports } (identifier) @identifier { From b4f16e10a6fef97cc7125b5924cc67e3511f53af Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Fri, 9 Feb 2024 09:47:32 -0500 Subject: [PATCH 116/202] Test class static blocks. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index 686dfb340..ab0cf1c05 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -13,6 +13,7 @@ function foo(undefined) { } function* foo() { } class Foo { #x = null; + static {} } @Foo class Bar { } @Foo.Quux class Bar { } From e69c8cbe27156edefbc26e2b9417e53c54fa403c Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Fri, 9 Feb 2024 09:51:46 -0500 Subject: [PATCH 117/202] Class static blocks have before/after scopes. --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 956cd0406..c5e72fd27 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -1693,6 +1693,11 @@ inherit .containing_class_value edge @property.pop -> @value.value } +(class_static_block) @static_block { + node @static_block.before_scope + node @static_block.after_scope +} + ;; #### Statement Block From 4ef094357d0ef1a2058785bc1865230063bb7563 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Fri, 9 Feb 2024 09:54:15 -0500 Subject: [PATCH 118/202] Propagate scopes internally. --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index c5e72fd27..6d32ef9d8 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -1693,9 +1693,11 @@ inherit .containing_class_value edge @property.pop -> @value.value } -(class_static_block) @static_block { +(class_static_block body: (_) @body) @static_block { node @static_block.before_scope node @static_block.after_scope + + edge @body.before_scope -> @static_block.before_scope } From 7c36737c08c9e66d407da2ec03b3904aa6a2665d Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Fri, 9 Feb 2024 09:54:39 -0500 Subject: [PATCH 119/202] Propagate scopes laterally. --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 6d32ef9d8..1f0ef3d9a 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -1698,6 +1698,8 @@ inherit .containing_class_value node @static_block.after_scope edge @body.before_scope -> @static_block.before_scope + + edge @static_block.after_scope -> @static_block.before_scope } From e05c9db6a7a4813cb035ca61f93ed90545855583 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Fri, 9 Feb 2024 10:10:26 -0500 Subject: [PATCH 120/202] Test computed property names. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index 686dfb340..75c74691f 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -13,6 +13,7 @@ function foo(undefined) { } function* foo() { } class Foo { #x = null; + get [/**/ foo]() {} } @Foo class Bar { } @Foo.Quux class Bar { } From c4255f04fad9fc0414b70aea88f53922d0d7fef5 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Fri, 9 Feb 2024 10:11:59 -0500 Subject: [PATCH 121/202] Construct the scopes exactly once. --- .../src/stack-graphs.tsg | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 956cd0406..f5729a37a 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -2582,10 +2582,13 @@ inherit .containing_class_value ; pairs -(computed_property_name (_)@expr)@computed_property_name { - +(computed_property_name)@computed_property_name { node @computed_property_name.after_scope node @computed_property_name.before_scope +} + +(computed_property_name (_)@expr)@computed_property_name { + edge @expr.before_scope -> @computed_property_name.before_scope edge @computed_property_name.after_scope -> @expr.after_scope From bd403b61969f57f0d49fe75c6e0c4b0c892a24e5 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Fri, 9 Feb 2024 13:05:30 -0500 Subject: [PATCH 122/202] Test namespaced JSX names. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index 686dfb340..74556c075 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -93,4 +93,6 @@ class { }; {garply} { } {/**/x} - \ No newline at end of file +; +; +; \ No newline at end of file From 4fc8fe354f84ebe7165d505a6fcd70f7662ffc7d Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Fri, 9 Feb 2024 13:09:43 -0500 Subject: [PATCH 123/202] Namespace names have scopes. --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 956cd0406..9043ee469 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -3698,6 +3698,11 @@ inherit .containing_class_value } +(jsx_namespace_name (_) @lhs (_) @rhs)@name { + node @name.before_scope + node @name.after_scope +} + (jsx_self_closing_element name:(_)@element_name)@jsx_self_closing_element { From f631081cd53d2cf3b2d498a5c8064bbd505f5dbc Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Fri, 9 Feb 2024 13:10:23 -0500 Subject: [PATCH 124/202] The namespace follows the scopes. --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 9043ee469..8db276908 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -3701,6 +3701,8 @@ inherit .containing_class_value (jsx_namespace_name (_) @lhs (_) @rhs)@name { node @name.before_scope node @name.after_scope + + edge @lhs.before_scope -> @name.before_scope } (jsx_self_closing_element From 297d6078f9ad5175f7576e49dbcd7e7d619c1d3a Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Fri, 9 Feb 2024 13:11:43 -0500 Subject: [PATCH 125/202] Namespaced names' namespaced names are namespaced. I'm unsure whether this is the right thing to do, and I'm unsure whether it matters. --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 8db276908..8a01f4a3d 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -3703,6 +3703,7 @@ inherit .containing_class_value node @name.after_scope edge @lhs.before_scope -> @name.before_scope + edge @rhs.before_scope -> @lhs.after_scope } (jsx_self_closing_element From 397a9c9d1cf7c2d375af5f46921c71366784f5b1 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Fri, 9 Feb 2024 13:12:03 -0500 Subject: [PATCH 126/202] Flow. --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index 8a01f4a3d..75b93e9d4 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -3704,6 +3704,7 @@ inherit .containing_class_value edge @lhs.before_scope -> @name.before_scope edge @rhs.before_scope -> @lhs.after_scope + edge @name.after_scope -> @name.before_scope } (jsx_self_closing_element From 1afad1c1fcc47c6af1c659f00b28931ef9f9cb8b Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Fri, 9 Feb 2024 15:24:05 -0500 Subject: [PATCH 127/202] Test with a method (property?) named constructor. --- .../tree-sitter-stack-graphs-javascript/test/base_syntax.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js index cd29e4266..4cf3170d0 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/base_syntax.js @@ -11,6 +11,9 @@ import "foo"; debugger; var x; let x; +let x = { + get constructor() {} +}; function foo() { } function foo(a) { } function foo(undefined) { } From 61648e1cf51a12625657a404020bb28620aed46d Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Fri, 9 Feb 2024 15:28:14 -0500 Subject: [PATCH 128/202] Add the requisite things for objects/classes. --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index cc33b7e23..e69a4636a 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -2525,6 +2525,9 @@ inherit .containing_class_value attr (@object.member_pop) pop_symbol = "GUARD:MEMBER" edge @object.value -> @object.member_pop + node @object.class_value + node @object.constructor + } ; empty objects From 3f3b9bca955567497b031aebfd9d981408ad887e Mon Sep 17 00:00:00 2001 From: Rebecca Valentine Date: Tue, 13 Feb 2024 13:46:12 -0800 Subject: [PATCH 129/202] Adds pairs --- languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 7cddd6783..48353f14a 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -152,6 +152,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n (set) (set_comprehension) (tuple) + (pair) (parenthesized_expression) (generator_expression) (ellipsis) From 4b613bf38963f8a0cce38e070d2e48d35a6c2101 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Tue, 5 Mar 2024 14:17:16 +0100 Subject: [PATCH 130/202] Update dependency versions to fix install problems. --- .github/workflows/ci.yml | 37 ++++++++++--------- .../tree-sitter-stack-graphs-java/Cargo.toml | 14 +++++-- lsp-positions/Cargo.toml | 10 +++-- stack-graphs/Cargo.toml | 7 ++-- tree-sitter-stack-graphs/Cargo.toml | 9 +++-- 5 files changed, 45 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cad93d701..0d6ec91bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,12 +17,17 @@ jobs: strategy: matrix: rust: [stable] + env: + # cargo hack does not use the default-members in Cargo.toml, so we restrict to those explicitly + CARGO_HACK: cargo hack -p lsp-positions -p stack-graphs -p tree-sitter-stack-graphs --feature-powerset --exclude-features copious-debugging steps: - name: Install Rust environment uses: hecrj/setup-rust-action@v1 with: rust-version: ${{ matrix.rust }} + - name: Install cargo-hack + run: cargo install cargo-hack - name: Checkout code uses: actions/checkout@v3 - name: Check formatting @@ -36,28 +41,24 @@ jobs: key: ${{ runner.OS }}-cargo-${{ hashFiles('**/Cargo.lock') }} restore-keys: | ${{ runner.OS }}-cargo- + - name: Build library (all feature combinations) + run: ${{ env.CARGO_HACK }} --no-dev-deps build + - name: Run test suite (all feature combinations) + run: ${{ env.CARGO_HACK }} test + - name: Run test suite with all optimizations (default features) + run: cargo test --release - name: Install cargo-valgrind run: | sudo apt-get update sudo apt-get install -y valgrind cargo install cargo-valgrind - - name: Build library - run: cargo build + - name: Run test suite under valgrind (default features) + # We only need to use valgrind to test the crates that have C bindings. + run: cargo valgrind test -p stack-graphs - name: Ensure C headers are up to date run: | script/cbindgen test -z "$(git status --porcelain)" - - name: Run test suite - run: cargo test - - name: Run test suite under valgrind - # We only need to use valgrind to test the crates that have C bindings. - run: cargo valgrind test -p stack-graphs - - name: Run lsp-positions tests without tree-sitter - run: cargo test -p lsp-positions --no-default-features - - name: Run test suite with all features enabled - run: cargo test --all-features - - name: Run test suite with all optimizations - run: cargo test --release test-init: needs: [test-rust] @@ -112,6 +113,8 @@ jobs: uses: hecrj/setup-rust-action@v1 with: rust-version: ${{ matrix.rust }} + - name: Install cargo-hack + run: cargo install cargo-hack - name: Cache dependencies uses: actions/cache@v3 with: @@ -123,10 +126,10 @@ jobs: ${{ runner.OS }}-cargo- - name: Checkout code uses: actions/checkout@v3 - - name: Build - run: cargo build -p ${{ matrix.language }} - - name: Test - run: cargo test -p ${{ matrix.language }} + - name: Build (all feature combinations) + run: cargo hack -p ${{ matrix.language }} --feature-powerset build + - name: Test (all features) + run: cargo test -p ${{ matrix.language }} --all-features test-cli: runs-on: ubuntu-latest diff --git a/languages/tree-sitter-stack-graphs-java/Cargo.toml b/languages/tree-sitter-stack-graphs-java/Cargo.toml index 8bd3e5f93..21b5b25fa 100644 --- a/languages/tree-sitter-stack-graphs-java/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-java/Cargo.toml @@ -23,6 +23,7 @@ keywords = ["tree-sitter", "stack-graphs", "java"] [[bin]] name = "tree-sitter-stack-graphs-java" path = "rust/bin.rs" +required-features = ["cli"] [lib] path = "rust/lib.rs" @@ -33,8 +34,15 @@ name = "test" path = "rust/test.rs" harness = false # need to provide own main function to handle running tests +[features] +cli = ["anyhow", "clap", "tree-sitter-stack-graphs/cli"] + [dependencies] -anyhow = "1.0" -clap = { version = "4", features = ["derive"] } -tree-sitter-stack-graphs = { version = "0.7", path = "../../tree-sitter-stack-graphs", features=["cli"] } +anyhow = { version = "1.0", optional = true } +clap = { version = "4", features = ["derive"], optional = true } tree-sitter-java = { version = "=0.20.0" } +tree-sitter-stack-graphs = { version = "0.7", path = "../../tree-sitter-stack-graphs" } + +[dev-dependencies] +anyhow = { version = "1.0" } +tree-sitter-stack-graphs = { version = "0.7", path = "../../tree-sitter-stack-graphs", features = ["cli"] } diff --git a/lsp-positions/Cargo.toml b/lsp-positions/Cargo.toml index 242a894ff..b7422a9d7 100644 --- a/lsp-positions/Cargo.toml +++ b/lsp-positions/Cargo.toml @@ -22,7 +22,9 @@ tree-sitter = ["dep:tree-sitter"] [dependencies] memchr = "2.4" -tree-sitter = { version=">= 0.19", optional=true } -unicode-segmentation = { version="1.8" } -serde = { version="1", optional=true, features=["derive"] } -bincode = { version="2.0.0-rc.3", optional=true } +tree-sitter = { version = "0.20", optional = true } # keep the same minor version as the tree-sitter + # dependency of tree-sitter-stack-graphs to prevent + # install problems +unicode-segmentation = { version = "1.8" } +serde = { version = "1", features = ["derive"], optional = true } +bincode = { version = "2.0.0-rc.3", optional = true } diff --git a/stack-graphs/Cargo.toml b/stack-graphs/Cargo.toml index 2e55e1768..0633d40c4 100644 --- a/stack-graphs/Cargo.toml +++ b/stack-graphs/Cargo.toml @@ -25,12 +25,12 @@ test = false [dependencies] bincode = { version = "2.0.0-rc.3", optional = true } -bitvec = "1.0" -controlled-option = "0.4" +bitvec = "1.0.1" +controlled-option = "0.4.1" either = "1.6" enumset = "1.1" fxhash = "0.2" -itertools = "0.10" +itertools = "0.10.2" libc = "0.2" lsp-positions = { version = "0.3", path = "../lsp-positions" } rusqlite = { version = "0.28", optional = true, features = ["bundled", "functions"] } @@ -42,7 +42,6 @@ thiserror = { version = "1.0" } [dev-dependencies] assert-json-diff = "2" -itertools = "0.10" maplit = "1.0" pretty_assertions = "0.7" serde_json = { version = "1.0" } diff --git a/tree-sitter-stack-graphs/Cargo.toml b/tree-sitter-stack-graphs/Cargo.toml index d5429304a..ddce19309 100644 --- a/tree-sitter-stack-graphs/Cargo.toml +++ b/tree-sitter-stack-graphs/Cargo.toml @@ -49,12 +49,12 @@ lsp = [ ] [dependencies] -anyhow = "1.0" +anyhow = "1.0.4" base64 = { version = "0.21", optional = true } capture-it = { version = "0.3", optional = true } clap = { version = "4", optional = true, features = ["derive"] } colored = { version = "2.0", optional = true } -controlled-option = ">=0.4" +controlled-option = "0.4.1" crossbeam-channel = { version = "0.5", optional = true } dialoguer = { version = "0.10", optional = true } dirs = { version = "5", optional = true } @@ -69,12 +69,13 @@ regex = "1" rust-ini = "0.18" serde_json = { version="1.0", optional=true } sha1 = { version="0.10", optional=true } -stack-graphs = { version=">=0.11, <=0.12", path="../stack-graphs" } +stack-graphs = { version="0.12", path="../stack-graphs" } thiserror = "1.0" time = { version = "0.3", optional = true } tokio = { version = "1.26", optional = true, features = ["io-std", "rt", "rt-multi-thread"] } tower-lsp = { version = "0.19", optional = true } -tree-sitter = ">= 0.19" +tree-sitter = "0.20" # keep the same minor version as the tree-sitter dependency + # of tree-sitter-graph to prevent install problems tree-sitter-config = { version = "0.19", optional = true } tree-sitter-graph = "0.11" tree-sitter-loader = "0.20" From 9a7a566f8f4ce13d3bfb3b3be60d37761a895f7d Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Tue, 5 Mar 2024 19:06:59 +0100 Subject: [PATCH 131/202] Bump lsp-positions to v0.3.3 --- lsp-positions/CHANGELOG.md | 4 ++++ lsp-positions/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lsp-positions/CHANGELOG.md b/lsp-positions/CHANGELOG.md index 36a0d4ebd..a9e17c13f 100644 --- a/lsp-positions/CHANGELOG.md +++ b/lsp-positions/CHANGELOG.md @@ -5,6 +5,10 @@ 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.3 -- 2024-03-05 + +The `tree-sitter` dependency version was updated to fix install problems. + ## v0.3.2 -- 2023-06-08 ### Added diff --git a/lsp-positions/Cargo.toml b/lsp-positions/Cargo.toml index b7422a9d7..7054def14 100644 --- a/lsp-positions/Cargo.toml +++ b/lsp-positions/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lsp-positions" -version = "0.3.2" +version = "0.3.3" description = "LSP-compatible character positions" homepage = "https://github.com/github/stack-graphs/tree/main/lsp-positions" repository = "https://github.com/github/stack-graphs/" From a7f9d9cb0e682aa672d77a5ce2e57f148776ac78 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Tue, 5 Mar 2024 19:21:23 +0100 Subject: [PATCH 132/202] Bump tree-sitter-stack-graphs to v0.8.0 --- languages/tree-sitter-stack-graphs-java/Cargo.toml | 4 ++-- languages/tree-sitter-stack-graphs-javascript/Cargo.toml | 4 ++-- languages/tree-sitter-stack-graphs-python/Cargo.toml | 4 ++-- languages/tree-sitter-stack-graphs-typescript/Cargo.toml | 4 ++-- tree-sitter-stack-graphs/CHANGELOG.md | 4 +++- tree-sitter-stack-graphs/Cargo.toml | 2 +- tree-sitter-stack-graphs/README.md | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-java/Cargo.toml b/languages/tree-sitter-stack-graphs-java/Cargo.toml index 21b5b25fa..8af4b3277 100644 --- a/languages/tree-sitter-stack-graphs-java/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-java/Cargo.toml @@ -41,8 +41,8 @@ cli = ["anyhow", "clap", "tree-sitter-stack-graphs/cli"] anyhow = { version = "1.0", optional = true } clap = { version = "4", features = ["derive"], optional = true } tree-sitter-java = { version = "=0.20.0" } -tree-sitter-stack-graphs = { version = "0.7", path = "../../tree-sitter-stack-graphs" } +tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs" } [dev-dependencies] anyhow = { version = "1.0" } -tree-sitter-stack-graphs = { version = "0.7", path = "../../tree-sitter-stack-graphs", features = ["cli"] } +tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs", features = ["cli"] } diff --git a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml index 624edbab2..5c9522f77 100644 --- a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml @@ -31,9 +31,9 @@ clap = { version = "4", optional = true } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" stack-graphs = { version = "0.12", path = "../../stack-graphs" } -tree-sitter-stack-graphs = { version = "0.7", path = "../../tree-sitter-stack-graphs" } +tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs" } tree-sitter-javascript = { git = "https://github.com/tree-sitter/tree-sitter-javascript", rev = "5720b249490b3c17245ba772f6be4a43edb4e3b7" } [dev-dependencies] anyhow = "1.0" -tree-sitter-stack-graphs = { version = "0.7", path = "../../tree-sitter-stack-graphs", features = ["cli"] } +tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs", features = ["cli"] } diff --git a/languages/tree-sitter-stack-graphs-python/Cargo.toml b/languages/tree-sitter-stack-graphs-python/Cargo.toml index 4ac4c0633..17cfa3d72 100644 --- a/languages/tree-sitter-stack-graphs-python/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-python/Cargo.toml @@ -30,9 +30,9 @@ cli = ["anyhow", "clap", "tree-sitter-stack-graphs/cli"] [dependencies] anyhow = { version = "1.0", optional = true } clap = { version = "4", optional = true, features = ["derive"] } -tree-sitter-stack-graphs = { version = "0.7", path = "../../tree-sitter-stack-graphs" } +tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs" } tree-sitter-python = "=0.20.4" [dev-dependencies] anyhow = "1.0" -tree-sitter-stack-graphs = { version = "0.7", path = "../../tree-sitter-stack-graphs", features = ["cli"] } +tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs", features = ["cli"] } diff --git a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml index da5df7ef9..fa273c2cd 100644 --- a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml @@ -33,10 +33,10 @@ glob = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" stack-graphs = { version = ">=0.11, <=0.12", path = "../../stack-graphs" } -tree-sitter-stack-graphs = { version = "0.7", path = "../../tree-sitter-stack-graphs" } +tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs" } tree-sitter-typescript = "=0.20.2" tsconfig = "0.1.0" [dev-dependencies] anyhow = { version = "1.0" } -tree-sitter-stack-graphs = { version = "0.7", path = "../../tree-sitter-stack-graphs", features = ["cli"] } +tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs", features = ["cli"] } diff --git a/tree-sitter-stack-graphs/CHANGELOG.md b/tree-sitter-stack-graphs/CHANGELOG.md index 8d8ef7ca1..50f8b1f9b 100644 --- a/tree-sitter-stack-graphs/CHANGELOG.md +++ b/tree-sitter-stack-graphs/CHANGELOG.md @@ -5,7 +5,9 @@ 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). -## Unreleased +## v0.8.0 -- 2024-03-05 + +The `tree-sitter` dependency version was updated to fix install problems. ### Library diff --git a/tree-sitter-stack-graphs/Cargo.toml b/tree-sitter-stack-graphs/Cargo.toml index ddce19309..40b750641 100644 --- a/tree-sitter-stack-graphs/Cargo.toml +++ b/tree-sitter-stack-graphs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tree-sitter-stack-graphs" -version = "0.7.1" +version = "0.8.0" description = "Create stack graphs using tree-sitter parsers" homepage = "https://github.com/github/stack-graphs/tree/main/tree-sitter-stack-graphs" repository = "https://github.com/github/stack-graphs/" diff --git a/tree-sitter-stack-graphs/README.md b/tree-sitter-stack-graphs/README.md index dc7b18a80..ad1287ad5 100644 --- a/tree-sitter-stack-graphs/README.md +++ b/tree-sitter-stack-graphs/README.md @@ -14,7 +14,7 @@ To use this library, add the following to your `Cargo.toml`: ```toml [dependencies] -tree-sitter-stack-graphs = "0.7" +tree-sitter-stack-graphs = "0.8" ``` Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs/*/) for more details on how to use this library. From 640ba5efeeb67c39f2bea9e3f71c663be3d90376 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 6 Mar 2024 11:30:31 +0100 Subject: [PATCH 133/202] Release stack-graphs v0.13.0 and tree-sitter-stack-graphs v0.8.1 --- .../Cargo.toml | 2 +- .../Cargo.toml | 2 +- stack-graphs/CHANGELOG.md | 26 +++++++++++++++++++ stack-graphs/Cargo.toml | 2 +- stack-graphs/README.md | 2 +- stack-graphs/src/graph.rs | 2 +- tree-sitter-stack-graphs/CHANGELOG.md | 4 +++ tree-sitter-stack-graphs/Cargo.toml | 4 +-- 8 files changed, 37 insertions(+), 7 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml index 5c9522f77..6c7006d9a 100644 --- a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml @@ -30,7 +30,7 @@ anyhow = { version = "1.0", optional = true } clap = { version = "4", optional = true } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -stack-graphs = { version = "0.12", path = "../../stack-graphs" } +stack-graphs = { version = "0.13", path = "../../stack-graphs" } tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs" } tree-sitter-javascript = { git = "https://github.com/tree-sitter/tree-sitter-javascript", rev = "5720b249490b3c17245ba772f6be4a43edb4e3b7" } diff --git a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml index fa273c2cd..be86d78cd 100644 --- a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml @@ -32,7 +32,7 @@ clap = { version = "4", optional = true } glob = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -stack-graphs = { version = ">=0.11, <=0.12", path = "../../stack-graphs" } +stack-graphs = { version = "0.13", path = "../../stack-graphs" } tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs" } tree-sitter-typescript = "=0.20.2" tsconfig = "0.1.0" diff --git a/stack-graphs/CHANGELOG.md b/stack-graphs/CHANGELOG.md index c61221e8e..fa051176d 100644 --- a/stack-graphs/CHANGELOG.md +++ b/stack-graphs/CHANGELOG.md @@ -5,6 +5,32 @@ 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.13.0 -- 2024-03-06 + +### Added + +- New type `StitcherConfig` to specify configuration flags that control stitching. +- Path stiching statistics can now be collected during stitching for debugging purposes. Disabled by default and can be enabled with `StitcherConfig`. +- A method `StackGraph::set_edge_precedence` that allows changing the precendence of an existing edge in a stack graph. +- A method `StackGraph::incoming_edge_degree` that returns the number of edges ending in a given node. +- A method `Database::get_incoming_path_degree` that returns the number of partial paths in the database ending in a given node. +- Cycle detection improved by using incoming path or edge degrees to reduce the amount of data to keep in memory. +- Visualization uses different colors for nodes of different files, which makes understanding multi-file graphs easier. + +### Changed + +- Methods and types that do stitching in their implementation now require a `StitcherConfig` value. These include `Assertion::run`, `ForwardPartialPathStitcher::find_*`, and `Test::run`. +- The SQLite storage data encoding and queries changed to improve performance. + +### Removed + +- Method `StackGraph::remove_edge` has been removed. + +### Fixed + +- A panic when using an arena after `Arena::clear` or `SupplementalArena::clear` was called. +- Missing candidates when looking up root paths in a `Database`. + ## v0.12.0 -- 2023-07-27 ### Added diff --git a/stack-graphs/Cargo.toml b/stack-graphs/Cargo.toml index 0633d40c4..2e40b76eb 100644 --- a/stack-graphs/Cargo.toml +++ b/stack-graphs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "stack-graphs" -version = "0.12.0" +version = "0.13.0" description = "Name binding for arbitrary programming languages" homepage = "https://github.com/github/stack-graphs/tree/main/stack-graphs" repository = "https://github.com/github/stack-graphs/" diff --git a/stack-graphs/README.md b/stack-graphs/README.md index 7805d19ef..0c6a9e878 100644 --- a/stack-graphs/README.md +++ b/stack-graphs/README.md @@ -9,7 +9,7 @@ To use this library, add the following to your `Cargo.toml`: ``` toml [dependencies] -stack-graphs = "0.12" +stack-graphs = "0.13" ``` Check out our [documentation](https://docs.rs/stack-graphs/) for more details on diff --git a/stack-graphs/src/graph.rs b/stack-graphs/src/graph.rs index fe1321387..84748c6bf 100644 --- a/stack-graphs/src/graph.rs +++ b/stack-graphs/src/graph.rs @@ -1307,7 +1307,7 @@ impl StackGraph { } } - /// Removes an edge from the stack graph. + /// Sets edge precedence of the given edge. pub fn set_edge_precedence( &mut self, source: Handle, diff --git a/tree-sitter-stack-graphs/CHANGELOG.md b/tree-sitter-stack-graphs/CHANGELOG.md index 50f8b1f9b..2b907e682 100644 --- a/tree-sitter-stack-graphs/CHANGELOG.md +++ b/tree-sitter-stack-graphs/CHANGELOG.md @@ -5,6 +5,10 @@ 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.8.1 -- 2024-03-06 + +The `stack-graphs` dependency was updated to `v0.13` to fix the build problems of the `v0.8.0` release. + ## v0.8.0 -- 2024-03-05 The `tree-sitter` dependency version was updated to fix install problems. diff --git a/tree-sitter-stack-graphs/Cargo.toml b/tree-sitter-stack-graphs/Cargo.toml index 40b750641..875faf4ef 100644 --- a/tree-sitter-stack-graphs/Cargo.toml +++ b/tree-sitter-stack-graphs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tree-sitter-stack-graphs" -version = "0.8.0" +version = "0.8.1" description = "Create stack graphs using tree-sitter parsers" homepage = "https://github.com/github/stack-graphs/tree/main/tree-sitter-stack-graphs" repository = "https://github.com/github/stack-graphs/" @@ -69,7 +69,7 @@ regex = "1" rust-ini = "0.18" serde_json = { version="1.0", optional=true } sha1 = { version="0.10", optional=true } -stack-graphs = { version="0.12", path="../stack-graphs" } +stack-graphs = { version="0.13", path="../stack-graphs" } thiserror = "1.0" time = { version = "0.3", optional = true } tokio = { version = "1.26", optional = true, features = ["io-std", "rt", "rt-multi-thread"] } From 4ced0962bca76f800d653de5b2c7d8696ac4ddf9 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 6 Mar 2024 16:43:42 +0100 Subject: [PATCH 134/202] Release tree-sitter-stack-graphs-java v0.3.0 --- languages/tree-sitter-stack-graphs-java/CHANGELOG.md | 10 ++++++++-- languages/tree-sitter-stack-graphs-java/Cargo.toml | 2 +- languages/tree-sitter-stack-graphs-java/README.md | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-java/CHANGELOG.md b/languages/tree-sitter-stack-graphs-java/CHANGELOG.md index f7483cabc..0f3a4b861 100644 --- a/languages/tree-sitter-stack-graphs-java/CHANGELOG.md +++ b/languages/tree-sitter-stack-graphs-java/CHANGELOG.md @@ -5,9 +5,15 @@ 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). -## Unreleased +## v0.3.0 -- 2024-03-06 -## [0.2.0] - 2023-03-21 +The `tree-sitter-stack-graphs` is updated to `v0.8`. + +### Changed + +- The `cli` feature is now required to install the CLI. + +## v0.2.0 -- 2023-03-21 ### Added diff --git a/languages/tree-sitter-stack-graphs-java/Cargo.toml b/languages/tree-sitter-stack-graphs-java/Cargo.toml index 8af4b3277..13e9e7340 100644 --- a/languages/tree-sitter-stack-graphs-java/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-java/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tree-sitter-stack-graphs-java" -version = "0.2.0" +version = "0.3.0" description = "Stack graphs for the Java programming language" homepage = "https://github.com/github/stack-graphs/tree/main/languages/tree-sitter-stack-graphs-java" diff --git a/languages/tree-sitter-stack-graphs-java/README.md b/languages/tree-sitter-stack-graphs-java/README.md index 40c0f847f..cf16b7dab 100644 --- a/languages/tree-sitter-stack-graphs-java/README.md +++ b/languages/tree-sitter-stack-graphs-java/README.md @@ -13,7 +13,7 @@ To use this library, add the following to your `Cargo.toml`: ```toml [dependencies] -tree-sitter-stack-graphs-java = "0.2.0" +tree-sitter-stack-graphs-java = "0.3" ``` Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs-java/*/) for more details on how to use this library. From 426e14dceb2252785ceed2de666dcdab20ef393c Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 6 Mar 2024 17:00:39 +0100 Subject: [PATCH 135/202] Release tree-sitter-stack-graphs-javascript v0.1.0 --- languages/tree-sitter-stack-graphs-javascript/CHANGELOG.md | 4 ++++ languages/tree-sitter-stack-graphs-javascript/README.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/CHANGELOG.md b/languages/tree-sitter-stack-graphs-javascript/CHANGELOG.md index 3b21ea383..2ba28c310 100644 --- a/languages/tree-sitter-stack-graphs-javascript/CHANGELOG.md +++ b/languages/tree-sitter-stack-graphs-javascript/CHANGELOG.md @@ -4,3 +4,7 @@ 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.1.0 -- 2024-03-06 + +Initial release. diff --git a/languages/tree-sitter-stack-graphs-javascript/README.md b/languages/tree-sitter-stack-graphs-javascript/README.md index 6d449be9c..04317fbd0 100644 --- a/languages/tree-sitter-stack-graphs-javascript/README.md +++ b/languages/tree-sitter-stack-graphs-javascript/README.md @@ -13,7 +13,7 @@ To use this library, add the following to your `Cargo.toml`: ```toml [dependencies] -tree-sitter-stack-graphs-javascript = "0.1.0" +tree-sitter-stack-graphs-javascript = "0.1" ``` Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs-javascript/*/) for more details on how to use this library. From 91e8a5edefb946ae7aa04ae564a39d7cd72230d5 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 6 Mar 2024 17:01:39 +0100 Subject: [PATCH 136/202] Release tree-sitter-stack-graphs-python v0.1.0 --- ...ublish-tree-sitter-stack-graphs-python.yml | 45 +++++++++++++++++++ .../CHANGELOG.md | 4 ++ .../tree-sitter-stack-graphs-python/README.md | 2 +- 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/publish-tree-sitter-stack-graphs-python.yml diff --git a/.github/workflows/publish-tree-sitter-stack-graphs-python.yml b/.github/workflows/publish-tree-sitter-stack-graphs-python.yml new file mode 100644 index 000000000..5d6c83ba2 --- /dev/null +++ b/.github/workflows/publish-tree-sitter-stack-graphs-python.yml @@ -0,0 +1,45 @@ +name: Publish tree-sitter-stack-graphs-python release + +on: + push: + tags: + - tree-sitter-stack-graphs-python-v* + +jobs: + publish-crate: + runs-on: ubuntu-latest + env: + CARGO_TERM_COLOR: always + CARGO_INCREMENTAL: 0 + CRATE_DIR: './languages/tree-sitter-stack-graphs-python' + steps: + - name: Install Rust environment + uses: hecrj/setup-rust-action@v1 + - name: Checkout repository + uses: actions/checkout@v3 + # TODO Verify the crate version matches the tag + - name: Test crate + run: cargo test --all-features + working-directory: ${{ env.CRATE_DIR }} + - name: Verify publish crate + run: cargo publish --dry-run + working-directory: ${{ env.CRATE_DIR }} + - name: Publish crate + run: cargo publish + working-directory: ${{ env.CRATE_DIR }} + env: + CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} + create-release: + needs: publish-crate + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - name: Checkout repository + uses: actions/checkout@v3 + - name: Create GitHub release + uses: ncipollo/release-action@v1 + with: + body: | + Find more info on all releases at https://crates.io/crates/tree-sitter-stack-graphs-python. + token: ${{ secrets.GITHUB_TOKEN }} diff --git a/languages/tree-sitter-stack-graphs-python/CHANGELOG.md b/languages/tree-sitter-stack-graphs-python/CHANGELOG.md index 9e6604deb..876b16cb9 100644 --- a/languages/tree-sitter-stack-graphs-python/CHANGELOG.md +++ b/languages/tree-sitter-stack-graphs-python/CHANGELOG.md @@ -4,3 +4,7 @@ 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.1.0 -- 2024-03-06 + +Initial release. diff --git a/languages/tree-sitter-stack-graphs-python/README.md b/languages/tree-sitter-stack-graphs-python/README.md index b5fbc2f32..0393e0004 100644 --- a/languages/tree-sitter-stack-graphs-python/README.md +++ b/languages/tree-sitter-stack-graphs-python/README.md @@ -13,7 +13,7 @@ To use this library, add the following to your `Cargo.toml`: ```toml [dependencies] -tree-sitter-stack-graphs-python = "0.1.0" +tree-sitter-stack-graphs-python = "0.1" ``` Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs-python/*/) for more details on how to use this library. From f1d2ef591786f32c496c901c8ad344901ab3055c Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 6 Mar 2024 17:03:04 +0100 Subject: [PATCH 137/202] Release tree-sitter-stack-graphs-typescript v0.2.0 --- .../CHANGELOG.md | 14 +++++++++++++- .../tree-sitter-stack-graphs-typescript/Cargo.toml | 2 +- .../tree-sitter-stack-graphs-typescript/README.md | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-typescript/CHANGELOG.md b/languages/tree-sitter-stack-graphs-typescript/CHANGELOG.md index e5b478f09..a23db2f0e 100644 --- a/languages/tree-sitter-stack-graphs-typescript/CHANGELOG.md +++ b/languages/tree-sitter-stack-graphs-typescript/CHANGELOG.md @@ -5,7 +5,19 @@ 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). -## Unreleased +## v0.2.0 -- 2024-03-06 + +The `tree-sitter-stack-graphs` is updated to `v0.8`. + +### Added + +- An experimental VSCode LSP plugin that supports code navigation based on the stack graph rules. _Purely an experiment, not ready for serious use!_ Requires the `lsp` feature to be enabled. + +### Changed + +- Various improvements to the rules for imports and packages. + +## v0.1.0 -- 2023-01-27 ### Added diff --git a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml index be86d78cd..822eeb498 100644 --- a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tree-sitter-stack-graphs-typescript" -version = "0.1.0" +version = "0.2.0" description = "Stack graphs definition for TypeScript using tree-sitter-typescript" readme = "README.md" keywords = ["tree-sitter", "stack-graphs", "typescript"] diff --git a/languages/tree-sitter-stack-graphs-typescript/README.md b/languages/tree-sitter-stack-graphs-typescript/README.md index fada7e2df..9b6c82069 100644 --- a/languages/tree-sitter-stack-graphs-typescript/README.md +++ b/languages/tree-sitter-stack-graphs-typescript/README.md @@ -13,7 +13,7 @@ To use this library, add the following to your `Cargo.toml`: ```toml [dependencies] -tree-sitter-stack-graphs-typescript = "0.1.0" +tree-sitter-stack-graphs-typescript = "0.2" ``` Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs-typescript/*/) for more details on how to use this library. From 1547ea202ba54ab3703c8334182b3c1f06fc9965 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 8 Mar 2024 16:57:46 +0100 Subject: [PATCH 138/202] Update tree-sitter-javascript to 0.20.1 --- .../Cargo.toml | 3 +- .../src/stack-graphs.tsg | 155 +++++++----------- 2 files changed, 57 insertions(+), 101 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml index 6c7006d9a..fe8863bba 100644 --- a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml @@ -31,8 +31,9 @@ clap = { version = "4", optional = true } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" stack-graphs = { version = "0.13", path = "../../stack-graphs" } +tree-sitter-graph = "0.11.2" +tree-sitter-javascript = "=0.20.1" tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs" } -tree-sitter-javascript = { git = "https://github.com/tree-sitter/tree-sitter-javascript", rev = "5720b249490b3c17245ba772f6be4a43edb4e3b7" } [dev-dependencies] anyhow = "1.0" diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index e69a4636a..f9e724011 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -1564,7 +1564,7 @@ inherit .containing_class_value node @method_def.after_scope node @method_def.before_scope node @method_def.method_value - + } ( @@ -1572,7 +1572,7 @@ inherit .containing_class_value name:(_)@name)@method_def (#eq? @name "constructor") ) { - + ; augmentation for the constructor attr (@name.pop) symbol_definition = "GUARD:CONSTRUCTOR", source_node = @name edge @method_def.class_value -> @name.pop @@ -1672,7 +1672,7 @@ inherit .containing_class_value node @property.pop node property_pop_dot - + attr (@property.pop) node_definition = @property attr (property_pop_dot) pop_symbol = "GUARD:MEMBER" edge @field_def.after_scope -> property_pop_dot @@ -2321,7 +2321,7 @@ inherit .containing_class_value (yield_expression) (spread_element) ]@expr { - + node @expr.after_scope node @expr.before_scope node @expr.value @@ -2418,7 +2418,10 @@ inherit .containing_class_value ;; #### Variables -(primary_expression/identifier)@variable { +[ + (primary_expression/identifier)@variable + (member_expression . (identifier)@variable) +] { ; value is a lookup, ie a push attr (@variable.value) node_reference = @variable edge @variable.value -> @variable.before_scope @@ -2565,7 +2568,7 @@ inherit .containing_class_value ; shorthand property identifier (shorthand_property_identifier)@shorthand_property_identifier { - + node @shorthand_property_identifier.after_scope node @shorthand_property_identifier.before_scope @@ -2616,7 +2619,7 @@ inherit .containing_class_value ; This is done differently depending on what the key is. See next rules. ; attr @key.pop "pop" = @key, "definition" - + node @pair.key_pop edge @pair.key_pop -> @value.value edge @object.member_pop -> @pair.key_pop @@ -3171,8 +3174,7 @@ inherit .containing_class_value ;; ##### Member Expressions (member_expression - object: (_)@object - property: (_)@property)@member_expr + (_)@object . (_)@property)@member_expr { node member_push @@ -3555,7 +3557,7 @@ inherit .containing_class_value (class name:(_)@name body:(_)@body)@class { - + node @name.pop attr (@name.pop) syntax_type = "class" @@ -3604,7 +3606,6 @@ inherit .containing_class_value (jsx_text) (jsx_element) (jsx_self_closing_element) - (jsx_fragment) (jsx_expression) ]@first_child ) { @@ -3616,7 +3617,6 @@ inherit .containing_class_value (jsx_text) (jsx_element) (jsx_self_closing_element) - (jsx_fragment) (jsx_expression) ]@left_child . @@ -3624,7 +3624,6 @@ inherit .containing_class_value (jsx_text) (jsx_element) (jsx_self_closing_element) - (jsx_fragment) (jsx_expression) ]@right_child ) { @@ -3636,7 +3635,6 @@ inherit .containing_class_value (jsx_text) (jsx_element) (jsx_self_closing_element) - (jsx_fragment) (jsx_expression) ]@last_child . @@ -3648,25 +3646,37 @@ inherit .containing_class_value (jsx_text)@jsx_text { node @jsx_text.before_scope node @jsx_text.after_scope - + edge @jsx_text.after_scope -> @jsx_text.before_scope } -(jsx_opening_element - name:(_)@element_name)@jsx_opening_element { +(jsx_opening_element)@jsx_opening_element { node @jsx_opening_element.before_scope node @jsx_opening_element.after_scope +} + +(jsx_opening_element + name:(_)@element_name)@jsx_opening_element { + edge @element_name.before_scope -> @jsx_opening_element.before_scope } +(jsx_opening_element + !name)@jsx_opening_element +{ + + edge @jsx_opening_element.after_scope -> @jsx_opening_element.before_scope + +} + (jsx_opening_element name:(_)@element_name !attribute)@jsx_opening_element { - + edge @jsx_opening_element.after_scope -> @element_name.after_scope } @@ -3734,11 +3744,20 @@ inherit .containing_class_value } +(jsx_self_closing_element + !name + !attribute)@jsx_self_closing_element +{ + + edge @jsx_self_closing_element.after_scope -> @jsx_self_closing_element.before_scope + +} + (jsx_self_closing_element name:(_)@element_name !attribute)@jsx_self_closing_element { - + edge @jsx_self_closing_element.after_scope -> @element_name.after_scope } @@ -3790,13 +3809,26 @@ inherit .containing_class_value } -(jsx_closing_element - name:(_)@element_name)@jsx_closing_element +(jsx_closing_element)@jsx_closing_element { node @jsx_closing_element.before_scope node @jsx_closing_element.after_scope - + +} + +(jsx_closing_element + !name)@jsx_closing_element +{ + + edge @jsx_closing_element.after_scope -> @jsx_closing_element.before_scope + +} + +(jsx_closing_element + name:(_)@element_name)@jsx_closing_element +{ + edge @element_name.before_scope -> @jsx_closing_element.before_scope edge @jsx_closing_element.after_scope -> @element_name.after_scope @@ -3827,83 +3859,6 @@ inherit .containing_class_value } -(nested_identifier)@nested_identifier { - node @nested_identifier.before_scope - node @nested_identifier.after_scope - node @nested_identifier.value - - edge @nested_identifier.after_scope -> @nested_identifier.before_scope -} - -(nested_identifier - (identifier)@first_part - (identifier)@second_part)@nested_identifier -{ - node guard_member - - attr (@first_part.value) node_reference = @first_part - attr (@second_part.value) node_reference = @second_part - attr (guard_member) symbol_reference = "GUARD:MEMBER" - - edge @first_part.value -> @nested_identifier.before_scope - edge guard_member -> @first_part.value - edge @second_part.value -> guard_member - edge @nested_identifier.value -> @second_part.value -} - -(nested_identifier - (nested_identifier)@first_part - (identifier)@second_part)@nested_identifier -{ - node guard_member - - attr (@second_part.value) node_reference = @second_part - attr (guard_member) symbol_reference = "GUARD:MEMBER" - - edge @first_part.before_scope -> @nested_identifier.before_scope - edge guard_member -> @first_part.value - edge @second_part.value -> guard_member - edge @nested_identifier.value -> @second_part.value -} - -(jsx_fragment (_)*@children)@jsx_fragment { - node @jsx_fragment.before_scope - node @jsx_fragment.after_scope - node @jsx_fragment.value - - if (is-empty @children) { - edge @jsx_fragment.after_scope -> @jsx_fragment.before_scope - } -} - -(jsx_fragment - . - (_)@first_child)@jsx_fragment -{ - edge @first_child.before_scope -> @jsx_fragment.before_scope -} - -(jsx_fragment - (_)@left_child - . - (_)@right_child) -{ - edge @right_child.before_scope -> @left_child.after_scope -} - -(jsx_fragment - (_)@last_child - .)@jsx_fragment -{ - edge @jsx_fragment.after_scope -> @last_child.after_scope -} - - - - - - - @@ -4785,7 +4740,7 @@ inherit .containing_class_value name:(_)@_method_name)@constructor ) ) - + (#eq? @_method_name "constructor") ) { From b785a8e70e72312387796e8b45b1df92516ebff1 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 8 Mar 2024 17:26:46 +0100 Subject: [PATCH 139/202] Update tree-sitter-javascript to 0.20.2 --- .../Cargo.toml | 2 +- .../src/stack-graphs.tsg | 86 ++++++++++++------- 2 files changed, 55 insertions(+), 33 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml index fe8863bba..72f9069f8 100644 --- a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml @@ -32,7 +32,7 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" stack-graphs = { version = "0.13", path = "../../stack-graphs" } tree-sitter-graph = "0.11.2" -tree-sitter-javascript = "=0.20.1" +tree-sitter-javascript = "=0.20.2" tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs" } [dev-dependencies] diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index f9e724011..a9167c3a1 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -2296,6 +2296,9 @@ inherit .containing_class_value (number) (string) (template_string) + (template_substitution) + (string_fragment) + (escape_sequence) (regex) (true) (false) @@ -2304,7 +2307,7 @@ inherit .containing_class_value (import) (object) (array) - (function) + (function_expression) (arrow_function) (generator_function) (class) @@ -2329,7 +2332,7 @@ inherit .containing_class_value } [ - (function body:(_)@body) + (function_expression body:(_)@body) (arrow_function body:(_)@body) (generator_function body:(_)@body) ] { @@ -2367,8 +2370,8 @@ inherit .containing_class_value ;; #### Template Strings ; template_strings w/ no substitutions -(template_string (_)* @substs)@template_string { - if (is-empty @substs) { +(template_string (_)* @parts)@template_string { + if (is-empty @parts) { edge @template_string.after_scope -> @template_string.before_scope } } @@ -2376,33 +2379,45 @@ inherit .containing_class_value ; nonempty template string, value ; LATER-TODO this isn't really right, but it gets flows through the template string ; which may be useful -(template_string (template_substitution (_)@inner_expr))@template_string { +(template_string (_)@part)@template_string { ; the value of a template string is a template string value built from the values of its substitutions ; attr (@template_string.value) "template_string_value" - edge @template_string.value -> @inner_expr.value + edge @template_string.value -> @part.value } ; nonempty template string, first substitution -(template_string . (template_substitution (_)@first_inner_expr))@template_string { +(template_string . (_)@first)@template_string { ; scopes propagate into the first subtitution of the template string - edge @first_inner_expr.before_scope -> @template_string.before_scope + edge @first.before_scope -> @template_string.before_scope } ; nonempty template string, between substitutions (template_string - (template_substitution (_)@left_inner_expr) + (_) @left . - (template_substitution (_)@right_inner_expr))@_template_string { + (_) @right) { ; scopes propagate from left substitutions to right substitutions - edge @right_inner_expr.before_scope -> @left_inner_expr.after_scope + edge @right.before_scope -> @left.after_scope } ; nonempty template string, last substitution -(template_string . (template_substitution (_)@last_inner_expr))@template_string { +(template_string (_) @last .)@template_string { ; scopes propagate out of the last substitution to the template string - edge @template_string.after_scope -> @last_inner_expr.after_scope + edge @template_string.after_scope -> @last.after_scope +} + +[ + (string_fragment) + (escape_sequence) +]@part { + edge @part.after_scope -> @part.before_scope } +(template_substitution (_)@expr)@subst { + edge @expr.before_scope -> @subst.before_scope + edge @subst.after_scope -> @expr.after_scope + edge @subst.value -> @expr.value +} ;; #### Numbers @@ -2785,7 +2800,7 @@ inherit .containing_class_value ;; #### Function Literals ; functions with names -(function +(function_expression name:(_)@name parameters:(_)@call_sig)@fun { @@ -2800,7 +2815,7 @@ inherit .containing_class_value ; function -(function +(function_expression parameters:(_)@call_sig body:(_)@body)@fun { @@ -2859,7 +2874,7 @@ inherit .containing_class_value edge @fun.value_arg_scope -> JUMP_TO_SCOPE_NODE } -(function +(function_expression parameters: (formal_parameters (_)@param))@fun { @@ -3485,20 +3500,27 @@ inherit .containing_class_value ;; #### Comma Operator / Sequence Expressions -(sequence_expression - left: (_)@left - right: (_)@right)@sequence_expr { +(sequence_expression (_)* @elems)@sequence_expr { + if (is-empty @elems) { + edge @sequence_expr.after_scope -> @sequence_expr.before_scope + } +} + +(sequence_expression . (_)@first)@sequence_expr { + edge @first.before_scope -> @sequence_expr.before_scope +} - ; scopes propagate left to right - edge @left.before_scope -> @sequence_expr.before_scope +(sequence_expression (_)@left . (_)@right) { edge @right.before_scope -> @left.after_scope - edge @sequence_expr.after_scope -> @right.after_scope +} - ; the value is just the value of the right - edge @sequence_expr.value -> @right.value +(sequence_expression (_)@last .)@sequence_expr { + edge @sequence_expr.after_scope -> @last.after_scope + edge @sequence_expr.value -> @last.value } + ;; #### Ternary Expression (ternary_expression @@ -4716,7 +4738,7 @@ inherit .containing_class_value } -(function +(function_expression name:(_)@name parameters:(_)@_call_sig)@fun { @@ -4830,7 +4852,7 @@ inherit .containing_class_value (variable_declarator name:(identifier)@name value: [ - (function) + (function_expression) (generator_function) (arrow_function) ])) @@ -4838,7 +4860,7 @@ inherit .containing_class_value (variable_declarator name:(identifier)@name value: [ - (function) + (function_expression) (generator_function) (arrow_function) ])) @@ -4848,7 +4870,7 @@ inherit .containing_class_value ; (member_expression property:(_)@name) ; FIXME member expressions are references and have no .pop ] right: [ - (function) + (function_expression) (generator_function) (arrow_function) ]) @@ -4878,7 +4900,7 @@ inherit .containing_class_value ) ] right: [ - (function) + (function_expression) (generator_function) (arrow_function) ])@assignment_expr @@ -4897,7 +4919,7 @@ inherit .containing_class_value object:(_)@_module property:(_)@_exports) right: [ - (function) + (function_expression) (generator_function) (arrow_function) ])@assignment_expr @@ -4913,7 +4935,7 @@ inherit .containing_class_value (export_statement "default" value:[ - (function) + (function_expression) (generator_function) (arrow_function) ])@export_stmt { @@ -4927,7 +4949,7 @@ inherit .containing_class_value (pair key: (_)@name value: [ - (function) + (function_expression) (generator_function) (arrow_function) ]) { From b5cb3eb2603c06b54a1f2ba1449bb176f1e82f5a Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 8 Mar 2024 17:27:22 +0100 Subject: [PATCH 140/202] Update tree-sitter-javascript to 0.20.3 --- languages/tree-sitter-stack-graphs-javascript/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml index 72f9069f8..b56925c75 100644 --- a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml @@ -32,7 +32,7 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" stack-graphs = { version = "0.13", path = "../../stack-graphs" } tree-sitter-graph = "0.11.2" -tree-sitter-javascript = "=0.20.2" +tree-sitter-javascript = "=0.20.3" tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs" } [dev-dependencies] From 88bc1700ad54d09bf30f4c3aa1e7eb2b399c7f75 Mon Sep 17 00:00:00 2001 From: Eugene Yakubovich Date: Wed, 28 Feb 2024 17:18:26 -0800 Subject: [PATCH 141/202] Support for TSX Support TSX dialect of the TypeScript. Because the TSX is almost a superset of TypeScript, it makes sense to reuse the .tsg file. However it requires a bit of preprocessing to handle the differences. --- .../Cargo.toml | 2 + .../askama.toml | 9 +++ .../rust/lib.rs | 56 ++++++++++++++++++- .../src/stack-graphs.tsg | 6 +- tree-sitter-stack-graphs/src/loader.rs | 6 ++ 5 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 languages/tree-sitter-stack-graphs-typescript/askama.toml diff --git a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml index 822eeb498..35bd6e3ae 100644 --- a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml @@ -28,8 +28,10 @@ lsp = ["tree-sitter-stack-graphs/lsp"] [dependencies] anyhow = { version = "1.0", optional = true } +askama = "0.12.1" clap = { version = "4", optional = true } glob = "0.3" +lazy_static = "1.4.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" stack-graphs = { version = "0.13", path = "../../stack-graphs" } diff --git a/languages/tree-sitter-stack-graphs-typescript/askama.toml b/languages/tree-sitter-stack-graphs-typescript/askama.toml new file mode 100644 index 000000000..124fdbde6 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-typescript/askama.toml @@ -0,0 +1,9 @@ +[general] +# Directories to search for templates, relative to the crate root. +dirs = ["src"] +# Unless you add a `-` in a block, whitespace characters won't be trimmed. +whitespace = "preserve" + +[[escaper]] +path = "::askama::Text" +extensions = ["tsg"] diff --git a/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs b/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs index 3590649b2..43bc1efb6 100644 --- a/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs +++ b/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs @@ -5,6 +5,11 @@ // Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details. // ------------------------------------------------------------------------------------------------ +use std::path::PathBuf; +use std::borrow::Cow; + +use askama::Template; +use lazy_static::lazy_static; use tree_sitter_stack_graphs::loader::LanguageConfiguration; use tree_sitter_stack_graphs::loader::LoadError; use tree_sitter_stack_graphs::CancellationFlag; @@ -33,10 +38,25 @@ pub const FILE_PATH_VAR: &str = "FILE_PATH"; /// The name of the project name global variable pub const PROJECT_NAME_VAR: &str = "PROJECT_NAME"; +lazy_static! { + static ref STACK_GRAPHS_TS_TSG_SOURCE: String = preprocess_tsg("typescript").unwrap(); + static ref STACK_GRAPHS_TSX_TSG_SOURCE: String = preprocess_tsg("tsx").unwrap(); +} + +#[derive(Template)] +#[template(path = "stack-graphs.tsg")] +struct TsgTemplate<'a> { + dialect: &'a str, +} + pub fn language_configuration(cancellation_flag: &dyn CancellationFlag) -> LanguageConfiguration { try_language_configuration(cancellation_flag).unwrap_or_else(|err| panic!("{}", err)) } +pub fn tsx_language_configuration(cancellation_flag: &dyn CancellationFlag) -> LanguageConfiguration { + try_tsx_language_configuration(cancellation_flag).unwrap_or_else(|err| panic!("{}", err)) +} + pub fn try_language_configuration( cancellation_flag: &dyn CancellationFlag, ) -> Result { @@ -46,7 +66,31 @@ pub fn try_language_configuration( None, vec![String::from("ts")], STACK_GRAPHS_TSG_PATH.into(), - STACK_GRAPHS_TSG_SOURCE, + &STACK_GRAPHS_TS_TSG_SOURCE, + Some(( + STACK_GRAPHS_BUILTINS_PATH.into(), + STACK_GRAPHS_BUILTINS_SOURCE, + )), + Some(STACK_GRAPHS_BUILTINS_CONFIG), + cancellation_flag, + )?; + lc.special_files + .add("tsconfig.json".to_string(), TsConfigAnalyzer {}) + .add("package.json".to_string(), NpmPackageAnalyzer {}); + lc.no_similar_paths_in_file = true; + Ok(lc) +} + +pub fn try_tsx_language_configuration( + cancellation_flag: &dyn CancellationFlag, +) -> Result { + let mut lc = LanguageConfiguration::from_sources( + tree_sitter_typescript::language_tsx(), + Some(String::from("source.tsx")), + None, + vec![String::from("tsx")], + STACK_GRAPHS_TSG_PATH.into(), + &STACK_GRAPHS_TSX_TSG_SOURCE, Some(( STACK_GRAPHS_BUILTINS_PATH.into(), STACK_GRAPHS_BUILTINS_SOURCE, @@ -60,3 +104,13 @@ pub fn try_language_configuration( lc.no_similar_paths_in_file = true; Ok(lc) } + +fn preprocess_tsg(dialect: &'static str) -> Result> { + let tmpl = TsgTemplate{ dialect }; + tmpl.render() + .map_err(|err| LoadError::PreprocessorError { + inner: err.to_string(), + tsg_path: PathBuf::from(STACK_GRAPHS_TSG_PATH), + tsg: Cow::from(STACK_GRAPHS_TSG_SOURCE), + }) +} diff --git a/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg index 66c432b46..1fc595b9a 100644 --- a/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg @@ -2665,7 +2665,9 @@ if none @is_async { (ternary_expression) (this) (true) +{% if dialect == "typescript" -%} (type_assertion) +{% endif -%} (unary_expression) (undefined) (update_expression) @@ -4040,7 +4042,7 @@ if none @is_async { } - +{% if dialect == "typescript" -%} ;; Type Assertion ; (type_assertion @@ -4055,7 +4057,7 @@ if none @is_async { ; propagate lexical scope edge @expr.lexical_scope -> @type_assert.lexical_scope } - +{% endif -%} ;; As Expression diff --git a/tree-sitter-stack-graphs/src/loader.rs b/tree-sitter-stack-graphs/src/loader.rs index 9ffc1d674..88be0acf1 100644 --- a/tree-sitter-stack-graphs/src/loader.rs +++ b/tree-sitter-stack-graphs/src/loader.rs @@ -423,6 +423,12 @@ pub enum LoadError<'a> { }, #[error(transparent)] TreeSitter(anyhow::Error), + #[error("Preprocessor error: {inner}")] + PreprocessorError { + inner: String, + tsg_path: PathBuf, + tsg: Cow<'a, str>, + } } impl LoadError<'_> { From cd323fdfb8dcf30578a61aced42c2721c322174e Mon Sep 17 00:00:00 2001 From: Eugene Yakubovich Date: Sat, 9 Mar 2024 20:31:05 -0800 Subject: [PATCH 142/202] Support for TSX Preprocesses the .tsg file into typescript and tsx specific .tsg files. The preprocessing is done in the build script. Add a --dialect|-d option to the CLI to select the dialect. --- .../Cargo.toml | 6 +- .../askama.toml | 9 -- .../build.rs | 98 +++++++++++++++++++ .../rust/bin.rs | 21 +++- .../rust/lib.rs | 50 +++------- .../src/stack-graphs.tsg | 8 +- tree-sitter-stack-graphs/src/loader.rs | 6 -- 7 files changed, 137 insertions(+), 61 deletions(-) delete mode 100644 languages/tree-sitter-stack-graphs-typescript/askama.toml create mode 100644 languages/tree-sitter-stack-graphs-typescript/build.rs diff --git a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml index 35bd6e3ae..46360f19c 100644 --- a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml @@ -28,10 +28,8 @@ lsp = ["tree-sitter-stack-graphs/lsp"] [dependencies] anyhow = { version = "1.0", optional = true } -askama = "0.12.1" clap = { version = "4", optional = true } glob = "0.3" -lazy_static = "1.4.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" stack-graphs = { version = "0.13", path = "../../stack-graphs" } @@ -42,3 +40,7 @@ tsconfig = "0.1.0" [dev-dependencies] anyhow = { version = "1.0" } tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs", features = ["cli"] } + +[build-dependencies] +anyhow = { version = "1.0" } +regex = "1.10.3" diff --git a/languages/tree-sitter-stack-graphs-typescript/askama.toml b/languages/tree-sitter-stack-graphs-typescript/askama.toml deleted file mode 100644 index 124fdbde6..000000000 --- a/languages/tree-sitter-stack-graphs-typescript/askama.toml +++ /dev/null @@ -1,9 +0,0 @@ -[general] -# Directories to search for templates, relative to the crate root. -dirs = ["src"] -# Unless you add a `-` in a block, whitespace characters won't be trimmed. -whitespace = "preserve" - -[[escaper]] -path = "::askama::Text" -extensions = ["tsg"] diff --git a/languages/tree-sitter-stack-graphs-typescript/build.rs b/languages/tree-sitter-stack-graphs-typescript/build.rs new file mode 100644 index 000000000..3d5867cfa --- /dev/null +++ b/languages/tree-sitter-stack-graphs-typescript/build.rs @@ -0,0 +1,98 @@ +// -*- coding: utf-8 -*- +// ------------------------------------------------------------------------------------------------ +// Copyright © 2024, stack-graphs authors. +// Licensed under either of Apache License, Version 2.0, or MIT license, at your option. +// Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details. +// ------------------------------------------------------------------------------------------------ + +use std::collections::HashSet; +use std::path::Path; + +use anyhow::{Result, anyhow, bail}; +use regex::Regex; + +/// A stack of dialects as selected by the directives +#[derive(Debug, Default)] +struct DialectStack(Vec>); + +impl DialectStack { + fn push(&mut self, values: Vec) -> Result<()> { + // ensure that the new values are a subset of the current scope + if let Some(current) = self.0.last() { + if !values.iter().all(|v| current.contains(v)) { + bail!("Directive values are not a subset of the current scope"); + } + } + + self.0.push(values.into_iter().collect()); + + Ok(()) + } + + fn pop(&mut self) -> Result<()> { + if let Some(_) = self.0.pop() { + Ok(()) + } else { + Err(anyhow!("Directive stack is empty")) + } + } + + fn contains(&self, query: &str) -> bool { + if let Some(current) = self.0.last() { + current.contains(query) + } else { + true + } + } +} + +/// preprocess the input file, removing lines that are not for the selected dialect +fn preprocess(input: impl std::io::Read, mut output: impl std::io::Write, dialect: &str) -> anyhow::Result<()> { + // Matches: ; # dialect typescript tsx + let directive_start = Regex::new(r";[ \t]*#[ \t]*dialect[ \t]+([a-zA-Z\t ]+)").unwrap(); + + // Matches: ; # end + let directirve_end = Regex::new(r";[ \t]*#[ \t]*end").unwrap(); + + let input = std::io::read_to_string(input)?; + + let mut stack = DialectStack::default(); + + for line in input.lines() { + if let Some(captures) = directive_start.captures(line) { + let directive = captures.get(1).unwrap().as_str(); + let dialects = directive.split_whitespace().map(|s| s.to_string()).collect(); + stack.push(dialects)?; + output.write_all(line.as_bytes())?; + } else if directirve_end.is_match(line) { + stack.pop()?; + output.write_all(line.as_bytes())?; + } else { + if stack.contains(dialect) { + output.write_all(line.as_bytes())?; + } + } + // a new line is always written so that removed lines are padded to preserve line numbers + output.write(b"\n")?; + } + + Ok(()) +} + +const TSG_SOURCE: &str = "src/stack-graphs.tsg"; +const DIALECTS: [&str; 2] = ["typescript", "tsx"]; + +fn main() { + let out_dir = std::env::var_os("OUT_DIR").unwrap(); + for dialect in DIALECTS { + let input = std::fs::File::open(TSG_SOURCE).unwrap(); + + let out_filename = Path::new(&out_dir).join(format!("stack-graphs-{dialect}.tsg")); + let output = std::fs::File::create(out_filename).unwrap(); + + preprocess(input, output, dialect).unwrap(); + } + + println!("cargo:rerun-if-changed={TSG_SOURCE}"); + println!("cargo:rerun-if-changed=build.rs"); +} diff --git a/languages/tree-sitter-stack-graphs-typescript/rust/bin.rs b/languages/tree-sitter-stack-graphs-typescript/rust/bin.rs index b1ee4f568..7352111dd 100644 --- a/languages/tree-sitter-stack-graphs-typescript/rust/bin.rs +++ b/languages/tree-sitter-stack-graphs-typescript/rust/bin.rs @@ -12,22 +12,37 @@ use tree_sitter_stack_graphs::cli::provided_languages::Subcommands; use tree_sitter_stack_graphs::NoCancellation; fn main() -> anyhow::Result<()> { - let lc = match tree_sitter_stack_graphs_typescript::try_language_configuration(&NoCancellation) + let cli = Cli::parse(); + let lc = match language_configuration(&cli.dialect) { Ok(lc) => lc, Err(err) => { - eprintln!("{}", err.display_pretty()); + eprintln!("{err}"); return Err(anyhow!("Language configuration error")); } }; - let cli = Cli::parse(); 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(dialect: &str) -> anyhow::Result { + match dialect { + "typescript" => tree_sitter_stack_graphs_typescript::try_language_configuration(&NoCancellation) + .map_err(|e| anyhow::anyhow!("{}", e.display_pretty())), + + "tsx" => tree_sitter_stack_graphs_typescript::try_language_configuration_tsx(&NoCancellation) + .map_err(|e| anyhow::anyhow!("{}", e.display_pretty())), + + _ => anyhow::bail!("Unknown dialect: {}", dialect) + } +} + #[derive(Parser)] #[clap(about, version)] pub struct Cli { + #[clap(short, long, default_value = "typescript")] + dialect: String, + #[clap(subcommand)] subcommand: Subcommands, } diff --git a/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs b/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs index 43bc1efb6..b87a038d4 100644 --- a/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs +++ b/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs @@ -5,11 +5,6 @@ // Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details. // ------------------------------------------------------------------------------------------------ -use std::path::PathBuf; -use std::borrow::Cow; - -use askama::Template; -use lazy_static::lazy_static; use tree_sitter_stack_graphs::loader::LanguageConfiguration; use tree_sitter_stack_graphs::loader::LoadError; use tree_sitter_stack_graphs::CancellationFlag; @@ -22,9 +17,11 @@ pub mod tsconfig; pub mod util; /// The stacks graphs tsg path for this language. -pub const STACK_GRAPHS_TSG_PATH: &str = "src/stack-graphs.tsg"; +pub const STACK_GRAPHS_TSG_TS_PATH: &str = concat!(env!("OUT_DIR"), "/stack-graphs-typescript.tsg"); +pub const STACK_GRAPHS_TSG_TSX_PATH: &str = concat!(env!("OUT_DIR"), "/stack-graphs-tsx.tsg"); /// The stack graphs tsg source for this language -pub const STACK_GRAPHS_TSG_SOURCE: &str = include_str!("../src/stack-graphs.tsg"); +pub const STACK_GRAPHS_TSG_TS_SOURCE: &str = include_str!(concat!(env!("OUT_DIR"), "/stack-graphs-typescript.tsg")); +pub const STACK_GRAPHS_TSG_TSX_SOURCE: &str = include_str!(concat!(env!("OUT_DIR"), "/stack-graphs-tsx.tsg")); /// The stack graphs builtins configuration for this language pub const STACK_GRAPHS_BUILTINS_CONFIG: &str = include_str!("../src/builtins.cfg"); @@ -38,25 +35,10 @@ pub const FILE_PATH_VAR: &str = "FILE_PATH"; /// The name of the project name global variable pub const PROJECT_NAME_VAR: &str = "PROJECT_NAME"; -lazy_static! { - static ref STACK_GRAPHS_TS_TSG_SOURCE: String = preprocess_tsg("typescript").unwrap(); - static ref STACK_GRAPHS_TSX_TSG_SOURCE: String = preprocess_tsg("tsx").unwrap(); -} - -#[derive(Template)] -#[template(path = "stack-graphs.tsg")] -struct TsgTemplate<'a> { - dialect: &'a str, -} - pub fn language_configuration(cancellation_flag: &dyn CancellationFlag) -> LanguageConfiguration { try_language_configuration(cancellation_flag).unwrap_or_else(|err| panic!("{}", err)) } -pub fn tsx_language_configuration(cancellation_flag: &dyn CancellationFlag) -> LanguageConfiguration { - try_tsx_language_configuration(cancellation_flag).unwrap_or_else(|err| panic!("{}", err)) -} - pub fn try_language_configuration( cancellation_flag: &dyn CancellationFlag, ) -> Result { @@ -65,8 +47,8 @@ pub fn try_language_configuration( Some(String::from("source.ts")), None, vec![String::from("ts")], - STACK_GRAPHS_TSG_PATH.into(), - &STACK_GRAPHS_TS_TSG_SOURCE, + STACK_GRAPHS_TSG_TS_PATH.into(), + STACK_GRAPHS_TSG_TS_SOURCE, Some(( STACK_GRAPHS_BUILTINS_PATH.into(), STACK_GRAPHS_BUILTINS_SOURCE, @@ -81,7 +63,11 @@ pub fn try_language_configuration( Ok(lc) } -pub fn try_tsx_language_configuration( +pub fn language_configuration_tsx(cancellation_flag: &dyn CancellationFlag) -> LanguageConfiguration { + try_language_configuration_tsx(cancellation_flag).unwrap_or_else(|err| panic!("{}", err)) +} + +pub fn try_language_configuration_tsx( cancellation_flag: &dyn CancellationFlag, ) -> Result { let mut lc = LanguageConfiguration::from_sources( @@ -89,8 +75,8 @@ pub fn try_tsx_language_configuration( Some(String::from("source.tsx")), None, vec![String::from("tsx")], - STACK_GRAPHS_TSG_PATH.into(), - &STACK_GRAPHS_TSX_TSG_SOURCE, + STACK_GRAPHS_TSG_TSX_PATH.into(), + STACK_GRAPHS_TSG_TSX_SOURCE, Some(( STACK_GRAPHS_BUILTINS_PATH.into(), STACK_GRAPHS_BUILTINS_SOURCE, @@ -104,13 +90,3 @@ pub fn try_tsx_language_configuration( lc.no_similar_paths_in_file = true; Ok(lc) } - -fn preprocess_tsg(dialect: &'static str) -> Result> { - let tmpl = TsgTemplate{ dialect }; - tmpl.render() - .map_err(|err| LoadError::PreprocessorError { - inner: err.to_string(), - tsg_path: PathBuf::from(STACK_GRAPHS_TSG_PATH), - tsg: Cow::from(STACK_GRAPHS_TSG_SOURCE), - }) -} diff --git a/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg index 1fc595b9a..63c56760f 100644 --- a/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg @@ -2665,9 +2665,9 @@ if none @is_async { (ternary_expression) (this) (true) -{% if dialect == "typescript" -%} +; #dialect typescript (type_assertion) -{% endif -%} +; #end (unary_expression) (undefined) (update_expression) @@ -4042,7 +4042,7 @@ if none @is_async { } -{% if dialect == "typescript" -%} +; #dialect typescript ;; Type Assertion ; (type_assertion @@ -4057,7 +4057,7 @@ if none @is_async { ; propagate lexical scope edge @expr.lexical_scope -> @type_assert.lexical_scope } -{% endif -%} +; #end ;; As Expression diff --git a/tree-sitter-stack-graphs/src/loader.rs b/tree-sitter-stack-graphs/src/loader.rs index 88be0acf1..9ffc1d674 100644 --- a/tree-sitter-stack-graphs/src/loader.rs +++ b/tree-sitter-stack-graphs/src/loader.rs @@ -423,12 +423,6 @@ pub enum LoadError<'a> { }, #[error(transparent)] TreeSitter(anyhow::Error), - #[error("Preprocessor error: {inner}")] - PreprocessorError { - inner: String, - tsg_path: PathBuf, - tsg: Cow<'a, str>, - } } impl LoadError<'_> { From 921975535e55f4d5f5451a05df14367a06e78898 Mon Sep 17 00:00:00 2001 From: Eugene Yakubovich Date: Mon, 11 Mar 2024 11:20:02 -0700 Subject: [PATCH 143/202] Address feedback - Remove dialect stack - Better error handling - Use clap::ValueEnum - Append _typescript to {try}_language_configuration --- .../build.rs | 89 +++++++------------ .../rust/bin.rs | 34 ++++--- .../rust/lib.rs | 13 ++- .../rust/test.rs | 2 +- 4 files changed, 60 insertions(+), 78 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-typescript/build.rs b/languages/tree-sitter-stack-graphs-typescript/build.rs index 3d5867cfa..4527a7e8e 100644 --- a/languages/tree-sitter-stack-graphs-typescript/build.rs +++ b/languages/tree-sitter-stack-graphs-typescript/build.rs @@ -5,72 +5,45 @@ // Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details. // ------------------------------------------------------------------------------------------------ -use std::collections::HashSet; use std::path::Path; -use anyhow::{Result, anyhow, bail}; +use anyhow::{Result, bail}; use regex::Regex; -/// A stack of dialects as selected by the directives -#[derive(Debug, Default)] -struct DialectStack(Vec>); - -impl DialectStack { - fn push(&mut self, values: Vec) -> Result<()> { - // ensure that the new values are a subset of the current scope - if let Some(current) = self.0.last() { - if !values.iter().all(|v| current.contains(v)) { - bail!("Directive values are not a subset of the current scope"); - } - } - - self.0.push(values.into_iter().collect()); - - Ok(()) - } - - fn pop(&mut self) -> Result<()> { - if let Some(_) = self.0.pop() { - Ok(()) - } else { - Err(anyhow!("Directive stack is empty")) - } - } - - fn contains(&self, query: &str) -> bool { - if let Some(current) = self.0.last() { - current.contains(query) - } else { - true - } - } -} +const TSG_SOURCE: &str = "src/stack-graphs.tsg"; +const DIALECTS: [&str; 2] = ["typescript", "tsx"]; /// preprocess the input file, removing lines that are not for the selected dialect -fn preprocess(input: impl std::io::Read, mut output: impl std::io::Write, dialect: &str) -> anyhow::Result<()> { - // Matches: ; # dialect typescript tsx - let directive_start = Regex::new(r";[ \t]*#[ \t]*dialect[ \t]+([a-zA-Z\t ]+)").unwrap(); +fn preprocess(input: impl std::io::Read, mut output: impl std::io::Write, dialect: &str) -> Result<()> { + // Matches: ; #dialect typescript + let directive_start = Regex::new(r";\s*#dialect\s+(\w+)").unwrap(); - // Matches: ; # end - let directirve_end = Regex::new(r";[ \t]*#[ \t]*end").unwrap(); + // Matches: ; #end + let directirve_end = Regex::new(r";\s*#end").unwrap(); let input = std::io::read_to_string(input)?; - let mut stack = DialectStack::default(); + // If the filter is None or Some(true), the lines are written to the output + let mut filter: Option = None; - for line in input.lines() { + for (line_no, line) in input.lines().enumerate() { if let Some(captures) = directive_start.captures(line) { let directive = captures.get(1).unwrap().as_str(); - let dialects = directive.split_whitespace().map(|s| s.to_string()).collect(); - stack.push(dialects)?; + if !DIALECTS.contains(&directive) { + bail!("Line {line_no}: unknown dialect: {directive}"); + } + + filter = Some(dialect == directive); output.write_all(line.as_bytes())?; } else if directirve_end.is_match(line) { - stack.pop()?; - output.write_all(line.as_bytes())?; - } else { - if stack.contains(dialect) { - output.write_all(line.as_bytes())?; + if filter.is_none() { + bail!("Line {line_no}: unmatched directive end"); } + + filter = None; + output.write_all(line.as_bytes())?; + } else if filter.unwrap_or(true) { + output.write_all(line.as_bytes())?; } // a new line is always written so that removed lines are padded to preserve line numbers output.write(b"\n")?; @@ -79,18 +52,20 @@ fn preprocess(input: impl std::io::Read, mut output: impl std::io::Write, dialec Ok(()) } -const TSG_SOURCE: &str = "src/stack-graphs.tsg"; -const DIALECTS: [&str; 2] = ["typescript", "tsx"]; - fn main() { - let out_dir = std::env::var_os("OUT_DIR").unwrap(); + let out_dir = std::env::var_os("OUT_DIR") + .expect("OUT_DIR is not set"); + for dialect in DIALECTS { - let input = std::fs::File::open(TSG_SOURCE).unwrap(); + let input = std::fs::File::open(TSG_SOURCE) + .expect("Failed to open stack-graphs.tsg"); let out_filename = Path::new(&out_dir).join(format!("stack-graphs-{dialect}.tsg")); - let output = std::fs::File::create(out_filename).unwrap(); + let output = std::fs::File::create(out_filename) + .expect("Failed to create output file"); - preprocess(input, output, dialect).unwrap(); + preprocess(input, output, dialect) + .expect("Failed to preprocess stack-graphs.tsg"); } println!("cargo:rerun-if-changed={TSG_SOURCE}"); diff --git a/languages/tree-sitter-stack-graphs-typescript/rust/bin.rs b/languages/tree-sitter-stack-graphs-typescript/rust/bin.rs index 7352111dd..d303f3a62 100644 --- a/languages/tree-sitter-stack-graphs-typescript/rust/bin.rs +++ b/languages/tree-sitter-stack-graphs-typescript/rust/bin.rs @@ -6,18 +6,26 @@ // ------------------------------------------------------------------------------------------------ use anyhow::anyhow; -use clap::Parser; +use clap::{Parser, ValueEnum}; 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) + let lc = match language_configuration(cli.dialect) { Ok(lc) => lc, Err(err) => { - eprintln!("{err}"); + eprintln!("{}", err.display_pretty()); return Err(anyhow!("Language configuration error")); } }; @@ -25,23 +33,23 @@ fn main() -> anyhow::Result<()> { cli.subcommand.run(default_db_path, vec![lc]) } -fn language_configuration(dialect: &str) -> anyhow::Result { +fn language_configuration<'a>(dialect: Dialect) -> Result> { match dialect { - "typescript" => tree_sitter_stack_graphs_typescript::try_language_configuration(&NoCancellation) - .map_err(|e| anyhow::anyhow!("{}", e.display_pretty())), - - "tsx" => tree_sitter_stack_graphs_typescript::try_language_configuration_tsx(&NoCancellation) - .map_err(|e| anyhow::anyhow!("{}", e.display_pretty())), - - _ => anyhow::bail!("Unknown dialect: {}", 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), } } #[derive(Parser)] #[clap(about, version)] pub struct Cli { - #[clap(short, long, default_value = "typescript")] - dialect: String, + #[clap( + short, + long, + value_enum, + default_value_t = Dialect::Typescript, + )] + dialect: Dialect, #[clap(subcommand)] subcommand: Subcommands, diff --git a/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs b/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs index b87a038d4..500bd29f0 100644 --- a/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs +++ b/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs @@ -17,8 +17,7 @@ pub mod tsconfig; pub mod util; /// The stacks graphs tsg path for this language. -pub const STACK_GRAPHS_TSG_TS_PATH: &str = concat!(env!("OUT_DIR"), "/stack-graphs-typescript.tsg"); -pub const STACK_GRAPHS_TSG_TSX_PATH: &str = concat!(env!("OUT_DIR"), "/stack-graphs-tsx.tsg"); +pub const STACK_GRAPHS_TSG_PATH: &str = "./stack-graphs.tsg"; /// The stack graphs tsg source for this language pub const STACK_GRAPHS_TSG_TS_SOURCE: &str = include_str!(concat!(env!("OUT_DIR"), "/stack-graphs-typescript.tsg")); pub const STACK_GRAPHS_TSG_TSX_SOURCE: &str = include_str!(concat!(env!("OUT_DIR"), "/stack-graphs-tsx.tsg")); @@ -35,11 +34,11 @@ pub const FILE_PATH_VAR: &str = "FILE_PATH"; /// The name of the project name global variable pub const PROJECT_NAME_VAR: &str = "PROJECT_NAME"; -pub fn language_configuration(cancellation_flag: &dyn CancellationFlag) -> LanguageConfiguration { - try_language_configuration(cancellation_flag).unwrap_or_else(|err| panic!("{}", err)) +pub fn language_configuration_typescript(cancellation_flag: &dyn CancellationFlag) -> LanguageConfiguration { + try_language_configuration_typescript(cancellation_flag).unwrap_or_else(|err| panic!("{}", err)) } -pub fn try_language_configuration( +pub fn try_language_configuration_typescript( cancellation_flag: &dyn CancellationFlag, ) -> Result { let mut lc = LanguageConfiguration::from_sources( @@ -47,7 +46,7 @@ pub fn try_language_configuration( Some(String::from("source.ts")), None, vec![String::from("ts")], - STACK_GRAPHS_TSG_TS_PATH.into(), + STACK_GRAPHS_TSG_PATH.into(), STACK_GRAPHS_TSG_TS_SOURCE, Some(( STACK_GRAPHS_BUILTINS_PATH.into(), @@ -75,7 +74,7 @@ pub fn try_language_configuration_tsx( Some(String::from("source.tsx")), None, vec![String::from("tsx")], - STACK_GRAPHS_TSG_TSX_PATH.into(), + STACK_GRAPHS_TSG_PATH.into(), STACK_GRAPHS_TSG_TSX_SOURCE, Some(( STACK_GRAPHS_BUILTINS_PATH.into(), diff --git a/languages/tree-sitter-stack-graphs-typescript/rust/test.rs b/languages/tree-sitter-stack-graphs-typescript/rust/test.rs index ca5b8494c..72d41d900 100644 --- a/languages/tree-sitter-stack-graphs-typescript/rust/test.rs +++ b/languages/tree-sitter-stack-graphs-typescript/rust/test.rs @@ -11,7 +11,7 @@ use tree_sitter_stack_graphs::ci::Tester; use tree_sitter_stack_graphs::NoCancellation; fn main() -> anyhow::Result<()> { - let lc = match tree_sitter_stack_graphs_typescript::try_language_configuration(&NoCancellation) + let lc = match tree_sitter_stack_graphs_typescript::try_language_configuration_typescript(&NoCancellation) { Ok(lc) => lc, Err(err) => { From bf0a4476d3e99df9ee8a944a42e21e3ce4387a5c Mon Sep 17 00:00:00 2001 From: Eugene Yakubovich Date: Tue, 12 Mar 2024 11:11:14 -0700 Subject: [PATCH 144/202] Fix formatting and typos - Also fixes error msgs to use 1-based line nums --- .../build.rs | 29 ++++++++++--------- .../rust/bin.rs | 25 +++++++++------- .../rust/lib.rs | 16 ++++++---- .../rust/test.rs | 5 ++-- 4 files changed, 45 insertions(+), 30 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-typescript/build.rs b/languages/tree-sitter-stack-graphs-typescript/build.rs index 4527a7e8e..0c2d01c25 100644 --- a/languages/tree-sitter-stack-graphs-typescript/build.rs +++ b/languages/tree-sitter-stack-graphs-typescript/build.rs @@ -7,26 +7,33 @@ use std::path::Path; -use anyhow::{Result, bail}; +use anyhow::{bail, Result}; use regex::Regex; const TSG_SOURCE: &str = "src/stack-graphs.tsg"; const DIALECTS: [&str; 2] = ["typescript", "tsx"]; /// preprocess the input file, removing lines that are not for the selected dialect -fn preprocess(input: impl std::io::Read, mut output: impl std::io::Write, dialect: &str) -> Result<()> { +fn preprocess( + input: impl std::io::Read, + mut output: impl std::io::Write, + dialect: &str, +) -> Result<()> { // Matches: ; #dialect typescript let directive_start = Regex::new(r";\s*#dialect\s+(\w+)").unwrap(); // Matches: ; #end - let directirve_end = Regex::new(r";\s*#end").unwrap(); + let directive_end = Regex::new(r";\s*#end").unwrap(); let input = std::io::read_to_string(input)?; // If the filter is None or Some(true), the lines are written to the output let mut filter: Option = None; - for (line_no, line) in input.lines().enumerate() { + for (mut line_no, line) in input.lines().enumerate() { + // Line numbers are one based + line_no += 1; + if let Some(captures) = directive_start.captures(line) { let directive = captures.get(1).unwrap().as_str(); if !DIALECTS.contains(&directive) { @@ -35,7 +42,7 @@ fn preprocess(input: impl std::io::Read, mut output: impl std::io::Write, dialec filter = Some(dialect == directive); output.write_all(line.as_bytes())?; - } else if directirve_end.is_match(line) { + } else if directive_end.is_match(line) { if filter.is_none() { bail!("Line {line_no}: unmatched directive end"); } @@ -53,19 +60,15 @@ fn preprocess(input: impl std::io::Read, mut output: impl std::io::Write, dialec } fn main() { - let out_dir = std::env::var_os("OUT_DIR") - .expect("OUT_DIR is not set"); + let out_dir = std::env::var_os("OUT_DIR").expect("OUT_DIR is not set"); for dialect in DIALECTS { - let input = std::fs::File::open(TSG_SOURCE) - .expect("Failed to open stack-graphs.tsg"); + let input = std::fs::File::open(TSG_SOURCE).expect("Failed to open stack-graphs.tsg"); let out_filename = Path::new(&out_dir).join(format!("stack-graphs-{dialect}.tsg")); - let output = std::fs::File::create(out_filename) - .expect("Failed to create output file"); + let output = std::fs::File::create(out_filename).expect("Failed to create output file"); - preprocess(input, output, dialect) - .expect("Failed to preprocess stack-graphs.tsg"); + preprocess(input, output, dialect).expect("Failed to preprocess stack-graphs.tsg"); } println!("cargo:rerun-if-changed={TSG_SOURCE}"); diff --git a/languages/tree-sitter-stack-graphs-typescript/rust/bin.rs b/languages/tree-sitter-stack-graphs-typescript/rust/bin.rs index d303f3a62..797e8cea7 100644 --- a/languages/tree-sitter-stack-graphs-typescript/rust/bin.rs +++ b/languages/tree-sitter-stack-graphs-typescript/rust/bin.rs @@ -12,17 +12,16 @@ 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, - } +/// 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) - { + let lc = match language_configuration(cli.dialect) { Ok(lc) => lc, Err(err) => { eprintln!("{}", err.display_pretty()); @@ -35,8 +34,14 @@ fn main() -> anyhow::Result<()> { fn language_configuration<'a>(dialect: Dialect) -> Result> { 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), + Dialect::Typescript => { + tree_sitter_stack_graphs_typescript::try_language_configuration_typescript( + &NoCancellation, + ) + } + Dialect::TSX => { + tree_sitter_stack_graphs_typescript::try_language_configuration_tsx(&NoCancellation) + } } } diff --git a/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs b/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs index 500bd29f0..1216de4a2 100644 --- a/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs +++ b/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs @@ -17,10 +17,12 @@ pub mod tsconfig; pub mod util; /// The stacks graphs tsg path for this language. -pub const STACK_GRAPHS_TSG_PATH: &str = "./stack-graphs.tsg"; +pub const STACK_GRAPHS_TSG_PATH: &str = "src/stack-graphs.tsg"; /// The stack graphs tsg source for this language -pub const STACK_GRAPHS_TSG_TS_SOURCE: &str = include_str!(concat!(env!("OUT_DIR"), "/stack-graphs-typescript.tsg")); -pub const STACK_GRAPHS_TSG_TSX_SOURCE: &str = include_str!(concat!(env!("OUT_DIR"), "/stack-graphs-tsx.tsg")); +const STACK_GRAPHS_TSG_TS_SOURCE: &str = + include_str!(concat!(env!("OUT_DIR"), "/stack-graphs-typescript.tsg")); +const STACK_GRAPHS_TSG_TSX_SOURCE: &str = + include_str!(concat!(env!("OUT_DIR"), "/stack-graphs-tsx.tsg")); /// The stack graphs builtins configuration for this language pub const STACK_GRAPHS_BUILTINS_CONFIG: &str = include_str!("../src/builtins.cfg"); @@ -34,7 +36,9 @@ pub const FILE_PATH_VAR: &str = "FILE_PATH"; /// The name of the project name global variable pub const PROJECT_NAME_VAR: &str = "PROJECT_NAME"; -pub fn language_configuration_typescript(cancellation_flag: &dyn CancellationFlag) -> LanguageConfiguration { +pub fn language_configuration_typescript( + cancellation_flag: &dyn CancellationFlag, +) -> LanguageConfiguration { try_language_configuration_typescript(cancellation_flag).unwrap_or_else(|err| panic!("{}", err)) } @@ -62,7 +66,9 @@ pub fn try_language_configuration_typescript( Ok(lc) } -pub fn language_configuration_tsx(cancellation_flag: &dyn CancellationFlag) -> LanguageConfiguration { +pub fn language_configuration_tsx( + cancellation_flag: &dyn CancellationFlag, +) -> LanguageConfiguration { try_language_configuration_tsx(cancellation_flag).unwrap_or_else(|err| panic!("{}", err)) } diff --git a/languages/tree-sitter-stack-graphs-typescript/rust/test.rs b/languages/tree-sitter-stack-graphs-typescript/rust/test.rs index 72d41d900..3ff155b6f 100644 --- a/languages/tree-sitter-stack-graphs-typescript/rust/test.rs +++ b/languages/tree-sitter-stack-graphs-typescript/rust/test.rs @@ -11,8 +11,9 @@ use tree_sitter_stack_graphs::ci::Tester; use tree_sitter_stack_graphs::NoCancellation; fn main() -> anyhow::Result<()> { - let lc = match tree_sitter_stack_graphs_typescript::try_language_configuration_typescript(&NoCancellation) - { + let lc = match tree_sitter_stack_graphs_typescript::try_language_configuration_typescript( + &NoCancellation, + ) { Ok(lc) => lc, Err(err) => { eprintln!("{}", err.display_pretty()); From 805bffdbf08c64ad29e1adda8b0fdf0388327f31 Mon Sep 17 00:00:00 2001 From: Eugene Yakubovich Date: Tue, 12 Mar 2024 11:39:45 -0700 Subject: [PATCH 145/202] Don't allow code mixed with directives on a line --- .../tree-sitter-stack-graphs-typescript/build.rs | 12 ++++++++++-- .../tree-sitter-stack-graphs-typescript/rust/lib.rs | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-typescript/build.rs b/languages/tree-sitter-stack-graphs-typescript/build.rs index 0c2d01c25..d7e71e72c 100644 --- a/languages/tree-sitter-stack-graphs-typescript/build.rs +++ b/languages/tree-sitter-stack-graphs-typescript/build.rs @@ -25,6 +25,8 @@ fn preprocess( // Matches: ; #end let directive_end = Regex::new(r";\s*#end").unwrap(); + let no_code = Regex::new(r"^[\s;]+").unwrap(); + let input = std::io::read_to_string(input)?; // If the filter is None or Some(true), the lines are written to the output @@ -35,20 +37,26 @@ fn preprocess( line_no += 1; if let Some(captures) = directive_start.captures(line) { + if !no_code.is_match(line) { + bail!("Line {line_no}: unexpected code before directive"); + } + let directive = captures.get(1).unwrap().as_str(); if !DIALECTS.contains(&directive) { bail!("Line {line_no}: unknown dialect: {directive}"); } filter = Some(dialect == directive); - output.write_all(line.as_bytes())?; } else if directive_end.is_match(line) { + if !no_code.is_match(line) { + bail!("Line {line_no}: unexpected code before directive end"); + } + if filter.is_none() { bail!("Line {line_no}: unmatched directive end"); } filter = None; - output.write_all(line.as_bytes())?; } else if filter.unwrap_or(true) { output.write_all(line.as_bytes())?; } diff --git a/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs b/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs index 1216de4a2..396fbc68b 100644 --- a/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs +++ b/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs @@ -19,9 +19,9 @@ pub mod util; /// The stacks graphs tsg path for this language. pub const STACK_GRAPHS_TSG_PATH: &str = "src/stack-graphs.tsg"; /// The stack graphs tsg source for this language -const STACK_GRAPHS_TSG_TS_SOURCE: &str = +pub const STACK_GRAPHS_TSG_TS_SOURCE: &str = include_str!(concat!(env!("OUT_DIR"), "/stack-graphs-typescript.tsg")); -const STACK_GRAPHS_TSG_TSX_SOURCE: &str = +pub const STACK_GRAPHS_TSG_TSX_SOURCE: &str = include_str!(concat!(env!("OUT_DIR"), "/stack-graphs-tsx.tsg")); /// The stack graphs builtins configuration for this language From b96c015ad67b63520093c83c25728183675ad0ef Mon Sep 17 00:00:00 2001 From: Eugene Yakubovich Date: Fri, 15 Mar 2024 10:23:46 -0700 Subject: [PATCH 146/202] Check for nested and unmatched directives - Error if one #dialect directive is nested in another - Error if #dialect is missing #end at the end of file --- languages/tree-sitter-stack-graphs-typescript/build.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/languages/tree-sitter-stack-graphs-typescript/build.rs b/languages/tree-sitter-stack-graphs-typescript/build.rs index d7e71e72c..31e3dd9de 100644 --- a/languages/tree-sitter-stack-graphs-typescript/build.rs +++ b/languages/tree-sitter-stack-graphs-typescript/build.rs @@ -41,6 +41,10 @@ fn preprocess( bail!("Line {line_no}: unexpected code before directive"); } + if filter.is_some() { + bail!("Line {line_no}: dialect directive cannot be nested"); + } + let directive = captures.get(1).unwrap().as_str(); if !DIALECTS.contains(&directive) { bail!("Line {line_no}: unknown dialect: {directive}"); @@ -64,6 +68,10 @@ fn preprocess( output.write(b"\n")?; } + if filter.is_some() { + bail!("Unmatched directive end at the end of the file"); + } + Ok(()) } From 1e1207237cab1ac72dc4fbad0a8c5085a6f66612 Mon Sep 17 00:00:00 2001 From: Eugene Yakubovich Date: Thu, 14 Mar 2024 11:39:57 -0700 Subject: [PATCH 147/202] Support JSX elements in TSX - Adds support for JSX elements: {expr} - The grammar uses nested_identifier for tags in the Foo.Bar.Baz form. It's the same symbol as what's used in namespaces: namespace Foo.Bar.Baz {} As such it ends up producing a bit of junk (unconnected cliques) but I don't know if it can be fixed w/o tree sitter queries supporting matching only if under a specified ancestor. - Unlike JavaScript, TypeScript requires variables to be declared. In JSX, {y = 2} is allowed if x, y are not in scope. They'll be created on first use. In TSX, this is disallowed which simplifies lexical_scope propogation compared to the JS TSG implementation. --- .../rust/test.rs | 23 ++- .../src/stack-graphs.tsg | 176 +++++++++++++++++- .../test/jsx/jsx_core.tsx | 39 ++++ .../test/jsx/jsx_fragment.tsx | 12 ++ .../test/jsx/jsx_namespace_name.tsx | 30 +++ .../test/jsx/jsx_self_closing_element.tsx | 37 ++++ .../test/jsx/jsx_text.tsx | 8 + 7 files changed, 311 insertions(+), 14 deletions(-) create mode 100644 languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_core.tsx create mode 100644 languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_fragment.tsx create mode 100644 languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_namespace_name.tsx create mode 100644 languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_self_closing_element.tsx create mode 100644 languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_text.tsx diff --git a/languages/tree-sitter-stack-graphs-typescript/rust/test.rs b/languages/tree-sitter-stack-graphs-typescript/rust/test.rs index 3ff155b6f..51ef9cdca 100644 --- a/languages/tree-sitter-stack-graphs-typescript/rust/test.rs +++ b/languages/tree-sitter-stack-graphs-typescript/rust/test.rs @@ -11,15 +11,18 @@ use tree_sitter_stack_graphs::ci::Tester; use tree_sitter_stack_graphs::NoCancellation; fn main() -> anyhow::Result<()> { - let lc = match tree_sitter_stack_graphs_typescript::try_language_configuration_typescript( - &NoCancellation, - ) { - Ok(lc) => lc, - Err(err) => { - eprintln!("{}", err.display_pretty()); - return Err(anyhow!("Language configuration error")); - } - }; + let lc_factories = [ + tree_sitter_stack_graphs_typescript::try_language_configuration_typescript, + tree_sitter_stack_graphs_typescript::try_language_configuration_tsx, + ]; + + let lcs = lc_factories + .iter() + .map(|lc_factory| lc_factory(&NoCancellation)) + .collect::, _>>() + .inspect_err(|err| eprintln!("{}", err.display_pretty())) + .map_err(|_| anyhow!("Language configuration error"))?; + let test_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("test"); - Tester::new(vec![lc], vec![test_path]).run() + Tester::new(lcs, vec![test_path]).run() } diff --git a/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg index 63c56760f..fa1cbf8f8 100644 --- a/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg @@ -2667,6 +2667,13 @@ if none @is_async { (true) ; #dialect typescript (type_assertion) +; #end +; #dialect tsx + (jsx_element) + (jsx_self_closing_element) + (jsx_opening_element) + (jsx_closing_element) + (jsx_expression) ; #end (unary_expression) (undefined) @@ -2805,6 +2812,15 @@ if none @is_async { (decorator (call_expression function:(member_expression object:(identifier)@name))) (decorator (call_expression function:(member_expression object:(member_expression object:(identifier)@name)))) (decorator (call_expression function:(member_expression object:(member_expression object:(member_expression object:(identifier)@name))))) +; #dialect tsx + (nested_identifier (identifier)@name) + (nested_identifier (nested_identifier)@name) + (nested_type_identifier module:(nested_identifier)@name) + (internal_module name:(_)@name) + (jsx_opening_element name: (_)@name) + (jsx_closing_element name: (_)@name) + (jsx_self_closing_element name: (_)@name) +; #end ] { if none @is_def { node @name.cotype @@ -2852,6 +2868,12 @@ if none @is_def { (decorator (call_expression function:(member_expression object:(identifier)@name))) (decorator (call_expression function:(member_expression object:(member_expression object:(identifier)@name)))) (decorator (call_expression function:(member_expression object:(member_expression object:(member_expression object:(identifier)@name))))) +; #dialect tsx + (nested_identifier (identifier)@name (identifier)) ; to pick up foo in JSX: + (jsx_opening_element name: (identifier)@name) + (jsx_closing_element name: (identifier)@name) + (jsx_self_closing_element name: (identifier)@name) +; #end ] { if none @is_def { node @name.expr_ref @@ -3524,10 +3546,22 @@ if none @is_async { ; (member_expression (identifier) (property_identifier)) ; (subscript_expression (identifier) (string)) -(member_expression - object: (_)@object - property: (_)@prop -)@member_expr { +[ + (member_expression + object: (_)@object + property: (_)@prop + )@member_expr +; #dialect tsx + (nested_identifier + (nested_identifier)@object + (identifier)@prop + )@member_expr + (nested_identifier + (identifier)@object + (identifier)@prop + )@member_expr +; #end + ] { node @member_expr.member node @prop.expr_ref node @prop.expr_ref__typeof @@ -6160,3 +6194,137 @@ if none @is_acc { attr (@async.async_type__promise_ref__ns) push_symbol = "%T" edge @async.async_type__promise_ref__ns -> @async.lexical_scope } + +; +; # ##### # # +; # # # # # +; # # # # +; # ##### # +; # # # # # +; # # # # # # +; ##### ##### # # +; +; ;;;;;;;;;;;;;;;;;;;; +; #dialect tsx +; ;;;;;;;;;;;;;;;;;;;; + +(jsx_element + open_tag:(_)@open_tag + close_tag:(_)@close_tag)@jsx_element { + + edge @open_tag.lexical_scope -> @jsx_element.lexical_scope + edge @close_tag.lexical_scope -> @jsx_element.lexical_scope +} + +(jsx_element + [ + (jsx_text) + (jsx_element) + (jsx_fragment) + (jsx_self_closing_element) + (jsx_expression) + ]@child +)@parent { + edge @child.lexical_scope -> @parent.lexical_scope +} + +(jsx_fragment)@fragment { + node @fragment.lexical_scope + node @fragment.value + node @fragment.type +} + +(jsx_fragment + [ + (jsx_text) + (jsx_element) + (jsx_fragment) + (jsx_self_closing_element) + (jsx_expression) + ]@child +) @parent { + edge @child.lexical_scope -> @parent.lexical_scope +} + +(jsx_text)@jsx_text { + node @jsx_text.lexical_scope +} + +[ + (jsx_opening_element name: (_)@name)@element + (jsx_closing_element name: (_)@name)@element + (jsx_self_closing_element name: (_)@name)@element +] { + edge @name.lexical_scope -> @element.lexical_scope +} + +(jsx_opening_element + name:(_)@element_name + attribute:(_)@attr +) { + edge @attr.lexical_scope -> @element_name.lexical_scope +} + +(jsx_attribute (_) . (_)?@attr_value)@jsx_attribute { + node @jsx_attribute.lexical_scope + + if some @attr_value { + edge @attr_value.lexical_scope -> @jsx_attribute.lexical_scope + } +} + +(jsx_namespace_name (_) @lhs (_) @rhs)@name { + node @name.lexical_scope + + edge @lhs.lexical_scope -> @name.lexical_scope + edge @rhs.lexical_scope -> @name.lexical_scope +} + +(jsx_self_closing_element + name:(_)@element_name)@element { + edge @element_name.lexical_scope -> @element.lexical_scope +} + +(jsx_self_closing_element + name:(_)@element_name + attribute:(_)@attr +) { + edge @attr.lexical_scope -> @element_name.lexical_scope +} + +(jsx_expression (_)@child)@expr { + edge @child.lexical_scope -> @expr.lexical_scope +} + +(jsx_closing_element + name:(_)@element_name)@element +{ + edge @element_name.lexical_scope -> @element.lexical_scope +} + +[ + (jsx_opening_element + name:(identifier)@element_name) + (jsx_self_closing_element + name:(identifier)@element_name) + (jsx_closing_element + name:(identifier)@element_name) +] { + scan (source-text @element_name) { + ; standard HTML elements + "^(a|abbr|acronym|address|applet|area|article|aside|audio|b|base|basefont|bdi|bdo|big|blockquote|body|br|button|canvas|caption|center|cite|code|col|colgroup|data|datalist|dd|del|details|dfn|dialog|dir|div|dl|dt|em|embed|fieldset|figcaption|figure|font|footer|form|frame|frameset|h1|h2|h3|h4|h5|h6|head|header|hgroup|hr|html|i|iframe|input|ins|kbd|label|legend|li|link|main|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|picture|pre|progress|q|rp|rt|ruby|s|samp|script|search|section|select|small|source|span|strike|strong|style|sub|summary|sup|svg|table|tbody|td|template|textarea|tfoot|th|thead|time|title|tr|track|tt|u|ul|var|video|wbr)$" { + ; do nothing! + } + + ; everything else + "^.+$" { + node element_name_pop + attr (element_name_pop) node_reference = @element_name + edge element_name_pop -> @element_name.lexical_scope + } + } +} + +; ;;;;;;;;;;;;;;;;;;;; +; #end +; ;;;;;;;;;;;;;;;;;;;; diff --git a/languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_core.tsx b/languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_core.tsx new file mode 100644 index 000000000..93285bc93 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_core.tsx @@ -0,0 +1,39 @@ +// The core of JSX tests here verify the behavior of the following node types: +// jsx_element +// jsx_identifier +// jsx_attribute +// jsx_expression +// jsx_opening_element +// jsx_closing_element +// There is no real way to avoid testing all of these at once, +// and so we don't even try to. + +let x = 1; + +// Flow In + +const el = {x}; +// ^ defined: 11 +// ^ defined: 11 + +const el2 = +// ^ defined: 11 +// ^ defined: 11 + +let y = 0; +let z = 2; + +const el = +// ^ defined: 23 + {z = 3} +// ^ defined: 24 +; + +/**/ y; +// ^ defined: 23 + +/**/ z; +// ^ defined: 24 + +/**/ x; +// ^ defined: 11 diff --git a/languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_fragment.tsx b/languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_fragment.tsx new file mode 100644 index 000000000..1713694f7 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_fragment.tsx @@ -0,0 +1,12 @@ +let x = 1; + +// Flow Around + +const el = <>; + +/**/ x; +// ^ defined: 1 + +// Children +({x}); +// ^ defined: 1 diff --git a/languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_namespace_name.tsx b/languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_namespace_name.tsx new file mode 100644 index 000000000..74fe0ff9b --- /dev/null +++ b/languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_namespace_name.tsx @@ -0,0 +1,30 @@ +let x = 1; + +// Flow Around +namespace noo.bar { + export let baz = 1; +} + +const el = ; +// ^ defined: 4 +// ^ defined: 4 +// ^ defined: 5 +// ^ defined: 4 +// ^ defined: 4 +// ^ defined: 5 + +/**/ x; +// ^ defined: 1 + +// Flow In + +let foo = { + bar: { + baz: 1 + } +}; + +const el2 = ; +// ^ defined: 21 +// ^ defined: 22 +// ^ defined: 23 diff --git a/languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_self_closing_element.tsx b/languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_self_closing_element.tsx new file mode 100644 index 000000000..d26746137 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_self_closing_element.tsx @@ -0,0 +1,37 @@ +// The core of JSX tests here verify the behavior of the following node types: +// jsx_element +// jsx_identifier +// jsx_attribute +// jsx_expression +// jsx_opening_element +// jsx_closing_element +// There is no real way to avoid testing all of these at once, +// and so we don't even try to. + +let x = 1; + +// Flow In + +const el = ; +// ^ defined: 11 + +const el2 = +// ^ defined: 11 + +// Flow Out + +let y = 2; + +const el = ; +// ^ defined: 23 + +// Flow Across + +const el = ; +// ^ defined: 23 + +// Flow Around + +/**/ x; +// ^ defined: 11 diff --git a/languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_text.tsx b/languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_text.tsx new file mode 100644 index 000000000..0cc359765 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_text.tsx @@ -0,0 +1,8 @@ +let x = 1; + +// Flow Around + +const el = bar; + +/**/ x; +// ^ defined: 1 \ No newline at end of file From 7db914c01b35ce024f6767e02dd1ad97022a6bc1 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 10 Apr 2024 17:26:28 +0200 Subject: [PATCH 148/202] Skip failed files during indexing instead of aborting the whole index operation --- tree-sitter-stack-graphs/CHANGELOG.md | 8 ++++++++ tree-sitter-stack-graphs/Cargo.toml | 2 +- tree-sitter-stack-graphs/src/cli/index.rs | 18 +++++------------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tree-sitter-stack-graphs/CHANGELOG.md b/tree-sitter-stack-graphs/CHANGELOG.md index 2b907e682..f72fb402c 100644 --- a/tree-sitter-stack-graphs/CHANGELOG.md +++ b/tree-sitter-stack-graphs/CHANGELOG.md @@ -5,6 +5,14 @@ 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.8.2 -- unreleased + +### CLI + +#### Changed + +- Failure to index a file will not abort indexing anymore, but simply mark the file as failed, as we already do for files with parse errors. + ## v0.8.1 -- 2024-03-06 The `stack-graphs` dependency was updated to `v0.13` to fix the build problems of the `v0.8.0` release. diff --git a/tree-sitter-stack-graphs/Cargo.toml b/tree-sitter-stack-graphs/Cargo.toml index 875faf4ef..d1b0fc1c6 100644 --- a/tree-sitter-stack-graphs/Cargo.toml +++ b/tree-sitter-stack-graphs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tree-sitter-stack-graphs" -version = "0.8.1" +version = "0.8.2" description = "Create stack graphs using tree-sitter parsers" homepage = "https://github.com/github/stack-graphs/tree/main/tree-sitter-stack-graphs" repository = "https://github.com/github/stack-graphs/" diff --git a/tree-sitter-stack-graphs/src/cli/index.rs b/tree-sitter-stack-graphs/src/cli/index.rs index 6d192e382..e8704f99d 100644 --- a/tree-sitter-stack-graphs/src/cli/index.rs +++ b/tree-sitter-stack-graphs/src/cli/index.rs @@ -355,23 +355,15 @@ impl<'a> Indexer<'a> { if let Err(err) = result { match err.inner { BuildError::Cancelled(_) => { - file_status.warning("parsing timed out", None); + file_status.warning("timed out", None); self.db - .store_error_for_file(source_path, &tag, "parsing timed out")?; - return Ok(()); - } - BuildError::ParseErrors { .. } => { - file_status.failure("parsing failed", Some(&err.display_pretty())); - self.db.store_error_for_file( - source_path, - &tag, - &format!("parsing failed: {}", err.inner), - )?; + .store_error_for_file(source_path, &tag, "timed out")?; return Ok(()); } _ => { - file_status.failure("failed to build stack graph", Some(&err.display_pretty())); - return Err(IndexError::StackGraph); + file_status.failure("failed", Some(&err.display_pretty())); + self.db.store_error_for_file(source_path, &tag, "failed")?; + return Ok(()); } } }; From 4ef3678a28f3521572653b38974999bf6b2778cf Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Mon, 22 Apr 2024 11:33:16 +0200 Subject: [PATCH 149/202] Add support for lambda parameters --- .../src/stack-graphs.tsg | 59 +++++++++++++------ .../test/lambdas.py | 2 + 2 files changed, 42 insertions(+), 19 deletions(-) create mode 100644 languages/tree-sitter-stack-graphs-python/test/lambdas.py diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 48353f14a..f9798fe54 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/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) {} diff --git a/languages/tree-sitter-stack-graphs-python/test/lambdas.py b/languages/tree-sitter-stack-graphs-python/test/lambdas.py new file mode 100644 index 000000000..9812df4de --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/lambdas.py @@ -0,0 +1,2 @@ +sorted([1, 2, 3], key=lambda x: x) +# ^ defined: 1 From f7e8984e70350160b1019ac3c12f68bcfe823580 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Tue, 23 Apr 2024 13:47:25 +0200 Subject: [PATCH 150/202] Cache partial paths for builtins when running tests --- stack-graphs/src/graph.rs | 8 ++- tree-sitter-stack-graphs/src/cli/test.rs | 90 +++++++++++++++++++----- 2 files changed, 77 insertions(+), 21 deletions(-) diff --git a/stack-graphs/src/graph.rs b/stack-graphs/src/graph.rs index 84748c6bf..686344ee5 100644 --- a/stack-graphs/src/graph.rs +++ b/stack-graphs/src/graph.rs @@ -1497,12 +1497,16 @@ impl StackGraph { /// Copies the given stack graph into this stack graph. Panics if any of the files /// in the other stack graph are already defined in the current one. - pub fn add_from_graph(&mut self, other: &StackGraph) -> Result<(), Handle> { + pub fn add_from_graph( + &mut self, + other: &StackGraph, + ) -> Result>, Handle> { let mut files = HashMap::new(); for other_file in other.iter_files() { let file = self.add_file(other[other_file].name())?; files.insert(other_file, file); } + let files = files; let node_id = |other_node_id: NodeID| { if other_node_id.is_root() { NodeID::root() @@ -1645,7 +1649,7 @@ impl StackGraph { } } } - Ok(()) + Ok(files.into_values().collect()) } } diff --git a/tree-sitter-stack-graphs/src/cli/test.rs b/tree-sitter-stack-graphs/src/cli/test.rs index 780d478f6..c7f73e7ce 100644 --- a/tree-sitter-stack-graphs/src/cli/test.rs +++ b/tree-sitter-stack-graphs/src/cli/test.rs @@ -19,9 +19,13 @@ use stack_graphs::stitching::Database; use stack_graphs::stitching::DatabaseCandidates; use stack_graphs::stitching::ForwardPartialPathStitcher; use stack_graphs::stitching::StitcherConfig; +use std::collections::hash_map::Entry; +use std::collections::HashMap; +use std::collections::HashSet; use std::path::Path; use std::path::PathBuf; use std::time::Duration; +use tree_sitter::Language; use tree_sitter_graph::Variables; use crate::cli::util::duration_from_seconds_str; @@ -176,10 +180,16 @@ impl TestArgs { pub fn run(self, mut loader: Loader) -> anyhow::Result<()> { let reporter = self.get_reporter(); let mut total_result = TestResult::new(); + let mut cache = HashMap::new(); for (test_root, test_path, _) in iter_files_and_directories(self.test_paths.clone()) { let mut file_status = CLIFileReporter::new(&reporter, &test_path); - let test_result = - self.run_test(&test_root, &test_path, &mut loader, &mut file_status)?; + let test_result = self.run_test( + &test_root, + &test_path, + &mut loader, + &mut file_status, + &mut cache, + )?; file_status.assert_reported(); total_result.absorb(test_result); } @@ -211,14 +221,15 @@ impl TestArgs { } /// Run test file. Takes care of the output when an error is returned. - fn run_test( + fn run_test<'a>( &self, test_root: &Path, test_path: &Path, - loader: &mut Loader, + loader: &'a mut Loader, file_status: &mut CLIFileReporter, + cache: &mut HashMap, ) -> anyhow::Result { - match self.run_test_inner(test_root, test_path, loader, file_status) { + match self.run_test_inner(test_root, test_path, loader, file_status, cache) { ok @ Ok(_) => ok, err @ Err(_) => { file_status.failure_if_processing("error", None); @@ -227,12 +238,13 @@ impl TestArgs { } } - fn run_test_inner( + fn run_test_inner<'a>( &self, test_root: &Path, test_path: &Path, - loader: &mut Loader, + loader: &'a mut Loader, file_status: &mut CLIFileReporter, + cache: &mut HashMap, ) -> anyhow::Result { let cancellation_flag = CancelAfterDuration::from_option(self.max_test_time); @@ -263,11 +275,24 @@ impl TestArgs { file_status.processing(); + let stitcher_config = + StitcherConfig::default().with_detect_similar_paths(!lc.no_similar_paths_in_file); + let mut partials = PartialPaths::new(); + let mut db = Database::new(); + let source = file_reader.get(test_path)?; let default_fragment_path = test_path.strip_prefix(test_root).unwrap(); let mut test = Test::from_source(test_path, source, default_fragment_path)?; if !self.no_builtins { - self.load_builtins_into(&lc, &mut test.graph)?; + self.load_builtins_into( + &lc, + &mut test.graph, + &mut partials, + &mut db, + stitcher_config, + cancellation_flag.as_ref(), + cache, + )?; } let mut globals = Variables::new(); for test_fragment in &test.fragments { @@ -325,15 +350,11 @@ impl TestArgs { Ok(_) => {} } } - let stitcher_config = - StitcherConfig::default().with_detect_similar_paths(!lc.no_similar_paths_in_file); - let mut partials = PartialPaths::new(); - let mut db = Database::new(); - for file in test.graph.iter_files() { + for fragment in &test.fragments { ForwardPartialPathStitcher::find_minimal_partial_path_set_in_file( &test.graph, &mut partials, - file, + fragment.file, stitcher_config, &cancellation_flag.as_ref(), |g, ps, p| { @@ -387,14 +408,45 @@ impl TestArgs { Ok(result) } - fn load_builtins_into( + fn load_builtins_into<'a>( &self, - lc: &LanguageConfiguration, + lc: &'a LanguageConfiguration, graph: &mut StackGraph, + partials: &mut PartialPaths, + db: &mut Database, + stitcher_config: StitcherConfig, + cancellation_flag: &dyn CancellationFlag, + cache: &mut HashMap, ) -> anyhow::Result<()> { - if let Err(h) = graph.add_from_graph(&lc.builtins) { - return Err(anyhow!("Duplicate builtin file {}", &graph[h])); - } + let files = graph + .add_from_graph(&lc.builtins) + .map_err(|h| anyhow!("Duplicate builtin file {}", &graph[h]))?; + let files = files.into_iter().collect::>(); + match cache.entry(lc.language) { + Entry::Occupied(o) => { + o.get().load_into(graph, partials, db)?; + } + Entry::Vacant(v) => { + for file in &files { + ForwardPartialPathStitcher::find_minimal_partial_path_set_in_file( + graph, + partials, + *file, + stitcher_config, + &cancellation_flag, + |g, ps, p| { + db.add_partial_path(g, ps, p.clone()); + }, + )?; + } + v.insert(db.to_serializable_filter( + graph, + partials, + &|_: &StackGraph, f: &Handle| files.contains(f), + )); + } + }; + Ok(()) } From 6499341a531111afe10489e8cf0fe8495b353e9b Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Tue, 23 Apr 2024 13:55:37 +0200 Subject: [PATCH 151/202] Update changelog --- tree-sitter-stack-graphs/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tree-sitter-stack-graphs/CHANGELOG.md b/tree-sitter-stack-graphs/CHANGELOG.md index f72fb402c..e7538592a 100644 --- a/tree-sitter-stack-graphs/CHANGELOG.md +++ b/tree-sitter-stack-graphs/CHANGELOG.md @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### CLI +#### Added + +- Tests run faster for languages with builtins sources by caching the partial paths for the builtins. + #### Changed - Failure to index a file will not abort indexing anymore, but simply mark the file as failed, as we already do for files with parse errors. From b533b31add3953f851baba12983a4bccf1c1d47d Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 15 May 2024 12:04:21 +0200 Subject: [PATCH 152/202] Always enable both TS & TSX in CLI --- .../rust/bin.rs | 54 ++++++------------- 1 file changed, 16 insertions(+), 38 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-typescript/rust/bin.rs b/languages/tree-sitter-stack-graphs-typescript/rust/bin.rs index 797e8cea7..ea7713595 100644 --- a/languages/tree-sitter-stack-graphs-typescript/rust/bin.rs +++ b/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> { - 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, } From 36f83ea6b262ee871bf4f7b64a9dcbabfd98e3f7 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 15 May 2024 12:14:44 +0200 Subject: [PATCH 153/202] Update version and changelog --- languages/tree-sitter-stack-graphs-typescript/CHANGELOG.md | 6 ++++++ languages/tree-sitter-stack-graphs-typescript/Cargo.toml | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-typescript/CHANGELOG.md b/languages/tree-sitter-stack-graphs-typescript/CHANGELOG.md index a23db2f0e..b4260b2a6 100644 --- a/languages/tree-sitter-stack-graphs-typescript/CHANGELOG.md +++ b/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`. diff --git a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml index 46360f19c..e40c12625 100644 --- a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml +++ b/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 "] license = "MIT OR Apache-2.0" edition = "2018" From 3f1ebc2f2e14d40e5d358848570e4863f704870d Mon Sep 17 00:00:00 2001 From: nohehf Date: Thu, 23 May 2024 10:20:25 +0200 Subject: [PATCH 154/202] test: add nested functions --- .../test/nested_functions.py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 languages/tree-sitter-stack-graphs-python/test/nested_functions.py diff --git a/languages/tree-sitter-stack-graphs-python/test/nested_functions.py b/languages/tree-sitter-stack-graphs-python/test/nested_functions.py new file mode 100644 index 000000000..0c6e6666e --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/nested_functions.py @@ -0,0 +1,11 @@ +def outer(a): + def inner(b, c): + pass + + inner(1) + # ^ defined: 2 + + +class A: + def method(a): + pass From 3dfe218ef25cd2eb79bf7d8faece8d0f7d36325c Mon Sep 17 00:00:00 2001 From: nohehf Date: Thu, 23 May 2024 10:23:11 +0200 Subject: [PATCH 155/202] test: nested function test --- .../test/nested_functions.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/test/nested_functions.py b/languages/tree-sitter-stack-graphs-python/test/nested_functions.py index 0c6e6666e..db655e3a3 100644 --- a/languages/tree-sitter-stack-graphs-python/test/nested_functions.py +++ b/languages/tree-sitter-stack-graphs-python/test/nested_functions.py @@ -1,11 +1,6 @@ def outer(a): - def inner(b, c): + def inner(b): pass inner(1) # ^ defined: 2 - - -class A: - def method(a): - pass From 5164f4b19f7d35097c9ed43dc57de01518647c88 Mon Sep 17 00:00:00 2001 From: nohehf Date: Thu, 23 May 2024 11:11:51 +0200 Subject: [PATCH 156/202] test: not a method --- .../test/not_a_method.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 languages/tree-sitter-stack-graphs-python/test/not_a_method.py diff --git a/languages/tree-sitter-stack-graphs-python/test/not_a_method.py b/languages/tree-sitter-stack-graphs-python/test/not_a_method.py new file mode 100644 index 000000000..c58e9af1e --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/not_a_method.py @@ -0,0 +1,13 @@ +class Foo: + a = 1 + + # Self can be named anything + def first_method(actually_self): + return actually_self.a + # ^ defined: 2 + + def second_method(self): + # First argument here is not self + def not_a_method(not_self): + return not_self.a + # ^ defined: From b020128c0e0c487ccac8e9c12f68a989212ef910 Mon Sep 17 00:00:00 2001 From: nohehf Date: Thu, 23 May 2024 21:52:50 +0200 Subject: [PATCH 157/202] fix: method self --- .../tree-sitter-stack-graphs-python/query | 12 +++++++++ .../src/stack-graphs.tsg | 26 +++++++++++++------ .../test/not_a_method.py | 15 ++++++++--- .../test/self.py | 11 ++++++++ 4 files changed, 52 insertions(+), 12 deletions(-) create mode 100644 languages/tree-sitter-stack-graphs-python/query create mode 100644 languages/tree-sitter-stack-graphs-python/test/self.py diff --git a/languages/tree-sitter-stack-graphs-python/query b/languages/tree-sitter-stack-graphs-python/query new file mode 100644 index 000000000..546c1d8d2 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/query @@ -0,0 +1,12 @@ +(class_definition + body: ( + block + (function_definition + parameters: + (parameters + . (identifier) @first_param + ) + body: (block) @method_body + ) + ) +) \ No newline at end of file diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index f9798fe54..b3973b6ae 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -794,19 +794,29 @@ inherit .parent_module edge @name.def -> @func.call ; Prevent functions defined inside of method bodies from being treated like methods + ; There might be a bug here as calling .self_scope after this, will not fallback to the larger scope let @body.class_self_scope = #null let @body.class_member_attr_scope = #null } -(function_definition - parameters: (parameters - . (identifier) @param) - body: (block) @body) +; method definition +(class_definition + body: ( + block + (function_definition + parameters: + (parameters + . (identifier) @first_param + ) + body: (block) @method_body + ) + ) +) { - edge @param.def -> @param.class_self_scope - edge @param.class_member_attr_scope -> @param.output - edge @param.output -> @body.after_scope - attr (@param.output) push_node = @param + edge @first_param.def -> @first_param.class_self_scope + edge @first_param.class_member_attr_scope -> @first_param.output + edge @first_param.output -> @method_body.after_scope + attr (@first_param.output) push_node = @first_param } [ diff --git a/languages/tree-sitter-stack-graphs-python/test/not_a_method.py b/languages/tree-sitter-stack-graphs-python/test/not_a_method.py index c58e9af1e..f0a207eb0 100644 --- a/languages/tree-sitter-stack-graphs-python/test/not_a_method.py +++ b/languages/tree-sitter-stack-graphs-python/test/not_a_method.py @@ -1,13 +1,20 @@ class Foo: a = 1 - # Self can be named anything - def first_method(actually_self): - return actually_self.a - # ^ defined: 2 + def first_method(self): + self.a + # ^ defined: 2 def second_method(self): + self.a + # ^ defined: 2 + # First argument here is not self def not_a_method(not_self): return not_self.a # ^ defined: + + +def function(self): + self.a + # ^ defined: diff --git a/languages/tree-sitter-stack-graphs-python/test/self.py b/languages/tree-sitter-stack-graphs-python/test/self.py new file mode 100644 index 000000000..763a52eb6 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/self.py @@ -0,0 +1,11 @@ +class Foo: + a = 1 + + def mathod_1(self): + return self.a + # ^ defined: 2 + + # Self can be named anything + def method_2(actually_self): + return actually_self.a + # ^ defined: 2 From 9551ad995c79277d950ac2e0d5d9a2d5e42631e2 Mon Sep 17 00:00:00 2001 From: nohehf Date: Thu, 23 May 2024 21:59:18 +0200 Subject: [PATCH 158/202] chore: remove unused test tree sitter query --- languages/tree-sitter-stack-graphs-python/query | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 languages/tree-sitter-stack-graphs-python/query diff --git a/languages/tree-sitter-stack-graphs-python/query b/languages/tree-sitter-stack-graphs-python/query deleted file mode 100644 index 546c1d8d2..000000000 --- a/languages/tree-sitter-stack-graphs-python/query +++ /dev/null @@ -1,12 +0,0 @@ -(class_definition - body: ( - block - (function_definition - parameters: - (parameters - . (identifier) @first_param - ) - body: (block) @method_body - ) - ) -) \ No newline at end of file From 3d283157bc40442d5b9f12e21ef13342ccf23f35 Mon Sep 17 00:00:00 2001 From: nohehf Date: Mon, 27 May 2024 09:47:41 +0200 Subject: [PATCH 159/202] fix: ignore .ts and .js extensions form imports --- .../src/stack-graphs.tsg | 6 ++++-- .../test/modules/import-extension-js.ts | 6 ++++++ .../test/modules/import-extension-none.ts | 6 ++++++ .../test/modules/import-extension-ts.ts | 6 ++++++ 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 languages/tree-sitter-stack-graphs-typescript/test/modules/import-extension-js.ts create mode 100644 languages/tree-sitter-stack-graphs-typescript/test/modules/import-extension-none.ts create mode 100644 languages/tree-sitter-stack-graphs-typescript/test/modules/import-extension-ts.ts diff --git a/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg index fa1cbf8f8..a51a80c07 100644 --- a/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg @@ -260,7 +260,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n ; expose globals edge proj_scope -> @prog.globals - + var mod_scope = proj_scope if (not (is-empty @imexs)) { ; module definition @@ -541,7 +541,9 @@ attribute node_symbol = node => symbol = (source-text node), source_n ; module reference var mod_scope = mod_ref__ns scan (path-normalize mod_path) { - "([^/]+)/?" { + ; ignore .js and .ts extensions on imports, as ts allows this + ; this might lead to false positives + "([^/|(\.j|ts)]+)/?" { node mod_ref attr (mod_ref) push_symbol = $1 edge mod_ref -> mod_scope diff --git a/languages/tree-sitter-stack-graphs-typescript/test/modules/import-extension-js.ts b/languages/tree-sitter-stack-graphs-typescript/test/modules/import-extension-js.ts new file mode 100644 index 000000000..92817fbaf --- /dev/null +++ b/languages/tree-sitter-stack-graphs-typescript/test/modules/import-extension-js.ts @@ -0,0 +1,6 @@ +/* --- path: src/foo.ts --- */ +export const bar = 42; + +/* --- path: src/index.ts --- */ +import { bar } from "./foo.js"; +// ^ defined: 2 diff --git a/languages/tree-sitter-stack-graphs-typescript/test/modules/import-extension-none.ts b/languages/tree-sitter-stack-graphs-typescript/test/modules/import-extension-none.ts new file mode 100644 index 000000000..f221684b4 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-typescript/test/modules/import-extension-none.ts @@ -0,0 +1,6 @@ +/* --- path: src/foo.ts --- */ +export const bar = 42; + +/* --- path: src/index.ts --- */ +import { bar } from "./foo"; +// ^ defined: 2 diff --git a/languages/tree-sitter-stack-graphs-typescript/test/modules/import-extension-ts.ts b/languages/tree-sitter-stack-graphs-typescript/test/modules/import-extension-ts.ts new file mode 100644 index 000000000..1e46349c9 --- /dev/null +++ b/languages/tree-sitter-stack-graphs-typescript/test/modules/import-extension-ts.ts @@ -0,0 +1,6 @@ +/* --- path: src/foo.ts --- */ +export const bar = 42; + +/* --- path: src/index.ts --- */ +import { bar } from "./foo.ts"; +// ^ defined: 2 From 7509f09fdbd55267c9b933c25ce04f6a8fe55581 Mon Sep 17 00:00:00 2001 From: nohehf <64989428+nohehf@users.noreply.github.com> Date: Mon, 27 May 2024 14:17:55 +0200 Subject: [PATCH 160/202] chore: fmt Co-authored-by: Hendrik van Antwerpen --- .../tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index b3973b6ae..751e2a3db 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -801,13 +801,10 @@ inherit .parent_module ; method definition (class_definition - body: ( - block + body: (block (function_definition parameters: - (parameters - . (identifier) @first_param - ) + (parameters . (identifier) @first_param) body: (block) @method_body ) ) From d0b940e66c0e0c2d83533cc743d30142e4728585 Mon Sep 17 00:00:00 2001 From: nohehf Date: Mon, 27 May 2024 15:46:23 +0200 Subject: [PATCH 161/202] fix: add auxiliary function to remove file ext --- .../src/stack-graphs.tsg | 9 ++--- tree-sitter-stack-graphs/src/functions.rs | 37 +++++++++++++++++++ 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg index a51a80c07..7e6359280 100644 --- a/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg @@ -260,7 +260,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n ; expose globals edge proj_scope -> @prog.globals - + var mod_scope = proj_scope if (not (is-empty @imexs)) { ; module definition @@ -540,10 +540,9 @@ attribute node_symbol = node => symbol = (source-text node), source_n ; module reference var mod_scope = mod_ref__ns - scan (path-normalize mod_path) { - ; ignore .js and .ts extensions on imports, as ts allows this - ; this might lead to false positives - "([^/|(\.j|ts)]+)/?" { + ; normalize path and remove the extension as we want to match 'foo', 'foo.js', 'foo.ts', etc. + scan (path-remove-ext (path-normalize mod_path)) { + "([^/]+)/?" { node mod_ref attr (mod_ref) push_symbol = $1 edge mod_ref -> mod_scope diff --git a/tree-sitter-stack-graphs/src/functions.rs b/tree-sitter-stack-graphs/src/functions.rs index 9082ba427..e1f9e94e5 100644 --- a/tree-sitter-stack-graphs/src/functions.rs +++ b/tree-sitter-stack-graphs/src/functions.rs @@ -43,6 +43,10 @@ pub mod path { path_fn(|p| normalize(p).map(|p| p.as_os_str().to_os_string())), ); functions.add("path-split".into(), PathSplit); + functions.add( + "path-remove-ext".into(), + path_fn(|p| remove_extension(p).map(|p| p.as_os_str().to_os_string())), + ); } pub fn path_fn(f: F) -> impl Function @@ -159,4 +163,37 @@ pub mod path { } Some(ret) } + + /// Removes the extension from a path. + /// eg. `foo/bar.rs` -> `foo/bar` + /// eg. `foo/bar` -> `foo/bar` + /// eg. `foo/bar.rs.bak` -> `foo/bar.rs` + pub fn remove_extension(path: &Path) -> Option { + path.extension() + .map_or(Some(path.into()), |_| path.with_extension("").into()) + } + + #[test] + fn test_remove_extension() { + assert_eq!( + remove_extension(Path::new("foo/bar.rs")), + Some(PathBuf::from("foo/bar")) + ); + assert_eq!( + remove_extension(Path::new("foo/bar")), + Some(PathBuf::from("foo/bar")) + ); + assert_eq!( + remove_extension(Path::new("foo/bar.rs.bak")), + Some(PathBuf::from("foo/bar.rs")) + ); + assert_eq!( + remove_extension(Path::new("foo")), + Some(PathBuf::from("foo")) + ); + assert_eq!( + remove_extension(Path::new("foo.rs")), + Some(PathBuf::from("foo")) + ); + } } From b049439a056a5bda754c6fac931b7ea686143fe2 Mon Sep 17 00:00:00 2001 From: nohehf Date: Mon, 27 May 2024 15:51:15 +0200 Subject: [PATCH 162/202] chore: remove unrelated comment --- languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg | 1 - 1 file changed, 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 751e2a3db..6b5efd35f 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -794,7 +794,6 @@ inherit .parent_module edge @name.def -> @func.call ; Prevent functions defined inside of method bodies from being treated like methods - ; There might be a bug here as calling .self_scope after this, will not fallback to the larger scope let @body.class_self_scope = #null let @body.class_member_attr_scope = #null } From 7621ac28eb34a0c32a7d6cbb5e485f8f306eeea9 Mon Sep 17 00:00:00 2001 From: nohehf Date: Tue, 28 May 2024 10:47:08 +0200 Subject: [PATCH 163/202] feat: add root path and pass file path explicitely --- .../src/stack-graphs.tsg | 5 ++- .../test/root_path.py | 21 ++++++++++++ tree-sitter-stack-graphs/src/cli/index.rs | 11 ++++++- tree-sitter-stack-graphs/src/cli/test.rs | 2 ++ tree-sitter-stack-graphs/src/lib.rs | 27 +++++++++++++-- tree-sitter-stack-graphs/src/loader.rs | 33 ++++++++++++++----- tree-sitter-stack-graphs/src/test.rs | 4 +++ tree-sitter-stack-graphs/tests/it/builder.rs | 27 ++++++++++++--- tree-sitter-stack-graphs/tests/it/main.rs | 17 ++++++++-- tree-sitter-stack-graphs/tests/it/test.rs | 14 +++++++- 10 files changed, 140 insertions(+), 21 deletions(-) create mode 100644 languages/tree-sitter-stack-graphs-python/test/root_path.py diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 6b5efd35f..887e171b3 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -13,6 +13,7 @@ ;; ^^^^^^^^^^^^^^^^ global FILE_PATH +global ROOT_PATH global ROOT_NODE global JUMP_TO_SCOPE_NODE @@ -272,7 +273,9 @@ inherit .parent_module node grandparent_module_ref_node var grandparent_module_ref = grandparent_module_ref_node - scan FILE_PATH { + ; get the file path relative to the root path + let rel_path = (replace FILE_PATH ROOT_PATH "") + scan rel_path { "([^/]+)/" { node def_dot diff --git a/languages/tree-sitter-stack-graphs-python/test/root_path.py b/languages/tree-sitter-stack-graphs-python/test/root_path.py new file mode 100644 index 000000000..23937db7c --- /dev/null +++ b/languages/tree-sitter-stack-graphs-python/test/root_path.py @@ -0,0 +1,21 @@ +# ------ path: foo/bar/module.py -----------# +# ------ global: ROOT_PATH=foo/bar -----------# + +foo = 42 + +# ------ path: foo/bar/baz/module.py -----------# +# ------ global: ROOT_PATH=foo/bar -----------# + +bar = "hello" + +# ------ path: foo/bar/main.py -------------# +# ------ global: ROOT_PATH=foo/bar -----------# + +from module import foo +from baz.module import bar + +print(foo) +# ^ defined: 4, 14 + +print(bar) +# ^ defined: 9, 15 diff --git a/tree-sitter-stack-graphs/src/cli/index.rs b/tree-sitter-stack-graphs/src/cli/index.rs index e8704f99d..5bf48f54f 100644 --- a/tree-sitter-stack-graphs/src/cli/index.rs +++ b/tree-sitter-stack-graphs/src/cli/index.rs @@ -428,10 +428,19 @@ impl<'a> Indexer<'a> { cancellation_flag: &dyn CancellationFlag, ) -> std::result::Result<(), BuildErrorWithSource<'b>> { let relative_source_path = source_path.strip_prefix(source_root).unwrap(); + // here the file should also have stripped the source_root from its path if let Some(lc) = lcs.primary { let globals = Variables::new(); lc.sgl - .build_stack_graph_into(graph, file, source, &globals, cancellation_flag) + .build_stack_graph_into( + graph, + file, + source, + source_path, + source_root, + &globals, + cancellation_flag, + ) .map_err(|inner| BuildErrorWithSource { inner, source_path: source_path.to_path_buf(), diff --git a/tree-sitter-stack-graphs/src/cli/test.rs b/tree-sitter-stack-graphs/src/cli/test.rs index c7f73e7ce..210d79947 100644 --- a/tree-sitter-stack-graphs/src/cli/test.rs +++ b/tree-sitter-stack-graphs/src/cli/test.rs @@ -321,6 +321,8 @@ impl TestArgs { &mut test.graph, test_fragment.file, &test_fragment.source, + &test_fragment.path, + &test_fragment.root_path, &globals, cancellation_flag.as_ref(), ) diff --git a/tree-sitter-stack-graphs/src/lib.rs b/tree-sitter-stack-graphs/src/lib.rs index 86651b6be..aee860420 100644 --- a/tree-sitter-stack-graphs/src/lib.rs +++ b/tree-sitter-stack-graphs/src/lib.rs @@ -438,6 +438,7 @@ static PRECEDENCE_ATTR: &'static str = "precedence"; static ROOT_NODE_VAR: &'static str = "ROOT_NODE"; static JUMP_TO_SCOPE_NODE_VAR: &'static str = "JUMP_TO_SCOPE_NODE"; static FILE_PATH_VAR: &'static str = "FILE_PATH"; +static ROOT_PATH_VAR: &'static str = "ROOT_PATH"; /// Holds information about how to construct stack graphs for a particular language. pub struct StackGraphLanguage { @@ -557,10 +558,12 @@ impl StackGraphLanguage { stack_graph: &'a mut StackGraph, file: Handle, source: &'a str, + source_path: &Path, + source_root: &Path, globals: &'a Variables<'a>, cancellation_flag: &'a dyn CancellationFlag, ) -> Result<(), BuildError> { - self.builder_into_stack_graph(stack_graph, file, source) + self.builder_into_stack_graph(stack_graph, file, source, source_path, source_root) .build(globals, cancellation_flag) } @@ -573,8 +576,10 @@ impl StackGraphLanguage { stack_graph: &'a mut StackGraph, file: Handle, source: &'a str, + source_path: &'a Path, + source_root: &'a Path, ) -> Builder<'a> { - Builder::new(self, stack_graph, file, source) + Builder::new(self, stack_graph, file, source, source_path, source_root) } } @@ -583,6 +588,8 @@ pub struct Builder<'a> { stack_graph: &'a mut StackGraph, file: Handle, source: &'a str, + source_path: &'a Path, + source_root: &'a Path, graph: Graph<'a>, remapped_nodes: HashMap, injected_node_count: usize, @@ -595,6 +602,8 @@ impl<'a> Builder<'a> { stack_graph: &'a mut StackGraph, file: Handle, source: &'a str, + source_path: &'a Path, + source_root: &'a Path, ) -> Self { let span_calculator = SpanCalculator::new(source); Builder { @@ -602,6 +611,8 @@ impl<'a> Builder<'a> { stack_graph, file, source, + source_path, + source_root, graph: Graph::new(), remapped_nodes: HashMap::new(), injected_node_count: 0, @@ -635,23 +646,33 @@ impl<'a> Builder<'a> { let tree = parse_errors.into_tree(); let mut globals = Variables::nested(globals); + if globals.get(&ROOT_NODE_VAR.into()).is_none() { let root_node = self.inject_node(NodeID::root()); globals .add(ROOT_NODE_VAR.into(), root_node.into()) .expect("Failed to set ROOT_NODE"); } + let jump_to_scope_node = self.inject_node(NodeID::jump_to()); globals .add(JUMP_TO_SCOPE_NODE_VAR.into(), jump_to_scope_node.into()) .expect("Failed to set JUMP_TO_SCOPE_NODE"); + if globals.get(&FILE_PATH_VAR.into()).is_none() { - let file_name = self.stack_graph[self.file].to_string(); + let file_name = self.source_path.to_str().unwrap().to_string(); globals .add(FILE_PATH_VAR.into(), file_name.into()) .expect("Failed to set FILE_PATH"); } + if globals.get(&ROOT_PATH_VAR.into()).is_none() { + let root_path = self.source_root.to_str().unwrap().to_string(); + globals + .add(ROOT_PATH_VAR.into(), root_path.into()) + .expect("Failed to set ROOT_PATH"); + } + let mut config = ExecutionConfig::new(&self.sgl.functions, &globals) .lazy(true) .debug_attributes( diff --git a/tree-sitter-stack-graphs/src/loader.rs b/tree-sitter-stack-graphs/src/loader.rs index 9ffc1d674..ced44c2ed 100644 --- a/tree-sitter-stack-graphs/src/loader.rs +++ b/tree-sitter-stack-graphs/src/loader.rs @@ -79,10 +79,14 @@ impl LanguageConfiguration { Loader::load_globals_from_config_str(builtins_config, &mut builtins_globals)?; } let file = builtins.add_file("").unwrap(); + let builtins_path_var = Path::new(""); + let builtins_root = Path::new(""); sgl.build_stack_graph_into( &mut builtins, file, builtins_source, + builtins_path_var, + builtins_root, &builtins_globals, cancellation_flag, ) @@ -325,17 +329,28 @@ impl Loader { graph: &mut StackGraph, cancellation_flag: &dyn CancellationFlag, ) -> Result<(), LoadError<'a>> { - let file = graph.add_file(&path.to_string_lossy()).unwrap(); + let file_name = path.to_string_lossy(); + let file: stack_graphs::arena::Handle = + graph.add_file(&file_name).unwrap(); + let builtins_root = Path::new(""); let mut globals = Variables::new(); Self::load_globals_from_config_str(&config, &mut globals)?; - sgl.build_stack_graph_into(graph, file, &source, &globals, cancellation_flag) - .map_err(|err| LoadError::Builtins { - inner: err, - source_path: path.to_path_buf(), - source, - tsg_path: sgl.tsg_path.to_path_buf(), - tsg: sgl.tsg_source.clone(), - })?; + sgl.build_stack_graph_into( + graph, + file, + &source, + path, + builtins_root, + &globals, + cancellation_flag, + ) + .map_err(|err| LoadError::Builtins { + inner: err, + source_path: path.to_path_buf(), + source, + tsg_path: sgl.tsg_path.to_path_buf(), + tsg: sgl.tsg_source.clone(), + })?; return Ok(()); } diff --git a/tree-sitter-stack-graphs/src/test.rs b/tree-sitter-stack-graphs/src/test.rs index 236e254c5..554783b5f 100644 --- a/tree-sitter-stack-graphs/src/test.rs +++ b/tree-sitter-stack-graphs/src/test.rs @@ -157,6 +157,7 @@ pub struct Test { pub struct TestFragment { pub file: Handle, pub path: PathBuf, + pub root_path: PathBuf, pub source: String, pub assertions: Vec, pub globals: HashMap, @@ -180,6 +181,7 @@ impl Test { let mut prev_source = String::new(); let mut line_files = Vec::new(); let mut line_count = 0; + let default_root_path = PathBuf::from(""); for (current_line_number, current_line) in PositionedSubstring::lines_iter(source).enumerate() { @@ -202,6 +204,7 @@ impl Test { fragments.push(TestFragment { file, path: current_path, + root_path: default_root_path.clone(), source: current_source, assertions: Vec::new(), globals: current_globals, @@ -254,6 +257,7 @@ impl Test { fragments.push(TestFragment { file, path: current_path, + root_path: default_root_path.clone(), source: current_source, assertions: Vec::new(), globals: current_globals, diff --git a/tree-sitter-stack-graphs/tests/it/builder.rs b/tree-sitter-stack-graphs/tests/it/builder.rs index 661e8b973..31dc46994 100644 --- a/tree-sitter-stack-graphs/tests/it/builder.rs +++ b/tree-sitter-stack-graphs/tests/it/builder.rs @@ -5,6 +5,8 @@ // Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details. // ------------------------------------------------------------------------------------------------ +use std::path::Path; + use stack_graphs::graph::StackGraph; use tree_sitter_graph::Variables; use tree_sitter_stack_graphs::NoCancellation; @@ -22,15 +24,27 @@ fn can_support_preexisting_nodes() { "#; let python = "pass"; + let file_name = "test.py"; + let source_path = Path::new(file_name); + let source_root = Path::new(""); + let mut graph = StackGraph::new(); - let file = graph.get_or_create_file("test.py"); + let file = graph.get_or_create_file(file_name); let node_id = graph.new_node_id(file); let _preexisting_node = graph.add_scope_node(node_id, true).unwrap(); let globals = Variables::new(); let language = StackGraphLanguage::from_str(tree_sitter_python::language(), tsg).unwrap(); language - .build_stack_graph_into(&mut graph, file, python, &globals, &NoCancellation) + .build_stack_graph_into( + &mut graph, + file, + python, + source_path, + source_root, + &globals, + &NoCancellation, + ) .expect("Failed to build graph"); } @@ -45,13 +59,18 @@ fn can_support_injected_nodes() { "#; let python = "pass"; + let file_name = "test.py"; + let source_path = Path::new(file_name); + let source_root = Path::new(""); + let mut graph = StackGraph::new(); - let file = graph.get_or_create_file("test.py"); + let file = graph.get_or_create_file(file_name); let node_id = graph.new_node_id(file); let _preexisting_node = graph.add_scope_node(node_id, true).unwrap(); let language = StackGraphLanguage::from_str(tree_sitter_python::language(), tsg).unwrap(); - let mut builder = language.builder_into_stack_graph(&mut graph, file, python); + let mut builder = + language.builder_into_stack_graph(&mut graph, file, python, source_path, source_root); let mut globals = Variables::new(); globals diff --git a/tree-sitter-stack-graphs/tests/it/main.rs b/tree-sitter-stack-graphs/tests/it/main.rs index c1e37a40e..9d430bb73 100644 --- a/tree-sitter-stack-graphs/tests/it/main.rs +++ b/tree-sitter-stack-graphs/tests/it/main.rs @@ -5,6 +5,8 @@ // Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details. // ------------------------------------------------------------------------------------------------ +use std::path::Path; + use stack_graphs::arena::Handle; use stack_graphs::graph::File; use stack_graphs::graph::StackGraph; @@ -23,11 +25,22 @@ pub(self) fn build_stack_graph( python_source: &str, tsg_source: &str, ) -> Result<(StackGraph, Handle), BuildError> { + let file_name = "test.py"; + let source_path = Path::new(file_name); + let source_root = Path::new(""); let language = StackGraphLanguage::from_str(tree_sitter_python::language(), tsg_source).unwrap(); let mut graph = StackGraph::new(); - let file = graph.get_or_create_file("test.py"); + let file = graph.get_or_create_file(file_name); let globals = Variables::new(); - language.build_stack_graph_into(&mut graph, file, python_source, &globals, &NoCancellation)?; + language.build_stack_graph_into( + &mut graph, + file, + python_source, + source_path, + source_root, + &globals, + &NoCancellation, + )?; Ok((graph, file)) } diff --git a/tree-sitter-stack-graphs/tests/it/test.rs b/tree-sitter-stack-graphs/tests/it/test.rs index 98ec3ab96..89ae7b279 100644 --- a/tree-sitter-stack-graphs/tests/it/test.rs +++ b/tree-sitter-stack-graphs/tests/it/test.rs @@ -68,12 +68,22 @@ fn build_stack_graph_into( graph: &mut StackGraph, file: Handle, python_source: &str, + source_path: &Path, + source_root: &Path, tsg_source: &str, globals: &Variables, ) -> Result<(), BuildError> { let language = StackGraphLanguage::from_str(tree_sitter_python::language(), tsg_source).unwrap(); - language.build_stack_graph_into(graph, file, python_source, globals, &NoCancellation)?; + language.build_stack_graph_into( + graph, + file, + python_source, + source_path, + source_root, + globals, + &NoCancellation, + )?; Ok(()) } @@ -102,6 +112,8 @@ fn check_test( &mut test.graph, fragments.file, &fragments.source, + &fragments.path, + &fragments.root_path, tsg_source, &globals, ) From c43fa8b1af2a5ced2174059d41d4b0f2b8da3983 Mon Sep 17 00:00:00 2001 From: nohehf Date: Thu, 30 May 2024 11:36:09 +0200 Subject: [PATCH 164/202] feat: use replace instead of custom function --- .../src/stack-graphs.tsg | 2 +- tree-sitter-stack-graphs/src/functions.rs | 37 ------------------- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg index 7e6359280..b7478b4e4 100644 --- a/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg @@ -541,7 +541,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n ; module reference var mod_scope = mod_ref__ns ; normalize path and remove the extension as we want to match 'foo', 'foo.js', 'foo.ts', etc. - scan (path-remove-ext (path-normalize mod_path)) { + scan (path-normalize (replace mod_path "\.(js|ts|jsx|tsx)$" "")) { "([^/]+)/?" { node mod_ref attr (mod_ref) push_symbol = $1 diff --git a/tree-sitter-stack-graphs/src/functions.rs b/tree-sitter-stack-graphs/src/functions.rs index e1f9e94e5..9082ba427 100644 --- a/tree-sitter-stack-graphs/src/functions.rs +++ b/tree-sitter-stack-graphs/src/functions.rs @@ -43,10 +43,6 @@ pub mod path { path_fn(|p| normalize(p).map(|p| p.as_os_str().to_os_string())), ); functions.add("path-split".into(), PathSplit); - functions.add( - "path-remove-ext".into(), - path_fn(|p| remove_extension(p).map(|p| p.as_os_str().to_os_string())), - ); } pub fn path_fn(f: F) -> impl Function @@ -163,37 +159,4 @@ pub mod path { } Some(ret) } - - /// Removes the extension from a path. - /// eg. `foo/bar.rs` -> `foo/bar` - /// eg. `foo/bar` -> `foo/bar` - /// eg. `foo/bar.rs.bak` -> `foo/bar.rs` - pub fn remove_extension(path: &Path) -> Option { - path.extension() - .map_or(Some(path.into()), |_| path.with_extension("").into()) - } - - #[test] - fn test_remove_extension() { - assert_eq!( - remove_extension(Path::new("foo/bar.rs")), - Some(PathBuf::from("foo/bar")) - ); - assert_eq!( - remove_extension(Path::new("foo/bar")), - Some(PathBuf::from("foo/bar")) - ); - assert_eq!( - remove_extension(Path::new("foo/bar.rs.bak")), - Some(PathBuf::from("foo/bar.rs")) - ); - assert_eq!( - remove_extension(Path::new("foo")), - Some(PathBuf::from("foo")) - ); - assert_eq!( - remove_extension(Path::new("foo.rs")), - Some(PathBuf::from("foo")) - ); - } } From b3260536a1002743a9a393a64ce8fd33ca859b70 Mon Sep 17 00:00:00 2001 From: nohehf Date: Thu, 30 May 2024 12:17:15 +0200 Subject: [PATCH 165/202] feat: pass paths in globals --- .../src/stack-graphs.tsg | 2 +- tree-sitter-stack-graphs/src/cli/index.rs | 23 +++++----- tree-sitter-stack-graphs/src/cli/test.rs | 12 ++++- tree-sitter-stack-graphs/src/lib.rs | 31 +++---------- tree-sitter-stack-graphs/src/loader.rs | 44 ++++++++++--------- tree-sitter-stack-graphs/src/test.rs | 4 -- tree-sitter-stack-graphs/tests/it/builder.rs | 13 +----- tree-sitter-stack-graphs/tests/it/main.rs | 23 +++++----- tree-sitter-stack-graphs/tests/it/test.rs | 14 +----- 9 files changed, 66 insertions(+), 100 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg index 887e171b3..5fb407ae8 100644 --- a/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-python/src/stack-graphs.tsg @@ -13,7 +13,7 @@ ;; ^^^^^^^^^^^^^^^^ global FILE_PATH -global ROOT_PATH +global ROOT_PATH = "" global ROOT_NODE global JUMP_TO_SCOPE_NODE diff --git a/tree-sitter-stack-graphs/src/cli/index.rs b/tree-sitter-stack-graphs/src/cli/index.rs index 5bf48f54f..6425d8ca7 100644 --- a/tree-sitter-stack-graphs/src/cli/index.rs +++ b/tree-sitter-stack-graphs/src/cli/index.rs @@ -42,6 +42,7 @@ use crate::BuildError; use crate::CancelAfterDuration; use crate::CancellationFlag; use crate::NoCancellation; +use crate::{FILE_PATH_VAR, ROOT_PATH_VAR}; #[derive(Args)] pub struct IndexArgs { @@ -428,19 +429,19 @@ impl<'a> Indexer<'a> { cancellation_flag: &dyn CancellationFlag, ) -> std::result::Result<(), BuildErrorWithSource<'b>> { let relative_source_path = source_path.strip_prefix(source_root).unwrap(); - // here the file should also have stripped the source_root from its path if let Some(lc) = lcs.primary { - let globals = Variables::new(); + let mut globals = Variables::new(); + + globals + .add(FILE_PATH_VAR.into(), source_path.to_str().unwrap().into()) + .expect("failed to add file path variable"); + + globals + .add(ROOT_PATH_VAR.into(), source_root.to_str().unwrap().into()) + .expect("failed to add root path variable"); + lc.sgl - .build_stack_graph_into( - graph, - file, - source, - source_path, - source_root, - &globals, - cancellation_flag, - ) + .build_stack_graph_into(graph, file, source, &globals, cancellation_flag) .map_err(|inner| BuildErrorWithSource { inner, source_path: source_path.to_path_buf(), diff --git a/tree-sitter-stack-graphs/src/cli/test.rs b/tree-sitter-stack-graphs/src/cli/test.rs index 210d79947..6ae04114c 100644 --- a/tree-sitter-stack-graphs/src/cli/test.rs +++ b/tree-sitter-stack-graphs/src/cli/test.rs @@ -43,6 +43,7 @@ use crate::test::Test; use crate::test::TestResult; use crate::CancelAfterDuration; use crate::CancellationFlag; +use crate::FILE_PATH_VAR; #[derive(Args)] #[clap(after_help = r#"PATH SPECIFICATIONS: @@ -316,13 +317,20 @@ impl TestArgs { &mut Some(test_fragment.source.as_ref()), )? { globals.clear(); + + // Add FILE_PATH to variables + globals + .add( + FILE_PATH_VAR.into(), + test_fragment.path.to_str().unwrap().into(), + ) + .expect("failed to add file path variable"); + test_fragment.add_globals_to(&mut globals); lc.sgl.build_stack_graph_into( &mut test.graph, test_fragment.file, &test_fragment.source, - &test_fragment.path, - &test_fragment.root_path, &globals, cancellation_flag.as_ref(), ) diff --git a/tree-sitter-stack-graphs/src/lib.rs b/tree-sitter-stack-graphs/src/lib.rs index aee860420..8a02b0d58 100644 --- a/tree-sitter-stack-graphs/src/lib.rs +++ b/tree-sitter-stack-graphs/src/lib.rs @@ -558,12 +558,10 @@ impl StackGraphLanguage { stack_graph: &'a mut StackGraph, file: Handle, source: &'a str, - source_path: &Path, - source_root: &Path, globals: &'a Variables<'a>, cancellation_flag: &'a dyn CancellationFlag, ) -> Result<(), BuildError> { - self.builder_into_stack_graph(stack_graph, file, source, source_path, source_root) + self.builder_into_stack_graph(stack_graph, file, source) .build(globals, cancellation_flag) } @@ -576,10 +574,8 @@ impl StackGraphLanguage { stack_graph: &'a mut StackGraph, file: Handle, source: &'a str, - source_path: &'a Path, - source_root: &'a Path, ) -> Builder<'a> { - Builder::new(self, stack_graph, file, source, source_path, source_root) + Builder::new(self, stack_graph, file, source) } } @@ -588,8 +584,6 @@ pub struct Builder<'a> { stack_graph: &'a mut StackGraph, file: Handle, source: &'a str, - source_path: &'a Path, - source_root: &'a Path, graph: Graph<'a>, remapped_nodes: HashMap, injected_node_count: usize, @@ -602,8 +596,6 @@ impl<'a> Builder<'a> { stack_graph: &'a mut StackGraph, file: Handle, source: &'a str, - source_path: &'a Path, - source_root: &'a Path, ) -> Self { let span_calculator = SpanCalculator::new(source); Builder { @@ -611,8 +603,6 @@ impl<'a> Builder<'a> { stack_graph, file, source, - source_path, - source_root, graph: Graph::new(), remapped_nodes: HashMap::new(), injected_node_count: 0, @@ -659,19 +649,10 @@ impl<'a> Builder<'a> { .add(JUMP_TO_SCOPE_NODE_VAR.into(), jump_to_scope_node.into()) .expect("Failed to set JUMP_TO_SCOPE_NODE"); - if globals.get(&FILE_PATH_VAR.into()).is_none() { - let file_name = self.source_path.to_str().unwrap().to_string(); - globals - .add(FILE_PATH_VAR.into(), file_name.into()) - .expect("Failed to set FILE_PATH"); - } - - if globals.get(&ROOT_PATH_VAR.into()).is_none() { - let root_path = self.source_root.to_str().unwrap().to_string(); - globals - .add(ROOT_PATH_VAR.into(), root_path.into()) - .expect("Failed to set ROOT_PATH"); - } + // FILE_PATH is mandatory + globals + .get(&FILE_PATH_VAR.into()) + .expect("FILE_PATH not set"); let mut config = ExecutionConfig::new(&self.sgl.functions, &globals) .lazy(true) diff --git a/tree-sitter-stack-graphs/src/loader.rs b/tree-sitter-stack-graphs/src/loader.rs index ced44c2ed..b0d6d1875 100644 --- a/tree-sitter-stack-graphs/src/loader.rs +++ b/tree-sitter-stack-graphs/src/loader.rs @@ -29,6 +29,7 @@ use tree_sitter_loader::Loader as TsLoader; use crate::CancellationFlag; use crate::FileAnalyzer; use crate::StackGraphLanguage; +use crate::FILE_PATH_VAR; pub static DEFAULT_TSG_PATHS: Lazy> = Lazy::new(|| vec![LoadPath::Grammar("queries/stack-graphs".into())]); @@ -75,18 +76,23 @@ impl LanguageConfiguration { let mut builtins = StackGraph::new(); if let Some((builtins_path, builtins_source)) = builtins_source { let mut builtins_globals = Variables::new(); + + let builtins_path_var = Path::new(""); + builtins_globals + .add( + FILE_PATH_VAR.into(), + builtins_path_var.to_str().unwrap().into(), + ) + .expect("failed to add file path variable"); + if let Some(builtins_config) = builtins_config { Loader::load_globals_from_config_str(builtins_config, &mut builtins_globals)?; } let file = builtins.add_file("").unwrap(); - let builtins_path_var = Path::new(""); - let builtins_root = Path::new(""); sgl.build_stack_graph_into( &mut builtins, file, builtins_source, - builtins_path_var, - builtins_root, &builtins_globals, cancellation_flag, ) @@ -332,25 +338,21 @@ impl Loader { let file_name = path.to_string_lossy(); let file: stack_graphs::arena::Handle = graph.add_file(&file_name).unwrap(); - let builtins_root = Path::new(""); let mut globals = Variables::new(); + + globals + .add(FILE_PATH_VAR.into(), path.to_str().unwrap().into()) + .expect("failed to add file path variable"); + Self::load_globals_from_config_str(&config, &mut globals)?; - sgl.build_stack_graph_into( - graph, - file, - &source, - path, - builtins_root, - &globals, - cancellation_flag, - ) - .map_err(|err| LoadError::Builtins { - inner: err, - source_path: path.to_path_buf(), - source, - tsg_path: sgl.tsg_path.to_path_buf(), - tsg: sgl.tsg_source.clone(), - })?; + sgl.build_stack_graph_into(graph, file, &source, &globals, cancellation_flag) + .map_err(|err| LoadError::Builtins { + inner: err, + source_path: path.to_path_buf(), + source, + tsg_path: sgl.tsg_path.to_path_buf(), + tsg: sgl.tsg_source.clone(), + })?; return Ok(()); } diff --git a/tree-sitter-stack-graphs/src/test.rs b/tree-sitter-stack-graphs/src/test.rs index 554783b5f..236e254c5 100644 --- a/tree-sitter-stack-graphs/src/test.rs +++ b/tree-sitter-stack-graphs/src/test.rs @@ -157,7 +157,6 @@ pub struct Test { pub struct TestFragment { pub file: Handle, pub path: PathBuf, - pub root_path: PathBuf, pub source: String, pub assertions: Vec, pub globals: HashMap, @@ -181,7 +180,6 @@ impl Test { let mut prev_source = String::new(); let mut line_files = Vec::new(); let mut line_count = 0; - let default_root_path = PathBuf::from(""); for (current_line_number, current_line) in PositionedSubstring::lines_iter(source).enumerate() { @@ -204,7 +202,6 @@ impl Test { fragments.push(TestFragment { file, path: current_path, - root_path: default_root_path.clone(), source: current_source, assertions: Vec::new(), globals: current_globals, @@ -257,7 +254,6 @@ impl Test { fragments.push(TestFragment { file, path: current_path, - root_path: default_root_path.clone(), source: current_source, assertions: Vec::new(), globals: current_globals, diff --git a/tree-sitter-stack-graphs/tests/it/builder.rs b/tree-sitter-stack-graphs/tests/it/builder.rs index 31dc46994..a87b80559 100644 --- a/tree-sitter-stack-graphs/tests/it/builder.rs +++ b/tree-sitter-stack-graphs/tests/it/builder.rs @@ -36,15 +36,7 @@ fn can_support_preexisting_nodes() { let globals = Variables::new(); let language = StackGraphLanguage::from_str(tree_sitter_python::language(), tsg).unwrap(); language - .build_stack_graph_into( - &mut graph, - file, - python, - source_path, - source_root, - &globals, - &NoCancellation, - ) + .build_stack_graph_into(&mut graph, file, python, &globals, &NoCancellation) .expect("Failed to build graph"); } @@ -69,8 +61,7 @@ fn can_support_injected_nodes() { let _preexisting_node = graph.add_scope_node(node_id, true).unwrap(); let language = StackGraphLanguage::from_str(tree_sitter_python::language(), tsg).unwrap(); - let mut builder = - language.builder_into_stack_graph(&mut graph, file, python, source_path, source_root); + let mut builder = language.builder_into_stack_graph(&mut graph, file, python); let mut globals = Variables::new(); globals diff --git a/tree-sitter-stack-graphs/tests/it/main.rs b/tree-sitter-stack-graphs/tests/it/main.rs index 9d430bb73..687564e1e 100644 --- a/tree-sitter-stack-graphs/tests/it/main.rs +++ b/tree-sitter-stack-graphs/tests/it/main.rs @@ -15,6 +15,8 @@ use tree_sitter_stack_graphs::BuildError; use tree_sitter_stack_graphs::NoCancellation; use tree_sitter_stack_graphs::StackGraphLanguage; +static FILE_PATH_VAR: &'static str = "FILE_PATH"; + mod builder; mod edges; mod loader; @@ -26,21 +28,18 @@ pub(self) fn build_stack_graph( tsg_source: &str, ) -> Result<(StackGraph, Handle), BuildError> { let file_name = "test.py"; - let source_path = Path::new(file_name); - let source_root = Path::new(""); let language = StackGraphLanguage::from_str(tree_sitter_python::language(), tsg_source).unwrap(); let mut graph = StackGraph::new(); let file = graph.get_or_create_file(file_name); - let globals = Variables::new(); - language.build_stack_graph_into( - &mut graph, - file, - python_source, - source_path, - source_root, - &globals, - &NoCancellation, - )?; + let mut globals = Variables::new(); + let source_path = Path::new(file_name); + + // The FILE_PATH_VAR is not accessible here + globals + .add(FILE_PATH_VAR.into(), source_path.to_str().unwrap().into()) + .expect("failed to add file path variable"); + + language.build_stack_graph_into(&mut graph, file, python_source, &globals, &NoCancellation)?; Ok((graph, file)) } diff --git a/tree-sitter-stack-graphs/tests/it/test.rs b/tree-sitter-stack-graphs/tests/it/test.rs index 89ae7b279..98ec3ab96 100644 --- a/tree-sitter-stack-graphs/tests/it/test.rs +++ b/tree-sitter-stack-graphs/tests/it/test.rs @@ -68,22 +68,12 @@ fn build_stack_graph_into( graph: &mut StackGraph, file: Handle, python_source: &str, - source_path: &Path, - source_root: &Path, tsg_source: &str, globals: &Variables, ) -> Result<(), BuildError> { let language = StackGraphLanguage::from_str(tree_sitter_python::language(), tsg_source).unwrap(); - language.build_stack_graph_into( - graph, - file, - python_source, - source_path, - source_root, - globals, - &NoCancellation, - )?; + language.build_stack_graph_into(graph, file, python_source, globals, &NoCancellation)?; Ok(()) } @@ -112,8 +102,6 @@ fn check_test( &mut test.graph, fragments.file, &fragments.source, - &fragments.path, - &fragments.root_path, tsg_source, &globals, ) From 8a98dce32fee057bc4d754ebc85055fecbbda0a1 Mon Sep 17 00:00:00 2001 From: nohehf Date: Thu, 30 May 2024 12:33:37 +0200 Subject: [PATCH 166/202] fix: add missing paths --- tree-sitter-stack-graphs/tests/it/builder.rs | 15 ++++++++++----- tree-sitter-stack-graphs/tests/it/test.rs | 10 ++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/tree-sitter-stack-graphs/tests/it/builder.rs b/tree-sitter-stack-graphs/tests/it/builder.rs index a87b80559..b0dad5449 100644 --- a/tree-sitter-stack-graphs/tests/it/builder.rs +++ b/tree-sitter-stack-graphs/tests/it/builder.rs @@ -14,6 +14,7 @@ use tree_sitter_stack_graphs::StackGraphLanguage; use crate::edges::check_stack_graph_edges; use crate::nodes::check_stack_graph_nodes; +use crate::FILE_PATH_VAR; #[test] fn can_support_preexisting_nodes() { @@ -25,15 +26,17 @@ fn can_support_preexisting_nodes() { let python = "pass"; let file_name = "test.py"; - let source_path = Path::new(file_name); - let source_root = Path::new(""); let mut graph = StackGraph::new(); let file = graph.get_or_create_file(file_name); let node_id = graph.new_node_id(file); let _preexisting_node = graph.add_scope_node(node_id, true).unwrap(); - let globals = Variables::new(); + let mut globals = Variables::new(); + globals + .add(FILE_PATH_VAR.into(), file_name.into()) + .expect("failed to add file path variable"); + let language = StackGraphLanguage::from_str(tree_sitter_python::language(), tsg).unwrap(); language .build_stack_graph_into(&mut graph, file, python, &globals, &NoCancellation) @@ -52,8 +55,6 @@ fn can_support_injected_nodes() { let python = "pass"; let file_name = "test.py"; - let source_path = Path::new(file_name); - let source_root = Path::new(""); let mut graph = StackGraph::new(); let file = graph.get_or_create_file(file_name); @@ -64,6 +65,10 @@ fn can_support_injected_nodes() { let mut builder = language.builder_into_stack_graph(&mut graph, file, python); let mut globals = Variables::new(); + globals + .add(FILE_PATH_VAR.into(), file_name.into()) + .expect("failed to add file path variable"); + globals .add("EXT_NODE".into(), builder.inject_node(node_id).into()) .expect("Failed to add EXT_NODE variable"); diff --git a/tree-sitter-stack-graphs/tests/it/test.rs b/tree-sitter-stack-graphs/tests/it/test.rs index 98ec3ab96..9624439c5 100644 --- a/tree-sitter-stack-graphs/tests/it/test.rs +++ b/tree-sitter-stack-graphs/tests/it/test.rs @@ -5,6 +5,7 @@ // Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details. // ------------------------------------------------------------------------------------------------ +use crate::FILE_PATH_VAR; use once_cell::sync::Lazy; use pretty_assertions::assert_eq; use stack_graphs::arena::Handle; @@ -94,9 +95,18 @@ fn check_test( expected_successes + expected_failures, assertion_count, ); + let mut globals = Variables::new(); for fragments in &test.fragments { globals.clear(); + + globals + .add( + FILE_PATH_VAR.into(), + fragments.path.to_str().unwrap().into(), + ) + .expect("failed to add file path variable"); + fragments.add_globals_to(&mut globals); build_stack_graph_into( &mut test.graph, From ad4d517bf52b0615d7798f106e77bbd592ac694f Mon Sep 17 00:00:00 2001 From: nohehf Date: Sat, 1 Jun 2024 14:47:32 +0200 Subject: [PATCH 167/202] chore: clenup after review --- tree-sitter-stack-graphs/src/lib.rs | 19 ++++++++++--------- tree-sitter-stack-graphs/src/loader.rs | 12 +++++------- tree-sitter-stack-graphs/tests/it/builder.rs | 5 +---- tree-sitter-stack-graphs/tests/it/main.rs | 4 +--- 4 files changed, 17 insertions(+), 23 deletions(-) diff --git a/tree-sitter-stack-graphs/src/lib.rs b/tree-sitter-stack-graphs/src/lib.rs index 8a02b0d58..1a3e344b1 100644 --- a/tree-sitter-stack-graphs/src/lib.rs +++ b/tree-sitter-stack-graphs/src/lib.rs @@ -435,10 +435,16 @@ static SCOPE_ATTRS: Lazy> = static PRECEDENCE_ATTR: &'static str = "precedence"; // Global variables -static ROOT_NODE_VAR: &'static str = "ROOT_NODE"; -static JUMP_TO_SCOPE_NODE_VAR: &'static str = "JUMP_TO_SCOPE_NODE"; -static FILE_PATH_VAR: &'static str = "FILE_PATH"; -static ROOT_PATH_VAR: &'static str = "ROOT_PATH"; +/// Name of the variable used to pass the root node. +pub const ROOT_NODE_VAR: &'static str = "ROOT_NODE"; +/// Name of the variable used to pass the jump-to-scope node. +pub const JUMP_TO_SCOPE_NODE_VAR: &'static str = "JUMP_TO_SCOPE_NODE"; +/// Name of the variable used to pass the file path. +/// If a root path is given, it should be a descendant the root path. +pub const FILE_PATH_VAR: &'static str = "FILE_PATH"; +/// Name of the variable used to pass the root path. +/// If given, should be an ancestor of the file path. +pub const ROOT_PATH_VAR: &'static str = "ROOT_PATH"; /// Holds information about how to construct stack graphs for a particular language. pub struct StackGraphLanguage { @@ -649,11 +655,6 @@ impl<'a> Builder<'a> { .add(JUMP_TO_SCOPE_NODE_VAR.into(), jump_to_scope_node.into()) .expect("Failed to set JUMP_TO_SCOPE_NODE"); - // FILE_PATH is mandatory - globals - .get(&FILE_PATH_VAR.into()) - .expect("FILE_PATH not set"); - let mut config = ExecutionConfig::new(&self.sgl.functions, &globals) .lazy(true) .debug_attributes( diff --git a/tree-sitter-stack-graphs/src/loader.rs b/tree-sitter-stack-graphs/src/loader.rs index b0d6d1875..f0ab9891c 100644 --- a/tree-sitter-stack-graphs/src/loader.rs +++ b/tree-sitter-stack-graphs/src/loader.rs @@ -31,6 +31,8 @@ use crate::FileAnalyzer; use crate::StackGraphLanguage; use crate::FILE_PATH_VAR; +const BUILTINS_FILENAME: &str = ""; + pub static DEFAULT_TSG_PATHS: Lazy> = Lazy::new(|| vec![LoadPath::Grammar("queries/stack-graphs".into())]); pub static DEFAULT_BUILTINS_PATHS: Lazy> = @@ -77,18 +79,14 @@ impl LanguageConfiguration { if let Some((builtins_path, builtins_source)) = builtins_source { let mut builtins_globals = Variables::new(); - let builtins_path_var = Path::new(""); builtins_globals - .add( - FILE_PATH_VAR.into(), - builtins_path_var.to_str().unwrap().into(), - ) + .add(FILE_PATH_VAR.into(), BUILTINS_FILENAME.into()) .expect("failed to add file path variable"); if let Some(builtins_config) = builtins_config { Loader::load_globals_from_config_str(builtins_config, &mut builtins_globals)?; } - let file = builtins.add_file("").unwrap(); + let file = builtins.add_file(BUILTINS_FILENAME).unwrap(); sgl.build_stack_graph_into( &mut builtins, file, @@ -341,7 +339,7 @@ impl Loader { let mut globals = Variables::new(); globals - .add(FILE_PATH_VAR.into(), path.to_str().unwrap().into()) + .add(FILE_PATH_VAR.into(), BUILTINS_FILENAME.into()) .expect("failed to add file path variable"); Self::load_globals_from_config_str(&config, &mut globals)?; diff --git a/tree-sitter-stack-graphs/tests/it/builder.rs b/tree-sitter-stack-graphs/tests/it/builder.rs index b0dad5449..acc012eaa 100644 --- a/tree-sitter-stack-graphs/tests/it/builder.rs +++ b/tree-sitter-stack-graphs/tests/it/builder.rs @@ -4,17 +4,14 @@ // Licensed under either of Apache License, Version 2.0, or MIT license, at your option. // Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details. // ------------------------------------------------------------------------------------------------ - -use std::path::Path; - use stack_graphs::graph::StackGraph; use tree_sitter_graph::Variables; use tree_sitter_stack_graphs::NoCancellation; use tree_sitter_stack_graphs::StackGraphLanguage; +use tree_sitter_stack_graphs::FILE_PATH_VAR; use crate::edges::check_stack_graph_edges; use crate::nodes::check_stack_graph_nodes; -use crate::FILE_PATH_VAR; #[test] fn can_support_preexisting_nodes() { diff --git a/tree-sitter-stack-graphs/tests/it/main.rs b/tree-sitter-stack-graphs/tests/it/main.rs index 687564e1e..33ee19241 100644 --- a/tree-sitter-stack-graphs/tests/it/main.rs +++ b/tree-sitter-stack-graphs/tests/it/main.rs @@ -14,8 +14,7 @@ use tree_sitter_graph::Variables; use tree_sitter_stack_graphs::BuildError; use tree_sitter_stack_graphs::NoCancellation; use tree_sitter_stack_graphs::StackGraphLanguage; - -static FILE_PATH_VAR: &'static str = "FILE_PATH"; +use tree_sitter_stack_graphs::FILE_PATH_VAR; mod builder; mod edges; @@ -35,7 +34,6 @@ pub(self) fn build_stack_graph( let mut globals = Variables::new(); let source_path = Path::new(file_name); - // The FILE_PATH_VAR is not accessible here globals .add(FILE_PATH_VAR.into(), source_path.to_str().unwrap().into()) .expect("failed to add file path variable"); From 5ba472ab81783908360aaf3d1b8b15d2e2b85534 Mon Sep 17 00:00:00 2001 From: nohehf Date: Sat, 1 Jun 2024 23:31:00 +0200 Subject: [PATCH 168/202] style: style --- tree-sitter-stack-graphs/src/loader.rs | 3 +-- tree-sitter-stack-graphs/tests/it/builder.rs | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tree-sitter-stack-graphs/src/loader.rs b/tree-sitter-stack-graphs/src/loader.rs index f0ab9891c..e0e1d236d 100644 --- a/tree-sitter-stack-graphs/src/loader.rs +++ b/tree-sitter-stack-graphs/src/loader.rs @@ -334,8 +334,7 @@ impl Loader { cancellation_flag: &dyn CancellationFlag, ) -> Result<(), LoadError<'a>> { let file_name = path.to_string_lossy(); - let file: stack_graphs::arena::Handle = - graph.add_file(&file_name).unwrap(); + let file = graph.add_file(&file_name).unwrap(); let mut globals = Variables::new(); globals diff --git a/tree-sitter-stack-graphs/tests/it/builder.rs b/tree-sitter-stack-graphs/tests/it/builder.rs index acc012eaa..14476111e 100644 --- a/tree-sitter-stack-graphs/tests/it/builder.rs +++ b/tree-sitter-stack-graphs/tests/it/builder.rs @@ -4,6 +4,7 @@ // Licensed under either of Apache License, Version 2.0, or MIT license, at your option. // Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details. // ------------------------------------------------------------------------------------------------ + use stack_graphs::graph::StackGraph; use tree_sitter_graph::Variables; use tree_sitter_stack_graphs::NoCancellation; From ba1d3cd125520583a4e56f5e11c92e34f1f855cf Mon Sep 17 00:00:00 2001 From: nohehf Date: Sun, 2 Jun 2024 00:09:42 +0200 Subject: [PATCH 169/202] fix: conditionnaly load FILE_PATH --- tree-sitter-stack-graphs/src/loader.rs | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/tree-sitter-stack-graphs/src/loader.rs b/tree-sitter-stack-graphs/src/loader.rs index e0e1d236d..d382f72c9 100644 --- a/tree-sitter-stack-graphs/src/loader.rs +++ b/tree-sitter-stack-graphs/src/loader.rs @@ -79,13 +79,16 @@ impl LanguageConfiguration { if let Some((builtins_path, builtins_source)) = builtins_source { let mut builtins_globals = Variables::new(); - builtins_globals - .add(FILE_PATH_VAR.into(), BUILTINS_FILENAME.into()) - .expect("failed to add file path variable"); - if let Some(builtins_config) = builtins_config { Loader::load_globals_from_config_str(builtins_config, &mut builtins_globals)?; } + + if builtins_globals.get(&FILE_PATH_VAR.into()).is_some() { + builtins_globals + .add(FILE_PATH_VAR.into(), BUILTINS_FILENAME.into()) + .expect("failed to add file path variable"); + } + let file = builtins.add_file(BUILTINS_FILENAME).unwrap(); sgl.build_stack_graph_into( &mut builtins, @@ -337,11 +340,14 @@ impl Loader { let file = graph.add_file(&file_name).unwrap(); let mut globals = Variables::new(); - globals - .add(FILE_PATH_VAR.into(), BUILTINS_FILENAME.into()) - .expect("failed to add file path variable"); - Self::load_globals_from_config_str(&config, &mut globals)?; + + if globals.get(&FILE_PATH_VAR.into()).is_some() { + globals + .add(FILE_PATH_VAR.into(), BUILTINS_FILENAME.into()) + .expect("failed to add file path variable"); + } + sgl.build_stack_graph_into(graph, file, &source, &globals, cancellation_flag) .map_err(|err| LoadError::Builtins { inner: err, From a297647992b4a2f37e4aa11a3411039849d80a65 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Sun, 2 Jun 2024 11:31:51 +0200 Subject: [PATCH 170/202] Invert condition --- tree-sitter-stack-graphs/src/loader.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tree-sitter-stack-graphs/src/loader.rs b/tree-sitter-stack-graphs/src/loader.rs index d382f72c9..d03be0f93 100644 --- a/tree-sitter-stack-graphs/src/loader.rs +++ b/tree-sitter-stack-graphs/src/loader.rs @@ -83,7 +83,7 @@ impl LanguageConfiguration { Loader::load_globals_from_config_str(builtins_config, &mut builtins_globals)?; } - if builtins_globals.get(&FILE_PATH_VAR.into()).is_some() { + if builtins_globals.get(&FILE_PATH_VAR.into()).is_none() { builtins_globals .add(FILE_PATH_VAR.into(), BUILTINS_FILENAME.into()) .expect("failed to add file path variable"); From 6bcb5a3c3e39ed16db9ceaf2ae3eac03f4e337ce Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Sun, 2 Jun 2024 11:32:08 +0200 Subject: [PATCH 171/202] Invery condition --- tree-sitter-stack-graphs/src/loader.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tree-sitter-stack-graphs/src/loader.rs b/tree-sitter-stack-graphs/src/loader.rs index d03be0f93..977522528 100644 --- a/tree-sitter-stack-graphs/src/loader.rs +++ b/tree-sitter-stack-graphs/src/loader.rs @@ -342,7 +342,7 @@ impl Loader { Self::load_globals_from_config_str(&config, &mut globals)?; - if globals.get(&FILE_PATH_VAR.into()).is_some() { + if globals.get(&FILE_PATH_VAR.into()).is_none() { globals .add(FILE_PATH_VAR.into(), BUILTINS_FILENAME.into()) .expect("failed to add file path variable"); From c7f9fd9118b0642ae800d4c42237be577afa7d41 Mon Sep 17 00:00:00 2001 From: nohehf Date: Sun, 2 Jun 2024 16:34:44 +0200 Subject: [PATCH 172/202] fix: check that FILE_PATH variable is none everywhere --- tree-sitter-stack-graphs/src/cli/test.rs | 18 ++++++++++-------- tree-sitter-stack-graphs/tests/it/test.rs | 17 ++++++++++------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/tree-sitter-stack-graphs/src/cli/test.rs b/tree-sitter-stack-graphs/src/cli/test.rs index 6ae04114c..790a6c245 100644 --- a/tree-sitter-stack-graphs/src/cli/test.rs +++ b/tree-sitter-stack-graphs/src/cli/test.rs @@ -318,15 +318,17 @@ impl TestArgs { )? { globals.clear(); - // Add FILE_PATH to variables - globals - .add( - FILE_PATH_VAR.into(), - test_fragment.path.to_str().unwrap().into(), - ) - .expect("failed to add file path variable"); - test_fragment.add_globals_to(&mut globals); + + if globals.get(&FILE_PATH_VAR.into()).is_none() { + globals + .add( + FILE_PATH_VAR.into(), + test_fragment.path.to_str().unwrap().into(), + ) + .expect("failed to add file path variable"); + } + lc.sgl.build_stack_graph_into( &mut test.graph, test_fragment.file, diff --git a/tree-sitter-stack-graphs/tests/it/test.rs b/tree-sitter-stack-graphs/tests/it/test.rs index 9624439c5..4c630d57a 100644 --- a/tree-sitter-stack-graphs/tests/it/test.rs +++ b/tree-sitter-stack-graphs/tests/it/test.rs @@ -100,14 +100,17 @@ fn check_test( for fragments in &test.fragments { globals.clear(); - globals - .add( - FILE_PATH_VAR.into(), - fragments.path.to_str().unwrap().into(), - ) - .expect("failed to add file path variable"); - fragments.add_globals_to(&mut globals); + + if globals.get(&FILE_PATH_VAR.into()).is_none() { + globals + .add( + FILE_PATH_VAR.into(), + fragments.path.to_str().unwrap().into(), + ) + .expect("failed to add file path variable"); + } + build_stack_graph_into( &mut test.graph, fragments.file, From 20ad4befe1f8083ddcccf74e2e4b2fe261287fce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristia=CC=81n=20Arenas=20Ulloa?= Date: Fri, 28 Jun 2024 20:47:14 -0400 Subject: [PATCH 173/202] Update `tree-sitter-java` from `0.20.0` to `0.20.2` --- languages/tree-sitter-stack-graphs-java/Cargo.toml | 2 +- languages/tree-sitter-stack-graphs-java/src/stack-graphs.tsg | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-java/Cargo.toml b/languages/tree-sitter-stack-graphs-java/Cargo.toml index 13e9e7340..d50465aae 100644 --- a/languages/tree-sitter-stack-graphs-java/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-java/Cargo.toml @@ -40,7 +40,7 @@ cli = ["anyhow", "clap", "tree-sitter-stack-graphs/cli"] [dependencies] anyhow = { version = "1.0", optional = true } clap = { version = "4", features = ["derive"], optional = true } -tree-sitter-java = { version = "=0.20.0" } +tree-sitter-java = { version = "=0.20.2" } tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs" } [dev-dependencies] diff --git a/languages/tree-sitter-stack-graphs-java/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-java/src/stack-graphs.tsg index 5f3c72466..cfeab55de 100644 --- a/languages/tree-sitter-stack-graphs-java/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-java/src/stack-graphs.tsg @@ -1078,6 +1078,10 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @child.lexical_scope -> @expr.lexical_scope } +(condition (_) @child) @expr { + edge @child.lexical_scope -> @expr.lexical_scope +} + ;; ============= ;; Expressions ;; ============= @@ -1107,6 +1111,7 @@ attribute node_symbol = node => symbol = (source-text node), source_n (this) ; (identifier) (parenthesized_expression) + (condition) (object_creation_expression) (field_access) (array_access) From 14b7556df1353773cc04b8efa0c745ab8424e201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristia=CC=81n=20Arenas=20Ulloa?= Date: Mon, 1 Jul 2024 18:14:54 -0400 Subject: [PATCH 174/202] Update `tree-sitter-javascript` from `0.20.3` to `0.20.4` --- languages/tree-sitter-stack-graphs-javascript/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml index b56925c75..49dc9890d 100644 --- a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml @@ -32,7 +32,7 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" stack-graphs = { version = "0.13", path = "../../stack-graphs" } tree-sitter-graph = "0.11.2" -tree-sitter-javascript = "=0.20.3" +tree-sitter-javascript = "=0.20.4" tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs" } [dev-dependencies] From f715ed1ba214cc91bbfb3da8a0fc8650635db264 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Tue, 9 Jul 2024 15:09:05 +0200 Subject: [PATCH 175/202] Release stack-graphs v0.14.0 --- languages/tree-sitter-stack-graphs-javascript/Cargo.toml | 2 +- languages/tree-sitter-stack-graphs-typescript/Cargo.toml | 2 +- stack-graphs/CHANGELOG.md | 6 ++++++ stack-graphs/Cargo.toml | 2 +- stack-graphs/README.md | 2 +- tree-sitter-stack-graphs/Cargo.toml | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml index 49dc9890d..07c21edb8 100644 --- a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml @@ -30,7 +30,7 @@ anyhow = { version = "1.0", optional = true } clap = { version = "4", optional = true } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -stack-graphs = { version = "0.13", path = "../../stack-graphs" } +stack-graphs = { path = "../../stack-graphs" } tree-sitter-graph = "0.11.2" tree-sitter-javascript = "=0.20.4" tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs" } diff --git a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml index e40c12625..988007874 100644 --- a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml @@ -32,7 +32,7 @@ clap = { version = "4", optional = true } glob = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -stack-graphs = { version = "0.13", path = "../../stack-graphs" } +stack-graphs = { path = "../../stack-graphs" } tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs" } tree-sitter-typescript = "=0.20.2" tsconfig = "0.1.0" diff --git a/stack-graphs/CHANGELOG.md b/stack-graphs/CHANGELOG.md index fa051176d..eeaae0730 100644 --- a/stack-graphs/CHANGELOG.md +++ b/stack-graphs/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.14.0 -- 2024-07-09 + +### Changed + +- The method `StackGraph::add_from_graph` returns the handles of the newly added files. + ## v0.13.0 -- 2024-03-06 ### Added diff --git a/stack-graphs/Cargo.toml b/stack-graphs/Cargo.toml index 2e40b76eb..354adaa2b 100644 --- a/stack-graphs/Cargo.toml +++ b/stack-graphs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "stack-graphs" -version = "0.13.0" +version = "0.14.0" description = "Name binding for arbitrary programming languages" homepage = "https://github.com/github/stack-graphs/tree/main/stack-graphs" repository = "https://github.com/github/stack-graphs/" diff --git a/stack-graphs/README.md b/stack-graphs/README.md index 0c6a9e878..69efa5bd8 100644 --- a/stack-graphs/README.md +++ b/stack-graphs/README.md @@ -9,7 +9,7 @@ To use this library, add the following to your `Cargo.toml`: ``` toml [dependencies] -stack-graphs = "0.13" +stack-graphs = "0.14" ``` Check out our [documentation](https://docs.rs/stack-graphs/) for more details on diff --git a/tree-sitter-stack-graphs/Cargo.toml b/tree-sitter-stack-graphs/Cargo.toml index d1b0fc1c6..ed6fb44e0 100644 --- a/tree-sitter-stack-graphs/Cargo.toml +++ b/tree-sitter-stack-graphs/Cargo.toml @@ -69,7 +69,7 @@ regex = "1" rust-ini = "0.18" serde_json = { version="1.0", optional=true } sha1 = { version="0.10", optional=true } -stack-graphs = { version="0.13", path="../stack-graphs" } +stack-graphs = { path="../stack-graphs" } thiserror = "1.0" time = { version = "0.3", optional = true } tokio = { version = "1.26", optional = true, features = ["io-std", "rt", "rt-multi-thread"] } From 106c728e1da798e410e999473c4e02cf3e5f9d1d Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Tue, 9 Jul 2024 15:47:20 +0200 Subject: [PATCH 176/202] Release tree-sitter-stack-graphs v0.9.0 Includes a bit of code cleanup. --- .../tree-sitter-stack-graphs-java/Cargo.toml | 4 +-- .../tree-sitter-stack-graphs-java/rust/lib.rs | 2 -- .../Cargo.toml | 4 +-- .../rust/lib.rs | 3 +- .../Cargo.toml | 4 +-- .../rust/lib.rs | 3 -- .../Cargo.toml | 4 +-- .../rust/lib.rs | 2 -- tree-sitter-stack-graphs/CHANGELOG.md | 13 +++++++- tree-sitter-stack-graphs/Cargo.toml | 2 +- tree-sitter-stack-graphs/README.md | 2 +- tree-sitter-stack-graphs/npm/.gitignore | 4 --- tree-sitter-stack-graphs/npm/README.md | 13 -------- tree-sitter-stack-graphs/npm/cli.js | 15 ---------- tree-sitter-stack-graphs/npm/install.js | 30 ------------------- tree-sitter-stack-graphs/npm/package.json | 26 ---------------- tree-sitter-stack-graphs/src/cli/init.rs | 3 -- tree-sitter-stack-graphs/src/cli/test.rs | 14 ++++----- tree-sitter-stack-graphs/src/lib.rs | 12 ++++---- tree-sitter-stack-graphs/src/loader.rs | 16 ++++------ tree-sitter-stack-graphs/tests/it/test.rs | 14 ++++----- 21 files changed, 46 insertions(+), 144 deletions(-) delete mode 100644 tree-sitter-stack-graphs/npm/.gitignore delete mode 100644 tree-sitter-stack-graphs/npm/README.md delete mode 100755 tree-sitter-stack-graphs/npm/cli.js delete mode 100644 tree-sitter-stack-graphs/npm/install.js delete mode 100644 tree-sitter-stack-graphs/npm/package.json diff --git a/languages/tree-sitter-stack-graphs-java/Cargo.toml b/languages/tree-sitter-stack-graphs-java/Cargo.toml index d50465aae..21a856760 100644 --- a/languages/tree-sitter-stack-graphs-java/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-java/Cargo.toml @@ -41,8 +41,8 @@ cli = ["anyhow", "clap", "tree-sitter-stack-graphs/cli"] anyhow = { version = "1.0", optional = true } clap = { version = "4", features = ["derive"], optional = true } tree-sitter-java = { version = "=0.20.2" } -tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs" } +tree-sitter-stack-graphs = { path = "../../tree-sitter-stack-graphs" } [dev-dependencies] anyhow = { version = "1.0" } -tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs", features = ["cli"] } +tree-sitter-stack-graphs = { path = "../../tree-sitter-stack-graphs", features = ["cli"] } diff --git a/languages/tree-sitter-stack-graphs-java/rust/lib.rs b/languages/tree-sitter-stack-graphs-java/rust/lib.rs index 942785044..14016b614 100644 --- a/languages/tree-sitter-stack-graphs-java/rust/lib.rs +++ b/languages/tree-sitter-stack-graphs-java/rust/lib.rs @@ -14,8 +14,6 @@ pub const STACK_GRAPHS_BUILTINS_PATH: &str = "src/builtins.java"; /// The stack graphs builtins source for this language. pub const STACK_GRAPHS_BUILTINS_SOURCE: &str = include_str!("../src/builtins.java"); -/// The name of the file path global variable -pub const FILE_PATH_VAR: &str = "FILE_PATH"; /// The name of the project name global variable pub const PROJECT_NAME_VAR: &str = "PROJECT_NAME"; diff --git a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml index 07c21edb8..6593327f6 100644 --- a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml @@ -33,8 +33,8 @@ serde_json = "1.0" stack-graphs = { path = "../../stack-graphs" } tree-sitter-graph = "0.11.2" tree-sitter-javascript = "=0.20.4" -tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs" } +tree-sitter-stack-graphs = { path = "../../tree-sitter-stack-graphs" } [dev-dependencies] anyhow = "1.0" -tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs", features = ["cli"] } +tree-sitter-stack-graphs = { path = "../../tree-sitter-stack-graphs", features = ["cli"] } diff --git a/languages/tree-sitter-stack-graphs-javascript/rust/lib.rs b/languages/tree-sitter-stack-graphs-javascript/rust/lib.rs index 61f113149..718db8a2e 100644 --- a/languages/tree-sitter-stack-graphs-javascript/rust/lib.rs +++ b/languages/tree-sitter-stack-graphs-javascript/rust/lib.rs @@ -26,8 +26,7 @@ pub const STACK_GRAPHS_BUILTINS_PATH: &str = "src/builtins.js"; /// The stack graphs builtins source for this language. pub const STACK_GRAPHS_BUILTINS_SOURCE: &str = include_str!("../src/builtins.js"); -/// The name of the file path global variable. -pub const FILE_PATH_VAR: &str = "FILE_PATH"; +/// The name of the project name global variable pub const PROJECT_NAME_VAR: &str = "PROJECT_NAME"; pub fn language_configuration(cancellation_flag: &dyn CancellationFlag) -> LanguageConfiguration { diff --git a/languages/tree-sitter-stack-graphs-python/Cargo.toml b/languages/tree-sitter-stack-graphs-python/Cargo.toml index 17cfa3d72..b57c039a8 100644 --- a/languages/tree-sitter-stack-graphs-python/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-python/Cargo.toml @@ -30,9 +30,9 @@ cli = ["anyhow", "clap", "tree-sitter-stack-graphs/cli"] [dependencies] anyhow = { version = "1.0", optional = true } clap = { version = "4", optional = true, features = ["derive"] } -tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs" } +tree-sitter-stack-graphs = { path = "../../tree-sitter-stack-graphs" } tree-sitter-python = "=0.20.4" [dev-dependencies] anyhow = "1.0" -tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs", features = ["cli"] } +tree-sitter-stack-graphs = { path = "../../tree-sitter-stack-graphs", features = ["cli"] } diff --git a/languages/tree-sitter-stack-graphs-python/rust/lib.rs b/languages/tree-sitter-stack-graphs-python/rust/lib.rs index 74176a475..e0ffb40ec 100644 --- a/languages/tree-sitter-stack-graphs-python/rust/lib.rs +++ b/languages/tree-sitter-stack-graphs-python/rust/lib.rs @@ -21,9 +21,6 @@ pub const STACK_GRAPHS_BUILTINS_PATH: &str = "src/builtins.py"; /// The stack graphs builtins source for this language. pub const STACK_GRAPHS_BUILTINS_SOURCE: &str = include_str!("../src/builtins.py"); -/// The name of the file path global variable. -pub const FILE_PATH_VAR: &str = "FILE_PATH"; - pub fn language_configuration(cancellation_flag: &dyn CancellationFlag) -> LanguageConfiguration { try_language_configuration(cancellation_flag).unwrap_or_else(|err| panic!("{}", err)) } diff --git a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml index 988007874..1d7df3dbc 100644 --- a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml @@ -33,13 +33,13 @@ glob = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" stack-graphs = { path = "../../stack-graphs" } -tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs" } +tree-sitter-stack-graphs = { path = "../../tree-sitter-stack-graphs" } tree-sitter-typescript = "=0.20.2" tsconfig = "0.1.0" [dev-dependencies] anyhow = { version = "1.0" } -tree-sitter-stack-graphs = { version = "0.8", path = "../../tree-sitter-stack-graphs", features = ["cli"] } +tree-sitter-stack-graphs = { path = "../../tree-sitter-stack-graphs", features = ["cli"] } [build-dependencies] anyhow = { version = "1.0" } diff --git a/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs b/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs index 396fbc68b..2fa484a0a 100644 --- a/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs +++ b/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs @@ -31,8 +31,6 @@ pub const STACK_GRAPHS_BUILTINS_PATH: &str = "src/builtins.ts"; /// The stack graphs builtins source for this language pub const STACK_GRAPHS_BUILTINS_SOURCE: &str = include_str!("../src/builtins.ts"); -/// The name of the file path global variable -pub const FILE_PATH_VAR: &str = "FILE_PATH"; /// The name of the project name global variable pub const PROJECT_NAME_VAR: &str = "PROJECT_NAME"; diff --git a/tree-sitter-stack-graphs/CHANGELOG.md b/tree-sitter-stack-graphs/CHANGELOG.md index e7538592a..faa61295a 100644 --- a/tree-sitter-stack-graphs/CHANGELOG.md +++ b/tree-sitter-stack-graphs/CHANGELOG.md @@ -5,18 +5,29 @@ 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.8.2 -- unreleased +## v0.9.0 -- 2024-07-09 + + +### Library + +- New crate-level constants `FILE_PATH_VAR` and `ROOT_PATH_VAR` standardize the TSG global variable names to use for the file and root path. +- The file path variable will only use the filename set in the stack graph if no value was explicitly set. ### CLI #### Added - Tests run faster for languages with builtins sources by caching the partial paths for the builtins. +- Indexing will set a value for the root path variable that is passed to TSG. The value is based on the directory that was provided on the command line. #### Changed - Failure to index a file will not abort indexing anymore, but simply mark the file as failed, as we already do for files with parse errors. +#### Removed + +- The NPM distribution has been deprecated. + ## v0.8.1 -- 2024-03-06 The `stack-graphs` dependency was updated to `v0.13` to fix the build problems of the `v0.8.0` release. diff --git a/tree-sitter-stack-graphs/Cargo.toml b/tree-sitter-stack-graphs/Cargo.toml index ed6fb44e0..327ff4d47 100644 --- a/tree-sitter-stack-graphs/Cargo.toml +++ b/tree-sitter-stack-graphs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tree-sitter-stack-graphs" -version = "0.8.2" +version = "0.9.0" description = "Create stack graphs using tree-sitter parsers" homepage = "https://github.com/github/stack-graphs/tree/main/tree-sitter-stack-graphs" repository = "https://github.com/github/stack-graphs/" diff --git a/tree-sitter-stack-graphs/README.md b/tree-sitter-stack-graphs/README.md index ad1287ad5..a4e52add3 100644 --- a/tree-sitter-stack-graphs/README.md +++ b/tree-sitter-stack-graphs/README.md @@ -14,7 +14,7 @@ To use this library, add the following to your `Cargo.toml`: ```toml [dependencies] -tree-sitter-stack-graphs = "0.8" +tree-sitter-stack-graphs = "0.9" ``` Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs/*/) for more details on how to use this library. diff --git a/tree-sitter-stack-graphs/npm/.gitignore b/tree-sitter-stack-graphs/npm/.gitignore deleted file mode 100644 index 02b3615e1..000000000 --- a/tree-sitter-stack-graphs/npm/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/.crates.toml -/.crates2.json -/bin/ -/package-lock.json diff --git a/tree-sitter-stack-graphs/npm/README.md b/tree-sitter-stack-graphs/npm/README.md deleted file mode 100644 index 27dd321be..000000000 --- a/tree-sitter-stack-graphs/npm/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# tree-sitter-stack-graphs - -This package provides a convenient way to install the [tree-sitter-stack-graphs](https://crates.io/crates/tree-sitter-stack-graphs) CLI in an NPM project. - -Add it as a dev dependency to an existing project using: - - npm i -D tree-sitter-stack-graphs - -It is also possible to invoke it directly using: - - npx tree-sitter-stack-graphs - -See the tree-sitter-stack-graphs [documentation](https://crates.io/crates/tree-sitter-stack-graphs) for details on usage. diff --git a/tree-sitter-stack-graphs/npm/cli.js b/tree-sitter-stack-graphs/npm/cli.js deleted file mode 100755 index f4d654e15..000000000 --- a/tree-sitter-stack-graphs/npm/cli.js +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env node - -const spawn = require("child_process").spawn; -const path = require("path"); - -const tssg = process.platform === "win32" - ? "tree-sitter-stack-graphs.exe" - : "tree-sitter-stack-graphs"; - -spawn( - path.join(__dirname, "bin", tssg), process.argv.slice(2), - { - "stdio": "inherit" - }, -).on('close', process.exit); diff --git a/tree-sitter-stack-graphs/npm/install.js b/tree-sitter-stack-graphs/npm/install.js deleted file mode 100644 index 6ac20756b..000000000 --- a/tree-sitter-stack-graphs/npm/install.js +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env node - -const child_process = require("child_process"); -const packageJSON = require("./package.json"); - -const cargo = process.platform === "win32" - ? "cargo.exe" - : "cargo"; - -try { - child_process.execSync(cargo); -} catch (error) { - console.error(error.message); - console.error("Failed to execute Cargo. Cargo needs to be available to install this package!"); - process.exit(1); -} - -child_process.spawn( - cargo, [ - "install", - "--quiet", - "--root", ".", - "--version", "^"+packageJSON.version, - "--features", "cli", - packageJSON.name, - ], - { - "stdio": "inherit" - }, -).on('close', process.exit); diff --git a/tree-sitter-stack-graphs/npm/package.json b/tree-sitter-stack-graphs/npm/package.json deleted file mode 100644 index a49ec5fad..000000000 --- a/tree-sitter-stack-graphs/npm/package.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "tree-sitter-stack-graphs", - "version": "0.7.0", - "description": "Create stack graphs using tree-sitter parsers", - "homepage": "https://github.com/github/stack-graphs/tree/main/tree-sitter-stack-graphs", - "repository": { - "type": "git", - "url": "https://github.com/github/stack-graphs.git" - }, - "keywords": [ - "tree-sitter", - "stack-graphs" - ], - "license": "MIT OR Apache-2.0", - "author": "GitHub ", - "contributors": [ - "Douglas Creager ", - "Hendrik van Antwerpen " - ], - "bin": { - "tree-sitter-stack-graphs": "./cli.js" - }, - "scripts": { - "install": "node install.js" - } -} diff --git a/tree-sitter-stack-graphs/src/cli/init.rs b/tree-sitter-stack-graphs/src/cli/init.rs index df18339aa..f71890390 100644 --- a/tree-sitter-stack-graphs/src/cli/init.rs +++ b/tree-sitter-stack-graphs/src/cli/init.rs @@ -770,9 +770,6 @@ impl ProjectSettings<'_> { /// The stack graphs builtins source for this language. pub const STACK_GRAPHS_BUILTINS_SOURCE: &str = include_str!("../src/builtins.{}"); - /// The name of the file path global variable. - pub const FILE_PATH_VAR: &str = "FILE_PATH"; - pub fn language_configuration(cancellation_flag: &dyn CancellationFlag) -> LanguageConfiguration {{ try_language_configuration(cancellation_flag).unwrap_or_else(|err| panic!("{{}}", err)) }} diff --git a/tree-sitter-stack-graphs/src/cli/test.rs b/tree-sitter-stack-graphs/src/cli/test.rs index 790a6c245..1bff78a48 100644 --- a/tree-sitter-stack-graphs/src/cli/test.rs +++ b/tree-sitter-stack-graphs/src/cli/test.rs @@ -320,14 +320,12 @@ impl TestArgs { test_fragment.add_globals_to(&mut globals); - if globals.get(&FILE_PATH_VAR.into()).is_none() { - globals - .add( - FILE_PATH_VAR.into(), - test_fragment.path.to_str().unwrap().into(), - ) - .expect("failed to add file path variable"); - } + globals + .add( + FILE_PATH_VAR.into(), + test_fragment.path.to_str().unwrap().into(), + ) + .unwrap_or_default(); lc.sgl.build_stack_graph_into( &mut test.graph, diff --git a/tree-sitter-stack-graphs/src/lib.rs b/tree-sitter-stack-graphs/src/lib.rs index 1a3e344b1..717214832 100644 --- a/tree-sitter-stack-graphs/src/lib.rs +++ b/tree-sitter-stack-graphs/src/lib.rs @@ -440,7 +440,7 @@ pub const ROOT_NODE_VAR: &'static str = "ROOT_NODE"; /// Name of the variable used to pass the jump-to-scope node. pub const JUMP_TO_SCOPE_NODE_VAR: &'static str = "JUMP_TO_SCOPE_NODE"; /// Name of the variable used to pass the file path. -/// If a root path is given, it should be a descendant the root path. +/// If a root path is given, it should be a descendant of the root path. pub const FILE_PATH_VAR: &'static str = "FILE_PATH"; /// Name of the variable used to pass the root path. /// If given, should be an ancestor of the file path. @@ -643,12 +643,10 @@ impl<'a> Builder<'a> { let mut globals = Variables::nested(globals); - if globals.get(&ROOT_NODE_VAR.into()).is_none() { - let root_node = self.inject_node(NodeID::root()); - globals - .add(ROOT_NODE_VAR.into(), root_node.into()) - .expect("Failed to set ROOT_NODE"); - } + let root_node = self.inject_node(NodeID::root()); + globals + .add(ROOT_NODE_VAR.into(), root_node.into()) + .unwrap_or_default(); let jump_to_scope_node = self.inject_node(NodeID::jump_to()); globals diff --git a/tree-sitter-stack-graphs/src/loader.rs b/tree-sitter-stack-graphs/src/loader.rs index 977522528..14aa97916 100644 --- a/tree-sitter-stack-graphs/src/loader.rs +++ b/tree-sitter-stack-graphs/src/loader.rs @@ -83,11 +83,9 @@ impl LanguageConfiguration { Loader::load_globals_from_config_str(builtins_config, &mut builtins_globals)?; } - if builtins_globals.get(&FILE_PATH_VAR.into()).is_none() { - builtins_globals - .add(FILE_PATH_VAR.into(), BUILTINS_FILENAME.into()) - .expect("failed to add file path variable"); - } + builtins_globals + .add(FILE_PATH_VAR.into(), BUILTINS_FILENAME.into()) + .unwrap_or_default(); let file = builtins.add_file(BUILTINS_FILENAME).unwrap(); sgl.build_stack_graph_into( @@ -342,11 +340,9 @@ impl Loader { Self::load_globals_from_config_str(&config, &mut globals)?; - if globals.get(&FILE_PATH_VAR.into()).is_none() { - globals - .add(FILE_PATH_VAR.into(), BUILTINS_FILENAME.into()) - .expect("failed to add file path variable"); - } + globals + .add(FILE_PATH_VAR.into(), BUILTINS_FILENAME.into()) + .unwrap_or_default(); sgl.build_stack_graph_into(graph, file, &source, &globals, cancellation_flag) .map_err(|err| LoadError::Builtins { diff --git a/tree-sitter-stack-graphs/tests/it/test.rs b/tree-sitter-stack-graphs/tests/it/test.rs index 4c630d57a..cb1efff4f 100644 --- a/tree-sitter-stack-graphs/tests/it/test.rs +++ b/tree-sitter-stack-graphs/tests/it/test.rs @@ -102,14 +102,12 @@ fn check_test( fragments.add_globals_to(&mut globals); - if globals.get(&FILE_PATH_VAR.into()).is_none() { - globals - .add( - FILE_PATH_VAR.into(), - fragments.path.to_str().unwrap().into(), - ) - .expect("failed to add file path variable"); - } + globals + .add( + FILE_PATH_VAR.into(), + fragments.path.to_str().unwrap().into(), + ) + .unwrap_or_default(); build_stack_graph_into( &mut test.graph, From aff01c50c3d30162004f513573b646b889889fce Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Tue, 9 Jul 2024 16:09:19 +0200 Subject: [PATCH 177/202] Release languages - tree-sitter-stack-graphs-java v0.4.0 - tree-sitter-stack-graphs-javascript v0.2.0 - tree-sitter-stack-graphs-python v0.2.0 - tree-sitter-stack-graphs-typescript v0.3.0 --- .../tree-sitter-stack-graphs-java/CHANGELOG.md | 10 ++++++++++ .../tree-sitter-stack-graphs-java/Cargo.toml | 2 +- .../tree-sitter-stack-graphs-java/README.md | 2 +- .../CHANGELOG.md | 6 ++++++ .../Cargo.toml | 2 +- .../README.md | 2 +- .../tree-sitter-stack-graphs-python/CHANGELOG.md | 15 +++++++++++++++ .../tree-sitter-stack-graphs-python/Cargo.toml | 2 +- .../tree-sitter-stack-graphs-python/LICENSE | 0 .../tree-sitter-stack-graphs-python/README.md | 2 +- .../CHANGELOG.md | 16 ++++++++++++++-- .../README.md | 2 +- 12 files changed, 52 insertions(+), 9 deletions(-) delete mode 100644 languages/tree-sitter-stack-graphs-python/LICENSE diff --git a/languages/tree-sitter-stack-graphs-java/CHANGELOG.md b/languages/tree-sitter-stack-graphs-java/CHANGELOG.md index 0f3a4b861..5691a4985 100644 --- a/languages/tree-sitter-stack-graphs-java/CHANGELOG.md +++ b/languages/tree-sitter-stack-graphs-java/CHANGELOG.md @@ -5,6 +5,16 @@ 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.4.0 -- 2024-07-09 + +### Added + +- Add rules for the `condition` node that was missing. + +### Removed + +- The `FILE_PATH_VAR` constant has been replaced in favor of `tree_sitter_stack_graphs::FILE_PATH_VAR`. + ## v0.3.0 -- 2024-03-06 The `tree-sitter-stack-graphs` is updated to `v0.8`. diff --git a/languages/tree-sitter-stack-graphs-java/Cargo.toml b/languages/tree-sitter-stack-graphs-java/Cargo.toml index 21a856760..27534ef88 100644 --- a/languages/tree-sitter-stack-graphs-java/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-java/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tree-sitter-stack-graphs-java" -version = "0.3.0" +version = "0.4.0" description = "Stack graphs for the Java programming language" homepage = "https://github.com/github/stack-graphs/tree/main/languages/tree-sitter-stack-graphs-java" diff --git a/languages/tree-sitter-stack-graphs-java/README.md b/languages/tree-sitter-stack-graphs-java/README.md index cf16b7dab..69d276118 100644 --- a/languages/tree-sitter-stack-graphs-java/README.md +++ b/languages/tree-sitter-stack-graphs-java/README.md @@ -13,7 +13,7 @@ To use this library, add the following to your `Cargo.toml`: ```toml [dependencies] -tree-sitter-stack-graphs-java = "0.3" +tree-sitter-stack-graphs-java = "0.4" ``` Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs-java/*/) for more details on how to use this library. diff --git a/languages/tree-sitter-stack-graphs-javascript/CHANGELOG.md b/languages/tree-sitter-stack-graphs-javascript/CHANGELOG.md index 2ba28c310..19730aeab 100644 --- a/languages/tree-sitter-stack-graphs-javascript/CHANGELOG.md +++ b/languages/tree-sitter-stack-graphs-javascript/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.2.0 -- 2024-07-09 + +### Removed + +- The `FILE_PATH_VAR` constant has been replaced in favor of `tree_sitter_stack_graphs::FILE_PATH_VAR`. + ## v0.1.0 -- 2024-03-06 Initial release. diff --git a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml index 6593327f6..a4344c0f3 100644 --- a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tree-sitter-stack-graphs-javascript" -version = "0.1.0" +version = "0.2.0" description = "Stack graphs definition for JavaScript using tree-sitter-javascript" readme = "README.md" keywords = ["tree-sitter", "stack-graphs", "javascript"] diff --git a/languages/tree-sitter-stack-graphs-javascript/README.md b/languages/tree-sitter-stack-graphs-javascript/README.md index 04317fbd0..099e633e9 100644 --- a/languages/tree-sitter-stack-graphs-javascript/README.md +++ b/languages/tree-sitter-stack-graphs-javascript/README.md @@ -13,7 +13,7 @@ To use this library, add the following to your `Cargo.toml`: ```toml [dependencies] -tree-sitter-stack-graphs-javascript = "0.1" +tree-sitter-stack-graphs-javascript = "0.2" ``` Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs-javascript/*/) for more details on how to use this library. diff --git a/languages/tree-sitter-stack-graphs-python/CHANGELOG.md b/languages/tree-sitter-stack-graphs-python/CHANGELOG.md index 876b16cb9..61e6ca4e9 100644 --- a/languages/tree-sitter-stack-graphs-python/CHANGELOG.md +++ b/languages/tree-sitter-stack-graphs-python/CHANGELOG.md @@ -5,6 +5,21 @@ 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.2.0 -- 2024-07-09 + +### Added + +- Added support for root paths. This fixes import problems when indexing using absolute directory paths. + +### Fixed + +- Fixed crash for lambdas with parameters. +- Fixed crash for nested functions definitions. + +### Removed + +- The `FILE_PATH_VAR` constant has been replaced in favor of `tree_sitter_stack_graphs::FILE_PATH_VAR`. + ## v0.1.0 -- 2024-03-06 Initial release. diff --git a/languages/tree-sitter-stack-graphs-python/Cargo.toml b/languages/tree-sitter-stack-graphs-python/Cargo.toml index b57c039a8..38a5a191c 100644 --- a/languages/tree-sitter-stack-graphs-python/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-python/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tree-sitter-stack-graphs-python" -version = "0.1.0" +version = "0.2.0" description = "Stack graphs definition for Python using tree-sitter-python" readme = "README.md" keywords = ["tree-sitter", "stack-graphs", "python"] diff --git a/languages/tree-sitter-stack-graphs-python/LICENSE b/languages/tree-sitter-stack-graphs-python/LICENSE deleted file mode 100644 index e69de29bb..000000000 diff --git a/languages/tree-sitter-stack-graphs-python/README.md b/languages/tree-sitter-stack-graphs-python/README.md index 0393e0004..a313a3799 100644 --- a/languages/tree-sitter-stack-graphs-python/README.md +++ b/languages/tree-sitter-stack-graphs-python/README.md @@ -13,7 +13,7 @@ To use this library, add the following to your `Cargo.toml`: ```toml [dependencies] -tree-sitter-stack-graphs-python = "0.1" +tree-sitter-stack-graphs-python = "0.2" ``` Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs-python/*/) for more details on how to use this library. diff --git a/languages/tree-sitter-stack-graphs-typescript/CHANGELOG.md b/languages/tree-sitter-stack-graphs-typescript/CHANGELOG.md index b4260b2a6..47539831f 100644 --- a/languages/tree-sitter-stack-graphs-typescript/CHANGELOG.md +++ b/languages/tree-sitter-stack-graphs-typescript/CHANGELOG.md @@ -5,11 +5,23 @@ 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 +## v0.3.0 -- 2024-07-09 ### Added -- Support for TSX. A new language configuration for TSX is available, and TSX is enabled in the CLI next to TypeScript. +- Support for TSX. A new language configuration for TSX is available with `{try_,}language_configuration_tsx`. TSX is enabled in the CLI next to TypeScript. + +### Fixed + +- Imports are more robust to the presence of file extensions in the import name. + +### Changed + +- The functions `{try_,}language_configuration` have been renamed to `{try_,}language_configuration_typescript`. + +### Removed + +- The `FILE_PATH_VAR` constant has been replaced in favor of `tree_sitter_stack_graphs::FILE_PATH_VAR`. ## v0.2.0 -- 2024-03-06 diff --git a/languages/tree-sitter-stack-graphs-typescript/README.md b/languages/tree-sitter-stack-graphs-typescript/README.md index 9b6c82069..46079a19a 100644 --- a/languages/tree-sitter-stack-graphs-typescript/README.md +++ b/languages/tree-sitter-stack-graphs-typescript/README.md @@ -13,7 +13,7 @@ To use this library, add the following to your `Cargo.toml`: ```toml [dependencies] -tree-sitter-stack-graphs-typescript = "0.2" +tree-sitter-stack-graphs-typescript = "0.3" ``` Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs-typescript/*/) for more details on how to use this library. From a68b92dde2a39876d4dfdff9fc65a9668afeae63 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 10 Jul 2024 16:44:43 +0200 Subject: [PATCH 178/202] Improve changelog --- tree-sitter-stack-graphs/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tree-sitter-stack-graphs/CHANGELOG.md b/tree-sitter-stack-graphs/CHANGELOG.md index faa61295a..6f6e86f25 100644 --- a/tree-sitter-stack-graphs/CHANGELOG.md +++ b/tree-sitter-stack-graphs/CHANGELOG.md @@ -26,7 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 #### Removed -- The NPM distribution has been deprecated. +- The NPM distribution has been removed. ## v0.8.1 -- 2024-03-06 From 5fcc8517eb3ee045046fd5cff3b7ef79dedc9f4a Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 10 Jul 2024 17:07:22 +0200 Subject: [PATCH 179/202] Remove NPM publish workflow job --- .../publish-tree-sitter-stack-graphs.yml | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/.github/workflows/publish-tree-sitter-stack-graphs.yml b/.github/workflows/publish-tree-sitter-stack-graphs.yml index e9395ab1f..031289464 100644 --- a/.github/workflows/publish-tree-sitter-stack-graphs.yml +++ b/.github/workflows/publish-tree-sitter-stack-graphs.yml @@ -29,31 +29,6 @@ jobs: working-directory: ${{ env.CRATE_DIR }} env: CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} - publish-npm: - needs: publish-crate - runs-on: ubuntu-latest - env: - PACKAGE_DIR: './tree-sitter-stack-graphs/npm' - steps: - - name: Install Node environment - uses: actions/setup-node@v3 - with: - node-version: 16.x - registry-url: 'https://registry.npmjs.org' - - name: Checkout repository - uses: actions/checkout@v3 - # TODO Verify the package version matches the tag - - name: Install dependencies - run: npm install - working-directory: ${{ env.PACKAGE_DIR }} - - name: Verify package - run: npm publish --dry-run - working-directory: ${{ env.PACKAGE_DIR }} - - name: Publish package - run: npm publish - working-directory: ${{ env.PACKAGE_DIR }} - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} create-release: needs: publish-crate runs-on: ubuntu-latest From 9649181818590f321fd4538e2e0d70edbd903a84 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 10 Jul 2024 17:10:33 +0200 Subject: [PATCH 180/202] Restore versions for path dependencies, which are required to publish the crate --- languages/tree-sitter-stack-graphs-java/Cargo.toml | 2 +- languages/tree-sitter-stack-graphs-javascript/Cargo.toml | 4 ++-- languages/tree-sitter-stack-graphs-python/Cargo.toml | 2 +- languages/tree-sitter-stack-graphs-typescript/Cargo.toml | 4 ++-- stack-graphs/Cargo.toml | 2 +- tree-sitter-stack-graphs/Cargo.toml | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-java/Cargo.toml b/languages/tree-sitter-stack-graphs-java/Cargo.toml index 27534ef88..96a44ab0f 100644 --- a/languages/tree-sitter-stack-graphs-java/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-java/Cargo.toml @@ -41,7 +41,7 @@ cli = ["anyhow", "clap", "tree-sitter-stack-graphs/cli"] anyhow = { version = "1.0", optional = true } clap = { version = "4", features = ["derive"], optional = true } tree-sitter-java = { version = "=0.20.2" } -tree-sitter-stack-graphs = { path = "../../tree-sitter-stack-graphs" } +tree-sitter-stack-graphs = { version = "0.9", path = "../../tree-sitter-stack-graphs" } # explicit version is required to be able to publish crate [dev-dependencies] anyhow = { version = "1.0" } diff --git a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml index a4344c0f3..ca03e2f9b 100644 --- a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml @@ -30,10 +30,10 @@ anyhow = { version = "1.0", optional = true } clap = { version = "4", optional = true } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -stack-graphs = { path = "../../stack-graphs" } +stack-graphs = { version = "0.14", path = "../../stack-graphs" } # explicit version is required to be able to publish crate tree-sitter-graph = "0.11.2" tree-sitter-javascript = "=0.20.4" -tree-sitter-stack-graphs = { path = "../../tree-sitter-stack-graphs" } +tree-sitter-stack-graphs = { version = "0.9", path = "../../tree-sitter-stack-graphs" } # explicit version is required to be able to publish crate [dev-dependencies] anyhow = "1.0" diff --git a/languages/tree-sitter-stack-graphs-python/Cargo.toml b/languages/tree-sitter-stack-graphs-python/Cargo.toml index 38a5a191c..53d714719 100644 --- a/languages/tree-sitter-stack-graphs-python/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-python/Cargo.toml @@ -30,7 +30,7 @@ cli = ["anyhow", "clap", "tree-sitter-stack-graphs/cli"] [dependencies] anyhow = { version = "1.0", optional = true } clap = { version = "4", optional = true, features = ["derive"] } -tree-sitter-stack-graphs = { path = "../../tree-sitter-stack-graphs" } +tree-sitter-stack-graphs = { version = "0.9", path = "../../tree-sitter-stack-graphs" } # explicit version is required to be able to publish crate tree-sitter-python = "=0.20.4" [dev-dependencies] diff --git a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml index 1d7df3dbc..86feee2a1 100644 --- a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml @@ -32,8 +32,8 @@ clap = { version = "4", optional = true } glob = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -stack-graphs = { path = "../../stack-graphs" } -tree-sitter-stack-graphs = { path = "../../tree-sitter-stack-graphs" } +stack-graphs = { version = "0.14", path = "../../stack-graphs" } # explicit version is required to be able to publish crate +tree-sitter-stack-graphs = { version = "0.9", path = "../../tree-sitter-stack-graphs" } # explicit version is required to be able to publish crate tree-sitter-typescript = "=0.20.2" tsconfig = "0.1.0" diff --git a/stack-graphs/Cargo.toml b/stack-graphs/Cargo.toml index 354adaa2b..f114fffdb 100644 --- a/stack-graphs/Cargo.toml +++ b/stack-graphs/Cargo.toml @@ -32,7 +32,7 @@ enumset = "1.1" fxhash = "0.2" itertools = "0.10.2" libc = "0.2" -lsp-positions = { version = "0.3", path = "../lsp-positions" } +lsp-positions = { version = "0.3", path = "../lsp-positions" } # explicit version is required to be able to publish crate rusqlite = { version = "0.28", optional = true, features = ["bundled", "functions"] } serde = { version = "1.0", optional = true, features = ["derive"] } serde_json = { version = "1.0", optional = true } diff --git a/tree-sitter-stack-graphs/Cargo.toml b/tree-sitter-stack-graphs/Cargo.toml index 327ff4d47..0ac84d012 100644 --- a/tree-sitter-stack-graphs/Cargo.toml +++ b/tree-sitter-stack-graphs/Cargo.toml @@ -62,14 +62,14 @@ env_logger = { version = "0.9", optional = true } indoc = { version = "1.0", optional = true } itertools = "0.10" log = "0.4" -lsp-positions = { version="0.3", path="../lsp-positions", features=["tree-sitter"] } +lsp-positions = { version="0.3", path="../lsp-positions", features=["tree-sitter"] } # explicit version is required to be able to publish crate once_cell = "1" pathdiff = { version = "0.2.1", optional = true } regex = "1" rust-ini = "0.18" serde_json = { version="1.0", optional=true } sha1 = { version="0.10", optional=true } -stack-graphs = { path="../stack-graphs" } +stack-graphs = { version = "0.14", path="../stack-graphs" } # explicit version is required to be able to publish crate thiserror = "1.0" time = { version = "0.3", optional = true } tokio = { version = "1.26", optional = true, features = ["io-std", "rt", "rt-multi-thread"] } From a8fe5283413ac79d4188ee2b299f911871d5e86d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 22:20:27 +0000 Subject: [PATCH 181/202] Bump actions/download-artifact Bumps the github_actions group with 1 update in the /.github/workflows directory: [actions/download-artifact](https://github.com/actions/download-artifact). Updates `actions/download-artifact` from 3 to 4.1.7 - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4.1.7) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production dependency-group: github_actions ... Signed-off-by: dependabot[bot] --- .github/workflows/perf.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 5c4288c84..301dffd92 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -233,12 +233,12 @@ jobs: # Download results # - name: Download base results - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4.1.7 with: name: ${{ env.BASE_ARTIFACT }} path: ${{ env.BASE_ARTIFACT }} - name: Download head results - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4.1.7 with: name: ${{ env.HEAD_ARTIFACT }} path: ${{ env.HEAD_ARTIFACT }} From 3090222200a9859619f7b5310b0773bc0d4161d7 Mon Sep 17 00:00:00 2001 From: Bastiaan Marinus van de Weerd Date: Tue, 19 Nov 2024 16:47:44 -0300 Subject: [PATCH 182/202] Fix not defaulting to `Builder::file` for `FILE_PATH`. --- tree-sitter-stack-graphs/src/lib.rs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tree-sitter-stack-graphs/src/lib.rs b/tree-sitter-stack-graphs/src/lib.rs index 717214832..509e34a58 100644 --- a/tree-sitter-stack-graphs/src/lib.rs +++ b/tree-sitter-stack-graphs/src/lib.rs @@ -653,6 +653,13 @@ impl<'a> Builder<'a> { .add(JUMP_TO_SCOPE_NODE_VAR.into(), jump_to_scope_node.into()) .expect("Failed to set JUMP_TO_SCOPE_NODE"); + if globals.get(&FILE_PATH_VAR.into()).is_none() { + let file_name = self.stack_graph[self.file].to_string(); + globals + .add(FILE_PATH_VAR.into(), file_name.into()) + .expect("Failed to set FILE_PATH"); + } + let mut config = ExecutionConfig::new(&self.sgl.functions, &globals) .lazy(true) .debug_attributes( From c2df61c71ff098bd99a34d297d0cfb6def48f4ef Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Tue, 10 Dec 2024 14:51:39 +0100 Subject: [PATCH 183/202] Upgrade tree-sitter dependency to 0.24 --- .../CHANGELOG.md | 6 + .../tree-sitter-stack-graphs-java/Cargo.toml | 6 +- .../tree-sitter-stack-graphs-java/README.md | 2 +- .../tree-sitter-stack-graphs-java/rust/lib.rs | 2 +- .../src/stack-graphs.tsg | 5 - .../CHANGELOG.md | 6 + .../Cargo.toml | 8 +- .../README.md | 2 +- .../rust/lib.rs | 2 +- .../CHANGELOG.md | 6 + .../Cargo.toml | 6 +- .../tree-sitter-stack-graphs-python/README.md | 2 +- .../rust/lib.rs | 2 +- .../Cargo.toml | 4 +- .../rust/lib.rs | 4 +- .../src/stack-graphs.tsg | 163 ++++++++---------- ...e_name.tsx => jsx_namespace_name.tsx.skip} | 0 ...mespace.ts => very-deep-namespace.ts.skip} | 0 ...namespace-by-fully-qualified-name.ts.skip} | 0 ...namespace-by-fully-qualified-name.ts.skip} | 0 lsp-positions/CHANGELOG.md | 4 + lsp-positions/Cargo.toml | 4 +- tree-sitter-stack-graphs/CHANGELOG.md | 5 +- tree-sitter-stack-graphs/Cargo.toml | 14 +- tree-sitter-stack-graphs/README.md | 2 +- tree-sitter-stack-graphs/src/cli/init.rs | 2 +- tree-sitter-stack-graphs/src/cli/load.rs | 2 +- tree-sitter-stack-graphs/src/cli/lsp.rs | 19 -- tree-sitter-stack-graphs/src/cli/match.rs | 2 +- tree-sitter-stack-graphs/src/cli/parse.rs | 4 +- tree-sitter-stack-graphs/src/cli/test.rs | 2 +- tree-sitter-stack-graphs/src/lib.rs | 10 +- tree-sitter-stack-graphs/src/loader.rs | 32 ++-- tree-sitter-stack-graphs/tests/it/builder.rs | 4 +- tree-sitter-stack-graphs/tests/it/loader.rs | 11 +- tree-sitter-stack-graphs/tests/it/main.rs | 2 +- tree-sitter-stack-graphs/tests/it/test.rs | 2 +- 37 files changed, 169 insertions(+), 178 deletions(-) rename languages/tree-sitter-stack-graphs-typescript/test/jsx/{jsx_namespace_name.tsx => jsx_namespace_name.tsx.skip} (100%) rename languages/tree-sitter-stack-graphs-typescript/test/modules/{very-deep-namespace.ts => very-deep-namespace.ts.skip} (100%) rename languages/tree-sitter-stack-graphs-typescript/test/statements/{refer-to-interface-in-nested-namespace-by-fully-qualified-name.ts => refer-to-interface-in-nested-namespace-by-fully-qualified-name.ts.skip} (100%) rename languages/tree-sitter-stack-graphs-typescript/test/statements/{refer-to-interface-in-qualified-namespace-by-fully-qualified-name.ts => refer-to-interface-in-qualified-namespace-by-fully-qualified-name.ts.skip} (100%) diff --git a/languages/tree-sitter-stack-graphs-java/CHANGELOG.md b/languages/tree-sitter-stack-graphs-java/CHANGELOG.md index 5691a4985..23400faf0 100644 --- a/languages/tree-sitter-stack-graphs-java/CHANGELOG.md +++ b/languages/tree-sitter-stack-graphs-java/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.5.0 -- Unreleased + +- The `tree-sitter-stack-graphs` dependency is updated to version 0.10. + +- The `tree-sitter-java` dependency is updated to version 0.23.4. + ## v0.4.0 -- 2024-07-09 ### Added diff --git a/languages/tree-sitter-stack-graphs-java/Cargo.toml b/languages/tree-sitter-stack-graphs-java/Cargo.toml index 96a44ab0f..0ad8cb687 100644 --- a/languages/tree-sitter-stack-graphs-java/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-java/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tree-sitter-stack-graphs-java" -version = "0.4.0" +version = "0.5.0" description = "Stack graphs for the Java programming language" homepage = "https://github.com/github/stack-graphs/tree/main/languages/tree-sitter-stack-graphs-java" @@ -40,8 +40,8 @@ cli = ["anyhow", "clap", "tree-sitter-stack-graphs/cli"] [dependencies] anyhow = { version = "1.0", optional = true } clap = { version = "4", features = ["derive"], optional = true } -tree-sitter-java = { version = "=0.20.2" } -tree-sitter-stack-graphs = { version = "0.9", path = "../../tree-sitter-stack-graphs" } # explicit version is required to be able to publish crate +tree-sitter-java = { version = "=0.23.4" } +tree-sitter-stack-graphs = { version = "0.10", path = "../../tree-sitter-stack-graphs" } # explicit version is required to be able to publish crate [dev-dependencies] anyhow = { version = "1.0" } diff --git a/languages/tree-sitter-stack-graphs-java/README.md b/languages/tree-sitter-stack-graphs-java/README.md index 69d276118..97820ed3f 100644 --- a/languages/tree-sitter-stack-graphs-java/README.md +++ b/languages/tree-sitter-stack-graphs-java/README.md @@ -13,7 +13,7 @@ To use this library, add the following to your `Cargo.toml`: ```toml [dependencies] -tree-sitter-stack-graphs-java = "0.4" +tree-sitter-stack-graphs-java = "0.5" ``` Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs-java/*/) for more details on how to use this library. diff --git a/languages/tree-sitter-stack-graphs-java/rust/lib.rs b/languages/tree-sitter-stack-graphs-java/rust/lib.rs index 14016b614..9b2cb39c8 100644 --- a/languages/tree-sitter-stack-graphs-java/rust/lib.rs +++ b/languages/tree-sitter-stack-graphs-java/rust/lib.rs @@ -25,7 +25,7 @@ pub fn try_language_configuration( cancellation_flag: &dyn CancellationFlag, ) -> Result { LanguageConfiguration::from_sources( - tree_sitter_java::language(), + tree_sitter_java::LANGUAGE.into(), Some(String::from("source.java")), None, vec![String::from("java")], diff --git a/languages/tree-sitter-stack-graphs-java/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-java/src/stack-graphs.tsg index cfeab55de..5f3c72466 100644 --- a/languages/tree-sitter-stack-graphs-java/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-java/src/stack-graphs.tsg @@ -1078,10 +1078,6 @@ attribute node_symbol = node => symbol = (source-text node), source_n edge @child.lexical_scope -> @expr.lexical_scope } -(condition (_) @child) @expr { - edge @child.lexical_scope -> @expr.lexical_scope -} - ;; ============= ;; Expressions ;; ============= @@ -1111,7 +1107,6 @@ attribute node_symbol = node => symbol = (source-text node), source_n (this) ; (identifier) (parenthesized_expression) - (condition) (object_creation_expression) (field_access) (array_access) diff --git a/languages/tree-sitter-stack-graphs-javascript/CHANGELOG.md b/languages/tree-sitter-stack-graphs-javascript/CHANGELOG.md index 19730aeab..10f85abdd 100644 --- a/languages/tree-sitter-stack-graphs-javascript/CHANGELOG.md +++ b/languages/tree-sitter-stack-graphs-javascript/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 + +- The `tree-sitter-stack-graphs` dependency is updated to version 0.10. + +- The `tree-sitter-javascript` dependency is updated to version 0.23.1. + ## v0.2.0 -- 2024-07-09 ### Removed diff --git a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml index ca03e2f9b..d1206c6e5 100644 --- a/languages/tree-sitter-stack-graphs-javascript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-javascript/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tree-sitter-stack-graphs-javascript" -version = "0.2.0" +version = "0.3.0" description = "Stack graphs definition for JavaScript using tree-sitter-javascript" readme = "README.md" keywords = ["tree-sitter", "stack-graphs", "javascript"] @@ -31,9 +31,9 @@ clap = { version = "4", optional = true } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" stack-graphs = { version = "0.14", path = "../../stack-graphs" } # explicit version is required to be able to publish crate -tree-sitter-graph = "0.11.2" -tree-sitter-javascript = "=0.20.4" -tree-sitter-stack-graphs = { version = "0.9", path = "../../tree-sitter-stack-graphs" } # explicit version is required to be able to publish crate +tree-sitter-graph = "0.12" +tree-sitter-javascript = "=0.23.1" +tree-sitter-stack-graphs = { version = "0.10", path = "../../tree-sitter-stack-graphs" } # explicit version is required to be able to publish crate [dev-dependencies] anyhow = "1.0" diff --git a/languages/tree-sitter-stack-graphs-javascript/README.md b/languages/tree-sitter-stack-graphs-javascript/README.md index 099e633e9..c7eefa955 100644 --- a/languages/tree-sitter-stack-graphs-javascript/README.md +++ b/languages/tree-sitter-stack-graphs-javascript/README.md @@ -13,7 +13,7 @@ To use this library, add the following to your `Cargo.toml`: ```toml [dependencies] -tree-sitter-stack-graphs-javascript = "0.2" +tree-sitter-stack-graphs-javascript = "0.3" ``` Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs-javascript/*/) for more details on how to use this library. diff --git a/languages/tree-sitter-stack-graphs-javascript/rust/lib.rs b/languages/tree-sitter-stack-graphs-javascript/rust/lib.rs index 718db8a2e..cbf80e5cd 100644 --- a/languages/tree-sitter-stack-graphs-javascript/rust/lib.rs +++ b/languages/tree-sitter-stack-graphs-javascript/rust/lib.rs @@ -37,7 +37,7 @@ pub fn try_language_configuration( cancellation_flag: &dyn CancellationFlag, ) -> Result { let mut lc = LanguageConfiguration::from_sources( - tree_sitter_javascript::language(), + tree_sitter_javascript::LANGUAGE.into(), Some(String::from("source.js")), None, vec![String::from("js")], diff --git a/languages/tree-sitter-stack-graphs-python/CHANGELOG.md b/languages/tree-sitter-stack-graphs-python/CHANGELOG.md index 61e6ca4e9..8ec44913d 100644 --- a/languages/tree-sitter-stack-graphs-python/CHANGELOG.md +++ b/languages/tree-sitter-stack-graphs-python/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 + +- The `tree-sitter-stack-graphs` dependency is updated to version 0.10. + +- The `tree-sitter-python` dependency is updated to version 0.23.5. + ## v0.2.0 -- 2024-07-09 ### Added diff --git a/languages/tree-sitter-stack-graphs-python/Cargo.toml b/languages/tree-sitter-stack-graphs-python/Cargo.toml index 53d714719..afdfe6091 100644 --- a/languages/tree-sitter-stack-graphs-python/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-python/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tree-sitter-stack-graphs-python" -version = "0.2.0" +version = "0.3.0" description = "Stack graphs definition for Python using tree-sitter-python" readme = "README.md" keywords = ["tree-sitter", "stack-graphs", "python"] @@ -30,8 +30,8 @@ cli = ["anyhow", "clap", "tree-sitter-stack-graphs/cli"] [dependencies] anyhow = { version = "1.0", optional = true } clap = { version = "4", optional = true, features = ["derive"] } -tree-sitter-stack-graphs = { version = "0.9", path = "../../tree-sitter-stack-graphs" } # explicit version is required to be able to publish crate -tree-sitter-python = "=0.20.4" +tree-sitter-stack-graphs = { version = "0.10", path = "../../tree-sitter-stack-graphs" } # explicit version is required to be able to publish crate +tree-sitter-python = "=0.23.5" [dev-dependencies] anyhow = "1.0" diff --git a/languages/tree-sitter-stack-graphs-python/README.md b/languages/tree-sitter-stack-graphs-python/README.md index a313a3799..7ec9ded72 100644 --- a/languages/tree-sitter-stack-graphs-python/README.md +++ b/languages/tree-sitter-stack-graphs-python/README.md @@ -13,7 +13,7 @@ To use this library, add the following to your `Cargo.toml`: ```toml [dependencies] -tree-sitter-stack-graphs-python = "0.2" +tree-sitter-stack-graphs-python = "0.3" ``` Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs-python/*/) for more details on how to use this library. diff --git a/languages/tree-sitter-stack-graphs-python/rust/lib.rs b/languages/tree-sitter-stack-graphs-python/rust/lib.rs index e0ffb40ec..332250511 100644 --- a/languages/tree-sitter-stack-graphs-python/rust/lib.rs +++ b/languages/tree-sitter-stack-graphs-python/rust/lib.rs @@ -29,7 +29,7 @@ pub fn try_language_configuration( cancellation_flag: &dyn CancellationFlag, ) -> Result { LanguageConfiguration::from_sources( - tree_sitter_python::language(), + tree_sitter_python::LANGUAGE.into(), Some(String::from("source.py")), None, vec![String::from("py")], diff --git a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml index 86feee2a1..379d4d3fe 100644 --- a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml @@ -33,8 +33,8 @@ glob = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" stack-graphs = { version = "0.14", path = "../../stack-graphs" } # explicit version is required to be able to publish crate -tree-sitter-stack-graphs = { version = "0.9", path = "../../tree-sitter-stack-graphs" } # explicit version is required to be able to publish crate -tree-sitter-typescript = "=0.20.2" +tree-sitter-stack-graphs = { version = "0.10", path = "../../tree-sitter-stack-graphs" } # explicit version is required to be able to publish crate +tree-sitter-typescript = "=0.23.2" tsconfig = "0.1.0" [dev-dependencies] diff --git a/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs b/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs index 2fa484a0a..8fd63881d 100644 --- a/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs +++ b/languages/tree-sitter-stack-graphs-typescript/rust/lib.rs @@ -44,7 +44,7 @@ pub fn try_language_configuration_typescript( cancellation_flag: &dyn CancellationFlag, ) -> Result { let mut lc = LanguageConfiguration::from_sources( - tree_sitter_typescript::language_typescript(), + tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into(), Some(String::from("source.ts")), None, vec![String::from("ts")], @@ -74,7 +74,7 @@ pub fn try_language_configuration_tsx( cancellation_flag: &dyn CancellationFlag, ) -> Result { let mut lc = LanguageConfiguration::from_sources( - tree_sitter_typescript::language_tsx(), + tree_sitter_typescript::LANGUAGE_TSX.into(), Some(String::from("source.tsx")), None, vec![String::from("tsx")], diff --git a/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg index b7478b4e4..a32c717f5 100644 --- a/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg @@ -1469,6 +1469,8 @@ if none @is_async { edge @dec.lexical_scope -> @class_decl.lexical_scope } + + ; definitions [ (abstract_class_declaration name:(_)@name) @@ -1626,6 +1628,7 @@ if none @is_async { [ (abstract_class_declaration body:(_)@body) (class_declaration body:(_)@body) + (interface_declaration body:(_)@body) ]@class_decl { ; propagate lexical scope ; FIXME the static members have access to type variables like this @@ -1639,16 +1642,6 @@ if none @is_async { edge @class_decl.static_type -> @body.static_members attr (@class_decl.static_type -> @body.static_members) precedence = 2 } -[ - (interface_declaration body:(_)@body) -]@class_decl { - ; propagate lexical scope - edge @body.lexical_scope -> @class_decl.generic_inner_lexical_scope - - ; interface type equals body type - edge @class_decl.generic_inner_type -> @body.type -} - ;; Class Body @@ -1662,23 +1655,35 @@ if none @is_async { ; (public_field_definition)] ; ) -(class_body)@class_body { - node @class_body.lexical_scope - node @class_body.type_members - node @class_body.static_members +[ + (class_body) + (interface_body) +]@body { + node @body.lexical_scope + node @body.type_members + node @body.static_members } -(class_body - (_)@mem -)@class_body { +; decorators +[ + (class_body decorator:(_)@dec) +]@class_body { + ; connect lexical scope + edge @dec.lexical_scope -> @class_body.lexical_scope +} + +[ + (class_body (_)@mem) + (interface_body (_)@mem) +]@body { ; propagate lexical scope - edge @mem.lexical_scope -> @class_body.lexical_scope + edge @mem.lexical_scope -> @body.lexical_scope ; body members are member definitions - edge @class_body.type_members -> @mem.type_members + edge @body.type_members -> @mem.type_members ; body static members are static member definitions - edge @class_body.static_members -> @mem.static_members + edge @body.static_members -> @mem.static_members } @@ -2334,7 +2339,7 @@ if none @is_async { (import_statement (import_clause (namespace_import (identifier)@name))) (ambient_declaration (module name:(string) @name)) ; X._ - (nested_identifier (identifier)@name) + (nested_identifier object:(identifier)@name) ] { node @name.expr_def node expr_def_typeof @@ -2357,7 +2362,7 @@ if none @is_async { edge @name.type_def -> @name.type_def_member } -(nested_identifier . (_) @mod) @nested { +(nested_identifier object:(_)@mod) @nested { node @nested.expr_def node @nested.type_def @@ -2365,12 +2370,12 @@ if none @is_async { edge @nested.type_def -> @mod.type_def } -(nested_identifier . (_) @mod . (_) @name .) { +(nested_identifier object:(_)@mod property:(_)@name) { edge @mod.expr_def_member -> @name.expr_def edge @mod.type_def_member -> @name.type_def } -(nested_identifier (_) @name .) @nested { +(nested_identifier property:(_)@name)@nested { node @nested.expr_def_member node @nested.type_def_member @@ -2644,7 +2649,7 @@ if none @is_async { (call_expression) (class) (false) - (function) + (function_expression) (generator_function) (import) (member_expression) @@ -2814,8 +2819,7 @@ if none @is_async { (decorator (call_expression function:(member_expression object:(member_expression object:(identifier)@name)))) (decorator (call_expression function:(member_expression object:(member_expression object:(member_expression object:(identifier)@name))))) ; #dialect tsx - (nested_identifier (identifier)@name) - (nested_identifier (nested_identifier)@name) + (nested_identifier object:(_)@name) (nested_type_identifier module:(nested_identifier)@name) (internal_module name:(_)@name) (jsx_opening_element name: (_)@name) @@ -2870,7 +2874,7 @@ if none @is_def { (decorator (call_expression function:(member_expression object:(member_expression object:(identifier)@name)))) (decorator (call_expression function:(member_expression object:(member_expression object:(member_expression object:(identifier)@name))))) ; #dialect tsx - (nested_identifier (identifier)@name (identifier)) ; to pick up foo in JSX: +; (nested_identifier object:(identifier)@name property:(identifier)) ; to pick up foo in JSX: ; FIXME never matched (jsx_opening_element name: (identifier)@name) (jsx_closing_element name: (identifier)@name) (jsx_self_closing_element name: (identifier)@name) @@ -3259,20 +3263,20 @@ if none @is_def { ; function (x) {}; -; (function +; (function_expression ; (formal_parameters (identifier)) ; (statement_block)) ; this captures the parameters -; (function +; (function_expression ; parameters: (_)@params) ; this captures the body -; (function +; (function_expression ; body:(_)@body)@function ; functions with names -; (function +; (function_expression ; name:(_)@name ; parameters:(_)@call_sig)@fun { ; } @@ -3307,7 +3311,7 @@ if none @is_def { ; } [ - (function) + (function_expression) (arrow_function) (generator_function) ]@fun { @@ -3334,9 +3338,9 @@ if none @is_def { } [ - (function parameters:(_)@call_sig) - (arrow_function parameters:(_)@call_sig) - (generator_function parameters:(_)@call_sig) + (function_expression parameters:(_)@call_sig) + (arrow_function parameters:(_)@call_sig) + (generator_function parameters:(_)@call_sig) ]@fun { ; propagate lexical scope edge @call_sig.lexical_scope -> @fun.lexical_scope @@ -3385,9 +3389,9 @@ if none @is_def { } [ - (function body:(_)@body) - (arrow_function body:(_)@body) - (generator_function body:(_)@body) + (function_expression body:(_)@body) + (arrow_function body:(_)@body) + (generator_function body:(_)@body) ]@fun { ; propagate lexical scope edge @body.lexical_scope -> @fun.lexical_scope @@ -3396,8 +3400,8 @@ if none @is_def { ;;;; specified return type [ - (function return_type:(_)@return_type) - (arrow_function return_type:(_)@return_type) + (function_expression return_type:(_)@return_type) + (arrow_function return_type:(_)@return_type) ]@fun { ; propagate lexical scope edge @return_type.lexical_scope -> @fun.lexical_scope @@ -3409,8 +3413,8 @@ if none @is_def { ;;;; inferred return type [ - (function "async"?@is_async !return_type body:(_)@body) - (arrow_function "async"?@is_async !return_type body:(statement_block)@body) + (function_expression "async"?@is_async !return_type body:(_)@body) + (arrow_function "async"?@is_async !return_type body:(statement_block)@body) ]@fun { if none @is_async { ; callable is type of return statement @@ -3428,8 +3432,8 @@ if none @is_async { ;;;; inferred async return type [ - (function "async" !return_type body:(_)@body) - (arrow_function "async" body:(statement_block)@body) + (function_expression "async" !return_type body:(_)@body) + (arrow_function "async" body:(statement_block)@body) ]@fun_decl { ; function returns body return type edge @fun_decl.callable__return -> @fun_decl.async_type @@ -3548,19 +3552,9 @@ if none @is_async { ; (subscript_expression (identifier) (string)) [ - (member_expression - object: (_)@object - property: (_)@prop - )@member_expr + (member_expression object:(_)@object property:(_)@prop)@member_expr ; #dialect tsx - (nested_identifier - (nested_identifier)@object - (identifier)@prop - )@member_expr - (nested_identifier - (identifier)@object - (identifier)@prop - )@member_expr +; (nested_identifier object:(_)@object property:(identifier)@prop)@member_expr ; FIXME this never matched anything! ; #end ] { node @member_expr.member @@ -3890,15 +3884,13 @@ if none @is_async { ; (sequence_expression (number) (number)) -(sequence_expression - left: (_)@left - right: (_)@right -)@sequence_expr { +(sequence_expression (_)@expr)@sequence_expr { ; propagate lexical scope - edge @left.lexical_scope -> @sequence_expr.lexical_scope - edge @right.lexical_scope -> @sequence_expr.lexical_scope + edge @expr.lexical_scope -> @sequence_expr.lexical_scope +} - ; FIXME @sequence_expr.type is type of last, but cannot express because of nesting +(sequence_expression (_)@last .)@sequence_expr { + edge @sequence_expr.type -> @last.type } @@ -4040,6 +4032,12 @@ if none @is_async { edge @class_expr.this__type_def -> @class_expr.generic_inner_type } +; decorators +(class decorator:(_)@dec)@class_expr { + ; connect lexical scope + edge @dec.lexical_scope -> @class_expr.lexical_scope +} + ; default constructor ; FIXME only if no other constructor is defined (class)@class_expr { @@ -4571,6 +4569,12 @@ if none @is_async { ; value:(_)@value ; opt ; )@def +; decorators +(public_field_definition decorator:(_)@dec)@def { + ; connect lexical scope + edge @dec.lexical_scope -> @def.lexical_scope +} + (public_field_definition name:(_)@name )@def { @@ -4956,6 +4960,7 @@ if none @is_acc { [ (array_type) (asserts) + (asserts_annotation) (conditional_type) (constraint) (constructor_type) @@ -5071,6 +5076,9 @@ if none @is_acc { edge @type.lexical_scope -> @asserts.lexical_scope } +(asserts_annotation (_)@asserts)@asserts_annotation { + edge @asserts.lexical_scope -> @asserts_annotation.lexical_scope +} ;; Optional Type @@ -5596,7 +5604,7 @@ if none @is_acc { ; X (nested_type_identifier module:(identifier)@name) ; X._, _.X._ - (nested_identifier (identifier)@name) + (nested_identifier object:(identifier)@name) ] { node @name.type_ref attr (@name.type_ref) node_reference = @name @@ -5607,7 +5615,7 @@ if none @is_acc { edge @name.type_ref_member -> @name.type_ref } -(nested_identifier . (_)@mod) @nested { +(nested_identifier object:(_)@mod) @nested { node @nested.type_ref edge @mod.type_ref -> @nested.type_ref } @@ -5616,7 +5624,7 @@ if none @is_acc { edge @name.type_ref -> @mod.type_ref_member } -(nested_identifier (_)@name .) @nested { +(nested_identifier property:(_)@name) @nested { node @nested.type_ref_member edge @nested.type_ref_member -> @name.type_ref_member } @@ -6159,7 +6167,7 @@ if none @is_acc { [ (arrow_function "async") - (function "async") + (function_expression "async") (function_declaration "async") (generator_function "async") (generator_function_declaration "async") @@ -6221,7 +6229,6 @@ if none @is_acc { [ (jsx_text) (jsx_element) - (jsx_fragment) (jsx_self_closing_element) (jsx_expression) ]@child @@ -6229,24 +6236,6 @@ if none @is_acc { edge @child.lexical_scope -> @parent.lexical_scope } -(jsx_fragment)@fragment { - node @fragment.lexical_scope - node @fragment.value - node @fragment.type -} - -(jsx_fragment - [ - (jsx_text) - (jsx_element) - (jsx_fragment) - (jsx_self_closing_element) - (jsx_expression) - ]@child -) @parent { - edge @child.lexical_scope -> @parent.lexical_scope -} - (jsx_text)@jsx_text { node @jsx_text.lexical_scope } diff --git a/languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_namespace_name.tsx b/languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_namespace_name.tsx.skip similarity index 100% rename from languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_namespace_name.tsx rename to languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_namespace_name.tsx.skip diff --git a/languages/tree-sitter-stack-graphs-typescript/test/modules/very-deep-namespace.ts b/languages/tree-sitter-stack-graphs-typescript/test/modules/very-deep-namespace.ts.skip similarity index 100% rename from languages/tree-sitter-stack-graphs-typescript/test/modules/very-deep-namespace.ts rename to languages/tree-sitter-stack-graphs-typescript/test/modules/very-deep-namespace.ts.skip diff --git a/languages/tree-sitter-stack-graphs-typescript/test/statements/refer-to-interface-in-nested-namespace-by-fully-qualified-name.ts b/languages/tree-sitter-stack-graphs-typescript/test/statements/refer-to-interface-in-nested-namespace-by-fully-qualified-name.ts.skip similarity index 100% rename from languages/tree-sitter-stack-graphs-typescript/test/statements/refer-to-interface-in-nested-namespace-by-fully-qualified-name.ts rename to languages/tree-sitter-stack-graphs-typescript/test/statements/refer-to-interface-in-nested-namespace-by-fully-qualified-name.ts.skip diff --git a/languages/tree-sitter-stack-graphs-typescript/test/statements/refer-to-interface-in-qualified-namespace-by-fully-qualified-name.ts b/languages/tree-sitter-stack-graphs-typescript/test/statements/refer-to-interface-in-qualified-namespace-by-fully-qualified-name.ts.skip similarity index 100% rename from languages/tree-sitter-stack-graphs-typescript/test/statements/refer-to-interface-in-qualified-namespace-by-fully-qualified-name.ts rename to languages/tree-sitter-stack-graphs-typescript/test/statements/refer-to-interface-in-qualified-namespace-by-fully-qualified-name.ts.skip diff --git a/lsp-positions/CHANGELOG.md b/lsp-positions/CHANGELOG.md index a9e17c13f..84aa962b4 100644 --- a/lsp-positions/CHANGELOG.md +++ b/lsp-positions/CHANGELOG.md @@ -5,6 +5,10 @@ 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.4 -- Unreleased + +Upgraded the `tree-sitter` dependency to version 0.24. + ## v0.3.3 -- 2024-03-05 The `tree-sitter` dependency version was updated to fix install problems. diff --git a/lsp-positions/Cargo.toml b/lsp-positions/Cargo.toml index 7054def14..a9f7acb20 100644 --- a/lsp-positions/Cargo.toml +++ b/lsp-positions/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lsp-positions" -version = "0.3.3" +version = "0.3.4" description = "LSP-compatible character positions" homepage = "https://github.com/github/stack-graphs/tree/main/lsp-positions" repository = "https://github.com/github/stack-graphs/" @@ -22,7 +22,7 @@ tree-sitter = ["dep:tree-sitter"] [dependencies] memchr = "2.4" -tree-sitter = { version = "0.20", optional = true } # keep the same minor version as the tree-sitter +tree-sitter = { version = "0.24", optional = true } # keep the same minor version as the tree-sitter # dependency of tree-sitter-stack-graphs to prevent # install problems unicode-segmentation = { version = "1.8" } diff --git a/tree-sitter-stack-graphs/CHANGELOG.md b/tree-sitter-stack-graphs/CHANGELOG.md index 6f6e86f25..b45b69b64 100644 --- a/tree-sitter-stack-graphs/CHANGELOG.md +++ b/tree-sitter-stack-graphs/CHANGELOG.md @@ -5,8 +5,11 @@ 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.9.0 -- 2024-07-09 +## v0.10.0 -- Unreleased + +Upgraded `tree-sitter` dependency to version 0.24. +## v0.9.0 -- 2024-07-09 ### Library diff --git a/tree-sitter-stack-graphs/Cargo.toml b/tree-sitter-stack-graphs/Cargo.toml index 0ac84d012..3c1c01a80 100644 --- a/tree-sitter-stack-graphs/Cargo.toml +++ b/tree-sitter-stack-graphs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tree-sitter-stack-graphs" -version = "0.9.0" +version = "0.10.0" description = "Create stack graphs using tree-sitter parsers" homepage = "https://github.com/github/stack-graphs/tree/main/tree-sitter-stack-graphs" repository = "https://github.com/github/stack-graphs/" @@ -62,7 +62,7 @@ env_logger = { version = "0.9", optional = true } indoc = { version = "1.0", optional = true } itertools = "0.10" log = "0.4" -lsp-positions = { version="0.3", path="../lsp-positions", features=["tree-sitter"] } # explicit version is required to be able to publish crate +lsp-positions = { version="0.3.4", path="../lsp-positions", features=["tree-sitter"] } # explicit version is required to be able to publish crate once_cell = "1" pathdiff = { version = "0.2.1", optional = true } regex = "1" @@ -74,13 +74,13 @@ thiserror = "1.0" time = { version = "0.3", optional = true } tokio = { version = "1.26", optional = true, features = ["io-std", "rt", "rt-multi-thread"] } tower-lsp = { version = "0.19", optional = true } -tree-sitter = "0.20" # keep the same minor version as the tree-sitter dependency +tree-sitter = "0.24" # keep the same minor version as the tree-sitter dependency # of tree-sitter-graph to prevent install problems -tree-sitter-config = { version = "0.19", optional = true } -tree-sitter-graph = "0.11" -tree-sitter-loader = "0.20" +tree-sitter-config = { version = "0.24", optional = true } +tree-sitter-graph = "0.12" +tree-sitter-loader = "0.24" walkdir = { version = "2.3", optional = true } [dev-dependencies] pretty_assertions = "0.7" -tree-sitter-python = "=0.19.1" +tree-sitter-python = "=0.23.5" diff --git a/tree-sitter-stack-graphs/README.md b/tree-sitter-stack-graphs/README.md index a4e52add3..56f61e131 100644 --- a/tree-sitter-stack-graphs/README.md +++ b/tree-sitter-stack-graphs/README.md @@ -14,7 +14,7 @@ To use this library, add the following to your `Cargo.toml`: ```toml [dependencies] -tree-sitter-stack-graphs = "0.9" +tree-sitter-stack-graphs = "0.10" ``` Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs/*/) for more details on how to use this library. diff --git a/tree-sitter-stack-graphs/src/cli/init.rs b/tree-sitter-stack-graphs/src/cli/init.rs index f71890390..e513e5acd 100644 --- a/tree-sitter-stack-graphs/src/cli/init.rs +++ b/tree-sitter-stack-graphs/src/cli/init.rs @@ -778,7 +778,7 @@ impl ProjectSettings<'_> { cancellation_flag: &dyn CancellationFlag, ) -> Result {{ LanguageConfiguration::from_sources( - {}::language(), + {}::LANGUAGE.into(), Some(String::from("source.{}")), None, vec![String::from("{}")], diff --git a/tree-sitter-stack-graphs/src/cli/load.rs b/tree-sitter-stack-graphs/src/cli/load.rs index b32332f9d..1fd22fa2b 100644 --- a/tree-sitter-stack-graphs/src/cli/load.rs +++ b/tree-sitter-stack-graphs/src/cli/load.rs @@ -67,7 +67,7 @@ impl PathLoaderArgs { builtins_paths, )? } else { - let loader_config = TsConfig::load() + let loader_config = TsConfig::load(None) .and_then(|v| v.get()) .map_err(LoadError::TreeSitter)?; Loader::from_tree_sitter_configuration( diff --git a/tree-sitter-stack-graphs/src/cli/lsp.rs b/tree-sitter-stack-graphs/src/cli/lsp.rs index 03f1c8060..57ed770bb 100644 --- a/tree-sitter-stack-graphs/src/cli/lsp.rs +++ b/tree-sitter-stack-graphs/src/cli/lsp.rs @@ -560,25 +560,6 @@ impl FromStdError for std::result::Result { } } -trait FromAnyhowError { - #[must_use] - fn from_error(self) -> Result; -} - -impl FromAnyhowError for std::result::Result { - #[must_use] - fn from_error(self) -> Result { - match self { - Ok(value) => Ok(value), - Err(err) => Err(Error { - code: ErrorCode::ServerError(-1), - message: err.to_string(), - data: None, - }), - } - } -} - #[derive(Debug)] pub enum Job { IndexPath(PathBuf), diff --git a/tree-sitter-stack-graphs/src/cli/match.rs b/tree-sitter-stack-graphs/src/cli/match.rs index 108c8450e..889d2374a 100644 --- a/tree-sitter-stack-graphs/src/cli/match.rs +++ b/tree-sitter-stack-graphs/src/cli/match.rs @@ -49,7 +49,7 @@ impl MatchArgs { None => return Err(anyhow!("No stack graph language found")), }; let source = file_reader.get(&self.source_path)?; - let tree = parse(lc.language, &self.source_path, source)?; + let tree = parse(&lc.language, &self.source_path, source)?; if self.stanza.is_empty() { lc.sgl.tsg.try_visit_matches(&tree, source, true, |mat| { print_matches(lc.sgl.tsg_path(), &self.source_path, source, mat) diff --git a/tree-sitter-stack-graphs/src/cli/parse.rs b/tree-sitter-stack-graphs/src/cli/parse.rs index aff7681b1..64275b915 100644 --- a/tree-sitter-stack-graphs/src/cli/parse.rs +++ b/tree-sitter-stack-graphs/src/cli/parse.rs @@ -40,14 +40,14 @@ impl ParseArgs { None => return Err(anyhow!("No stack graph language found")), }; let source = file_reader.get(&self.source_path)?; - let tree = parse(lang, &self.source_path, source)?; + let tree = parse(&lang, &self.source_path, source)?; print_tree(tree); Ok(()) } } pub(super) fn parse( - language: tree_sitter::Language, + language: &tree_sitter::Language, path: &Path, source: &str, ) -> anyhow::Result { diff --git a/tree-sitter-stack-graphs/src/cli/test.rs b/tree-sitter-stack-graphs/src/cli/test.rs index 1bff78a48..e3034cbbf 100644 --- a/tree-sitter-stack-graphs/src/cli/test.rs +++ b/tree-sitter-stack-graphs/src/cli/test.rs @@ -432,7 +432,7 @@ impl TestArgs { .add_from_graph(&lc.builtins) .map_err(|h| anyhow!("Duplicate builtin file {}", &graph[h]))?; let files = files.into_iter().collect::>(); - match cache.entry(lc.language) { + match cache.entry(lc.language.clone()) { Entry::Occupied(o) => { o.get().load_into(graph, partials, db)?; } diff --git a/tree-sitter-stack-graphs/src/lib.rs b/tree-sitter-stack-graphs/src/lib.rs index 717214832..3c560fb56 100644 --- a/tree-sitter-stack-graphs/src/lib.rs +++ b/tree-sitter-stack-graphs/src/lib.rs @@ -324,7 +324,7 @@ //! import sys //! print(sys.path) //! "#; -//! let grammar = tree_sitter_python::language(); +//! let grammar = tree_sitter_python::LANGUAGE.into(); //! let tsg_source = STACK_GRAPH_RULES; //! let mut language = StackGraphLanguage::from_str(grammar, tsg_source)?; //! let mut stack_graph = StackGraph::new(); @@ -479,7 +479,7 @@ impl StackGraphLanguage { language: tree_sitter::Language, tsg_source: &str, ) -> Result { - let tsg = tree_sitter_graph::ast::File::from_str(language, tsg_source)?; + let tsg = tree_sitter_graph::ast::File::from_str(language.clone(), tsg_source)?; Ok(StackGraphLanguage { language, tsg, @@ -518,8 +518,8 @@ impl StackGraphLanguage { &mut self.functions } - pub fn language(&self) -> tree_sitter::Language { - self.language + pub fn language(&self) -> &tree_sitter::Language { + &self.language } /// Returns the original TSG path, if it was provided at construction or set with @@ -624,7 +624,7 @@ impl<'a> Builder<'a> { ) -> Result<(), BuildError> { let tree = { let mut parser = Parser::new(); - parser.set_language(self.sgl.language)?; + parser.set_language(&self.sgl.language)?; let ts_cancellation_flag = TreeSitterCancellationFlag::from(cancellation_flag); // The parser.set_cancellation_flag` is unsafe, because it does not tie the // lifetime of the parser to the lifetime of the cancellation flag in any way. diff --git a/tree-sitter-stack-graphs/src/loader.rs b/tree-sitter-stack-graphs/src/loader.rs index 14aa97916..861e4ff95 100644 --- a/tree-sitter-stack-graphs/src/loader.rs +++ b/tree-sitter-stack-graphs/src/loader.rs @@ -68,13 +68,12 @@ impl LanguageConfiguration { builtins_config: Option<&str>, cancellation_flag: &dyn CancellationFlag, ) -> Result> { - let sgl = StackGraphLanguage::from_source(language, tsg_path.clone(), tsg_source).map_err( - |err| LoadError::SglParse { - inner: err, - tsg_path, - tsg: Cow::from(tsg_source), - }, - )?; + let sgl = StackGraphLanguage::from_source(language.clone(), tsg_path.clone(), tsg_source) + .map_err(|err| LoadError::SglParse { + inner: err, + tsg_path, + tsg: Cow::from(tsg_source), + })?; let mut builtins = StackGraph::new(); if let Some((builtins_path, builtins_source)) = builtins_source { let mut builtins_globals = Variables::new(); @@ -273,7 +272,7 @@ impl Loader { &mut self, path: &Path, content: &mut dyn ContentProvider, - ) -> Result, LoadError<'static>> { + ) -> Result, LoadError<'static>> { match &mut self.0 { LoaderImpl::Paths(loader) => loader.load_tree_sitter_language_for_file(path, content), LoaderImpl::Provided(loader) => { @@ -496,10 +495,10 @@ impl LanguageConfigurationsLoader { &mut self, path: &Path, content: &mut dyn ContentProvider, - ) -> Result, LoadError<'static>> { + ) -> Result, LoadError<'static>> { for configuration in self.configurations.iter() { if configuration.matches_file(path, content)? { - return Ok(Some(configuration.language)); + return Ok(Some(&configuration.language)); } } Ok(None) @@ -567,9 +566,9 @@ impl PathLoader { &mut self, path: &Path, content: &mut dyn ContentProvider, - ) -> Result, LoadError<'static>> { + ) -> Result, LoadError<'static>> { if let Some(selected_language) = self.select_language_for_file(path, content)? { - return Ok(Some(selected_language.language)); + return Ok(Some(&selected_language.language)); } Ok(None) } @@ -591,7 +590,7 @@ impl PathLoader { Some(index) => index, None => { let tsg = self.load_tsg_from_paths(&language)?; - let sgl = StackGraphLanguage::new(language.language, tsg); + let sgl = StackGraphLanguage::new(language.language.clone(), tsg); let mut builtins = StackGraph::new(); self.load_builtins_from_paths_into( @@ -602,7 +601,7 @@ impl PathLoader { )?; let lc = LanguageConfiguration { - language: language.language, + language: language.language.clone(), scope: language.scope, content_regex: language.content_regex, file_types: language.file_types, @@ -696,7 +695,7 @@ impl PathLoader { } if tsg_path.exists() { let tsg_source = std::fs::read_to_string(tsg_path)?; - return Loader::load_tsg(language.language, Cow::from(tsg_source)); + return Loader::load_tsg(language.language.clone(), Cow::from(tsg_source)); } } return Err(LoadError::NoTsgFound); @@ -786,10 +785,11 @@ impl SupplementedTsLoader { .map_err(LoadError::TreeSitter)?; let configurations = self .0 - .find_language_configurations_at_path(&path) + .find_language_configurations_at_path(&path, true) .map_err(LoadError::TreeSitter)?; let languages = languages .into_iter() + .map(|(l, _)| l) .zip(configurations.into_iter()) .map(SupplementedLanguage::from) .filter(|language| scope.map_or(true, |scope| language.matches_scope(scope))) diff --git a/tree-sitter-stack-graphs/tests/it/builder.rs b/tree-sitter-stack-graphs/tests/it/builder.rs index 14476111e..719e25d71 100644 --- a/tree-sitter-stack-graphs/tests/it/builder.rs +++ b/tree-sitter-stack-graphs/tests/it/builder.rs @@ -35,7 +35,7 @@ fn can_support_preexisting_nodes() { .add(FILE_PATH_VAR.into(), file_name.into()) .expect("failed to add file path variable"); - let language = StackGraphLanguage::from_str(tree_sitter_python::language(), tsg).unwrap(); + let language = StackGraphLanguage::from_str(tree_sitter_python::LANGUAGE.into(), tsg).unwrap(); language .build_stack_graph_into(&mut graph, file, python, &globals, &NoCancellation) .expect("Failed to build graph"); @@ -59,7 +59,7 @@ fn can_support_injected_nodes() { let node_id = graph.new_node_id(file); let _preexisting_node = graph.add_scope_node(node_id, true).unwrap(); - let language = StackGraphLanguage::from_str(tree_sitter_python::language(), tsg).unwrap(); + let language = StackGraphLanguage::from_str(tree_sitter_python::LANGUAGE.into(), tsg).unwrap(); let mut builder = language.builder_into_stack_graph(&mut graph, file, python); let mut globals = Variables::new(); diff --git a/tree-sitter-stack-graphs/tests/it/loader.rs b/tree-sitter-stack-graphs/tests/it/loader.rs index 257326952..401af46e5 100644 --- a/tree-sitter-stack-graphs/tests/it/loader.rs +++ b/tree-sitter-stack-graphs/tests/it/loader.rs @@ -9,6 +9,7 @@ use once_cell::sync::Lazy; use pretty_assertions::assert_eq; use stack_graphs::graph::StackGraph; use std::path::PathBuf; +use tree_sitter::Language; use tree_sitter_stack_graphs::loader::FileAnalyzers; use tree_sitter_stack_graphs::loader::LanguageConfiguration; use tree_sitter_stack_graphs::loader::Loader; @@ -25,10 +26,10 @@ static TSG: Lazy = Lazy::new(|| { #[test] fn can_load_from_provided_language_configuration() { - let language = tree_sitter_python::language(); - let sgl = StackGraphLanguage::from_str(language, &TSG).unwrap(); + let language: Language = tree_sitter_python::LANGUAGE.into(); + let sgl = StackGraphLanguage::from_str(language.clone(), &TSG).unwrap(); let lc = LanguageConfiguration { - language: language, + language: language.clone(), scope: Some("source.py".into()), content_regex: None, file_types: vec!["py".into()], @@ -43,10 +44,10 @@ fn can_load_from_provided_language_configuration() { let tsl = loader .load_tree_sitter_language_for_file(&PATH, &mut None) .expect("Expected loading tree-sitter language to succeed"); - assert_eq!(tsl, Some(language)); + assert_eq!(tsl, Some(&language)); let lc = loader .load_for_file(&PATH, &mut None, &NoCancellation) .expect("Expected loading stack graph language to succeed"); - assert_eq!(lc.primary.map(|lc| lc.language), Some(language)); + assert_eq!(lc.primary.map(|lc| &lc.language), Some(&language)); } diff --git a/tree-sitter-stack-graphs/tests/it/main.rs b/tree-sitter-stack-graphs/tests/it/main.rs index 33ee19241..01cfd9754 100644 --- a/tree-sitter-stack-graphs/tests/it/main.rs +++ b/tree-sitter-stack-graphs/tests/it/main.rs @@ -28,7 +28,7 @@ pub(self) fn build_stack_graph( ) -> Result<(StackGraph, Handle), BuildError> { let file_name = "test.py"; let language = - StackGraphLanguage::from_str(tree_sitter_python::language(), tsg_source).unwrap(); + StackGraphLanguage::from_str(tree_sitter_python::LANGUAGE.into(), tsg_source).unwrap(); let mut graph = StackGraph::new(); let file = graph.get_or_create_file(file_name); let mut globals = Variables::new(); diff --git a/tree-sitter-stack-graphs/tests/it/test.rs b/tree-sitter-stack-graphs/tests/it/test.rs index cb1efff4f..fae14fe76 100644 --- a/tree-sitter-stack-graphs/tests/it/test.rs +++ b/tree-sitter-stack-graphs/tests/it/test.rs @@ -73,7 +73,7 @@ fn build_stack_graph_into( globals: &Variables, ) -> Result<(), BuildError> { let language = - StackGraphLanguage::from_str(tree_sitter_python::language(), tsg_source).unwrap(); + StackGraphLanguage::from_str(tree_sitter_python::LANGUAGE.into(), tsg_source).unwrap(); language.build_stack_graph_into(graph, file, python_source, globals, &NoCancellation)?; Ok(()) } From c0ecac035f0905831ee8e328a1658b96c8ed704e Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Tue, 10 Dec 2024 19:18:15 +0100 Subject: [PATCH 184/202] Handle additional case --- .../tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg | 4 ++-- .../test/expressions/member_expression.js | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg index a9167c3a1..7ca4eee88 100644 --- a/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-javascript/src/stack-graphs.tsg @@ -2435,7 +2435,7 @@ inherit .containing_class_value [ (primary_expression/identifier)@variable - (member_expression . (identifier)@variable) + (member_expression object:(identifier)@variable) ] { ; value is a lookup, ie a push attr (@variable.value) node_reference = @variable @@ -3189,7 +3189,7 @@ inherit .containing_class_value ;; ##### Member Expressions (member_expression - (_)@object . (_)@property)@member_expr + object:(_)@object property:(_)@property)@member_expr { node member_push diff --git a/languages/tree-sitter-stack-graphs-javascript/test/expressions/member_expression.js b/languages/tree-sitter-stack-graphs-javascript/test/expressions/member_expression.js index b397d747a..438cf9dd6 100644 --- a/languages/tree-sitter-stack-graphs-javascript/test/expressions/member_expression.js +++ b/languages/tree-sitter-stack-graphs-javascript/test/expressions/member_expression.js @@ -15,4 +15,8 @@ let x = 1; // Flow around /**/ x; +// ^ defined: 1 + +// Optional chain +/**/ x?.foo // ^ defined: 1 \ No newline at end of file From ba2117d75ff56dd4adf7032f18d07ed9c1dac26a Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Tue, 10 Dec 2024 19:32:18 +0100 Subject: [PATCH 185/202] Fix panic --- stack-graphs/CHANGELOG.md | 6 ++++++ stack-graphs/Cargo.toml | 2 +- stack-graphs/src/graph.rs | 5 ++++- stack-graphs/tests/it/graph.rs | 21 ++++++++++++++++++++- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/stack-graphs/CHANGELOG.md b/stack-graphs/CHANGELOG.md index eeaae0730..aae6a2998 100644 --- a/stack-graphs/CHANGELOG.md +++ b/stack-graphs/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.14.1 -- Unpublished + +### Fixed + +- A panic when using `StackGraph::incoming_edge_degree` on some nodes without incoming edges. + ## v0.14.0 -- 2024-07-09 ### Changed diff --git a/stack-graphs/Cargo.toml b/stack-graphs/Cargo.toml index f114fffdb..e542f4163 100644 --- a/stack-graphs/Cargo.toml +++ b/stack-graphs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "stack-graphs" -version = "0.14.0" +version = "0.14.1" description = "Name binding for arbitrary programming languages" homepage = "https://github.com/github/stack-graphs/tree/main/stack-graphs" repository = "https://github.com/github/stack-graphs/" diff --git a/stack-graphs/src/graph.rs b/stack-graphs/src/graph.rs index 686344ee5..d55dfc48a 100644 --- a/stack-graphs/src/graph.rs +++ b/stack-graphs/src/graph.rs @@ -1334,7 +1334,10 @@ impl StackGraph { /// Returns the number of edges that end at a particular sink node. pub fn incoming_edge_degree(&self, sink: Handle) -> Degree { - self.incoming_edges[sink] + self.incoming_edges + .get(sink) + .cloned() + .unwrap_or(Degree::Zero) } } diff --git a/stack-graphs/tests/it/graph.rs b/stack-graphs/tests/it/graph.rs index f19bb2c30..620d066c9 100644 --- a/stack-graphs/tests/it/graph.rs +++ b/stack-graphs/tests/it/graph.rs @@ -8,7 +8,7 @@ use std::collections::HashSet; use maplit::hashset; -use stack_graphs::graph::StackGraph; +use stack_graphs::graph::{Degree, StackGraph}; use crate::test_graphs; use crate::test_graphs::CreateStackGraph; @@ -196,3 +196,22 @@ fn can_add_graph_to_empty_graph() { ); } } + +#[test] +fn can_get_incoming_edges() { + let mut graph = StackGraph::new(); + let file = graph.get_or_create_file("test.py"); + let h1 = graph.internal_scope(file, 0); + let h2 = graph.internal_scope(file, 1); + let h3 = graph.internal_scope(file, 2); + assert_eq!(Degree::Zero, graph.incoming_edge_degree(h1)); + assert_eq!(Degree::Zero, graph.incoming_edge_degree(h2)); + assert_eq!(Degree::Zero, graph.incoming_edge_degree(h3)); + graph.add_edge(h1, h2, 0); + graph.add_edge(h3, h2, 0); + assert_eq!(Degree::Zero, graph.incoming_edge_degree(h1)); + assert_eq!(Degree::Multiple, graph.incoming_edge_degree(h2)); + assert_eq!(Degree::Zero, graph.incoming_edge_degree(h3)); + graph.add_edge(h3, h1, 0); + assert_eq!(Degree::One, graph.incoming_edge_degree(h1)); +} From ba182ad26c0a70b2580070e7c61ca254e1cf9aa4 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Wed, 11 Dec 2024 15:24:54 +0100 Subject: [PATCH 186/202] Fix previously skipped tests --- .../src/stack-graphs.tsg | 235 ++++++++---------- ...e_name.tsx.skip => jsx_namespace_name.tsx} | 0 ...mespace.ts.skip => very-deep-namespace.ts} | 0 ...sted-namespace-by-fully-qualified-name.ts} | 0 ...fied-namespace-by-fully-qualified-name.ts} | 0 5 files changed, 106 insertions(+), 129 deletions(-) rename languages/tree-sitter-stack-graphs-typescript/test/jsx/{jsx_namespace_name.tsx.skip => jsx_namespace_name.tsx} (100%) rename languages/tree-sitter-stack-graphs-typescript/test/modules/{very-deep-namespace.ts.skip => very-deep-namespace.ts} (100%) rename languages/tree-sitter-stack-graphs-typescript/test/statements/{refer-to-interface-in-nested-namespace-by-fully-qualified-name.ts.skip => refer-to-interface-in-nested-namespace-by-fully-qualified-name.ts} (100%) rename languages/tree-sitter-stack-graphs-typescript/test/statements/{refer-to-interface-in-qualified-namespace-by-fully-qualified-name.ts.skip => refer-to-interface-in-qualified-namespace-by-fully-qualified-name.ts} (100%) diff --git a/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg b/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg index a32c717f5..773abde7c 100644 --- a/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg +++ b/languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg @@ -627,16 +627,6 @@ attribute node_symbol = node => symbol = (source-text node), source_n (import_statement "type"?@is_type (import_clause (named_imports (import_specifier name:(_)@name))@clause)) ] { if none @is_type { - node @name.expr_def - node @name.expr_def__ns - node @name.expr_ref - node @name.expr_ref__ns - - ; expr reference - attr (@name.expr_ref) node_reference = @name - edge @name.expr_ref -> @name.expr_ref__ns - ; - attr (@name.expr_ref__ns) push_symbol = "%E" edge @name.expr_ref__ns -> @clause.lexical_scope } } @@ -646,6 +636,9 @@ if none @is_type { (import_statement "type"?@is_type (import_clause (named_imports (import_specifier name:(_)@name !alias))@clause)) ] { if none @is_type { + node @name.expr_def + node @name.expr_def__ns + ; expr definition edge @clause.defs -> @name.expr_def__ns ; FIXME defs, lexical_defs? ; @@ -664,7 +657,6 @@ if none @is_type { if none @is_type { node @alias.expr_def node @alias.expr_def__ns - node @alias.expr_ref ; expr definition edge @clause.defs -> @alias.expr_def__ns @@ -2340,6 +2332,12 @@ if none @is_async { (ambient_declaration (module name:(string) @name)) ; X._ (nested_identifier object:(identifier)@name) + ; _.X._ + (member_expression object:(identifier)@name) + ; _.X + (nested_identifier property:(_)@name) + ; _._.X + (member_expression property:(_)@name) ] { node @name.expr_def node expr_def_typeof @@ -2362,7 +2360,10 @@ if none @is_async { edge @name.type_def -> @name.type_def_member } -(nested_identifier object:(_)@mod) @nested { +[ + (nested_identifier object:(_)@mod) + (member_expression object:[(member_expression) (identifier)]@mod) +]@nested { node @nested.expr_def node @nested.type_def @@ -2370,12 +2371,18 @@ if none @is_async { edge @nested.type_def -> @mod.type_def } -(nested_identifier object:(_)@mod property:(_)@name) { +[ + (nested_identifier object:(_)@mod property:(_)@name) + (member_expression object:[(member_expression) (identifier)]@mod property:(_)@name) +] { edge @mod.expr_def_member -> @name.expr_def edge @mod.type_def_member -> @name.type_def } -(nested_identifier property:(_)@name)@nested { +[ + (nested_identifier property:(_)@name) + (member_expression property:(_)@name) +]@nested { node @nested.expr_def_member node @nested.type_def_member @@ -2782,105 +2789,13 @@ if none @is_async { ; x; -[ - (primary_expression/identifier)@name - ; FIXME expansion of _lhs_expression/identifier and _augmented_assignment_lhs - (for_in_statement ["var" "let" "const"]?@is_def left:(identifier)@name) - (assignment_expression left:(identifier)@name) - (augmented_assignment_expression left:(identifier)@name) - (asserts (identifier)@name) - (type_predicate name:(identifier)@name) - ; FIXME type_query has its own restricted expression production - ; we need to do this for every (identifier) inside a type query - ; this cannot be expressed, so we manually unroll three levels here - (type_query (identifier)@name) - (type_query (member_expression object:(identifier)@name)) - (type_query (member_expression object:(member_expression object:(identifier)@name))) - (type_query (member_expression object:(member_expression object:(member_expression object:(identifier)@name)))) - (type_query (subscript_expression object:(identifier)@name)) - (type_query (subscript_expression object:(member_expression object:(identifier)@name))) - (type_query (subscript_expression object:(member_expression object:(member_expression object:(identifier)@name)))) - (type_query (call_expression function:(identifier)@name)) - (type_query (call_expression function:(member_expression object:(identifier)@name))) - (type_query (call_expression function:(member_expression object:(member_expression object:(identifier)@name)))) - (type_query (call_expression function:(member_expression object:(member_expression object:(member_expression object:(identifier)@name))))) - (type_query (call_expression function:(subscript_expression object:(identifier)@name))) - (type_query (call_expression function:(subscript_expression object:(member_expression object:(identifier)@name)))) - (type_query (call_expression function:(subscript_expression object:(member_expression object:(member_expression object:(identifier)@name))))) - ; FIXME decorator has its own restricted expression production - ; we need to do this for every (identifier) inside a decorator - ; this cannot be expressed, so we manually unroll three levels here - (decorator (identifier)@name) - (decorator (member_expression object:(identifier)@name)) - (decorator (member_expression object:(member_expression object:(identifier)@name))) - (decorator (member_expression object:(member_expression object:(member_expression object:(identifier)@name)))) - (decorator (call_expression function:(identifier)@name)) - (decorator (call_expression function:(member_expression object:(identifier)@name))) - (decorator (call_expression function:(member_expression object:(member_expression object:(identifier)@name)))) - (decorator (call_expression function:(member_expression object:(member_expression object:(member_expression object:(identifier)@name))))) -; #dialect tsx - (nested_identifier object:(_)@name) - (nested_type_identifier module:(nested_identifier)@name) - (internal_module name:(_)@name) - (jsx_opening_element name: (_)@name) - (jsx_closing_element name: (_)@name) - (jsx_self_closing_element name: (_)@name) -; #end -] { -if none @is_def { +(identifier)@name { node @name.cotype node @name.lexical_defs node @name.lexical_scope node @name.type node @name.var_defs -} -} -[ - (primary_expression/identifier)@name - (decorator (identifier)@name) - ; FIXME expansion of _lhs_expression/identifier and _augmented_assignment_lhs - ; we need to do this for every (identifier) inside a type query - ; this cannot be expressed, so we manually unroll three levels here - (for_in_statement ["var" "let" "const"]?@is_def left:(identifier)@name) - (assignment_expression left:(identifier)@name) - (augmented_assignment_expression left:(identifier)@name) - (asserts (identifier)@name) - (type_predicate name:(identifier)@name) - ; FIXME type_query has its own restricted expression production - (type_query (identifier)@name) - (type_query (member_expression object:(identifier)@name)) - (type_query (member_expression object:(member_expression object:(identifier)@name))) - (type_query (member_expression object:(member_expression object:(member_expression object:(identifier)@name)))) - (type_query (subscript_expression object:(identifier)@name)) - (type_query (subscript_expression object:(member_expression object:(identifier)@name))) - (type_query (subscript_expression object:(member_expression object:(member_expression object:(identifier)@name)))) - (type_query (call_expression function:(identifier)@name)) - (type_query (call_expression function:(member_expression object:(identifier)@name))) - (type_query (call_expression function:(member_expression object:(member_expression object:(identifier)@name)))) - (type_query (call_expression function:(member_expression object:(member_expression object:(member_expression object:(identifier)@name))))) - (type_query (call_expression function:(subscript_expression object:(identifier)@name))) - (type_query (call_expression function:(subscript_expression object:(member_expression object:(identifier)@name)))) - (type_query (call_expression function:(subscript_expression object:(member_expression object:(member_expression object:(identifier)@name))))) - ; FIXME decorator has its own restricted expression production - ; we need to do this for every (identifier) inside a decorator - ; this cannot be expressed, so we manually unroll three levels here - (decorator (identifier)@name) - (decorator (member_expression object:(identifier)@name)) - (decorator (member_expression object:(member_expression object:(identifier)@name))) - (decorator (member_expression object:(member_expression object:(member_expression object:(identifier)@name)))) - (decorator (call_expression function:(identifier)@name)) - (decorator (call_expression function:(member_expression object:(identifier)@name))) - (decorator (call_expression function:(member_expression object:(member_expression object:(identifier)@name)))) - (decorator (call_expression function:(member_expression object:(member_expression object:(member_expression object:(identifier)@name))))) -; #dialect tsx -; (nested_identifier object:(identifier)@name property:(identifier)) ; to pick up foo in JSX: ; FIXME never matched - (jsx_opening_element name: (identifier)@name) - (jsx_closing_element name: (identifier)@name) - (jsx_self_closing_element name: (identifier)@name) -; #end -] { -if none @is_def { node @name.expr_ref node @name.expr_ref__ns node @name.expr_ref__typeof @@ -2898,7 +2813,67 @@ if none @is_def { attr (@name.expr_ref__typeof) push_symbol = ":" edge @name.expr_ref__typeof -> @name.expr_ref } -} + +; [ +; (primary_expression/identifier)@name +; ; FIXME expansion of _lhs_expression/identifier and _augmented_assignment_lhs +; ; we need to do this for every (identifier) inside a type query +; ; this cannot be expressed, so we manually unroll three levels here +; (for_in_statement ["var" "let" "const"]?@is_def left:(identifier)@name) +; (assignment_expression left:(identifier)@name) +; (augmented_assignment_expression left:(identifier)@name) +; (asserts (identifier)@name) +; (type_predicate name:(identifier)@name) +; ; FIXME type_query has its own restricted expression production +; ; we need to do this for every (identifier) inside a type query +; ; this cannot be expressed, so we manually unroll three levels here +; (type_query (identifier)@name) +; (type_query (member_expression object:(identifier)@name)) +; (type_query (member_expression object:(member_expression object:(identifier)@name))) +; (type_query (member_expression object:(member_expression object:(member_expression object:(identifier)@name)))) +; (type_query (subscript_expression object:(identifier)@name)) +; (type_query (subscript_expression object:(member_expression object:(identifier)@name))) +; (type_query (subscript_expression object:(member_expression object:(member_expression object:(identifier)@name)))) +; (type_query (call_expression function:(identifier)@name)) +; (type_query (call_expression function:(member_expression object:(identifier)@name))) +; (type_query (call_expression function:(member_expression object:(member_expression object:(identifier)@name)))) +; (type_query (call_expression function:(member_expression object:(member_expression object:(member_expression object:(identifier)@name))))) +; (type_query (call_expression function:(subscript_expression object:(identifier)@name))) +; (type_query (call_expression function:(subscript_expression object:(member_expression object:(identifier)@name)))) +; (type_query (call_expression function:(subscript_expression object:(member_expression object:(member_expression object:(identifier)@name))))) +; ; FIXME decorator has its own restricted expression production +; ; we need to do this for every (identifier) inside a decorator +; ; this cannot be expressed, so we manually unroll three levels here +; (decorator (identifier)@name) +; (decorator (member_expression object:(identifier)@name)) +; (decorator (member_expression object:(member_expression object:(identifier)@name))) +; (decorator (member_expression object:(member_expression object:(member_expression object:(identifier)@name)))) +; (decorator (call_expression function:(identifier)@name)) +; (decorator (call_expression function:(member_expression object:(identifier)@name))) +; (decorator (call_expression function:(member_expression object:(member_expression object:(identifier)@name)))) +; (decorator (call_expression function:(member_expression object:(member_expression object:(member_expression object:(identifier)@name))))) +; ; FIXME nested_identifier has its own restricted expression production +; ; we need to do this for every (identifier) inside a decorator +; ; this cannot be expressed, so we manually unroll three levels here +; (nested_identifier object:(identifier)@name) +; (nested_identifier object:(member_expression object:(identifier)@name)) +; (nested_identifier object:(member_expression object:(member_expression object:(identifier)@name))) +; (nested_identifier object:(member_expression object:(member_expression object:(member_expression object:(identifier)@name)))) +; ; #dialect tsx +; (jsx_opening_element name: (identifier)@name) +; (jsx_closing_element name: (identifier)@name) +; (jsx_self_closing_element name: (identifier)@name) +; ; #end +; ] { +; if none @is_def { +; ; node @name.cotype +; ; node @name.lexical_defs +; ; node @name.lexical_scope +; ; node @name.type +; ; node @name.var_defs + +; } +; } @@ -3551,12 +3526,10 @@ if none @is_async { ; (member_expression (identifier) (property_identifier)) ; (subscript_expression (identifier) (string)) -[ - (member_expression object:(_)@object property:(_)@prop)@member_expr -; #dialect tsx -; (nested_identifier object:(_)@object property:(identifier)@prop)@member_expr ; FIXME this never matched anything! -; #end - ] { +(member_expression + object:(_)@object + property:(_)@prop +)@member_expr { node @member_expr.member node @prop.expr_ref node @prop.expr_ref__typeof @@ -3578,7 +3551,6 @@ if none @is_async { edge @prop.expr_ref__typeof -> @prop.expr_ref } - (subscript_expression object: (_)@object index: (_)@index @@ -4158,16 +4130,6 @@ if none @is_async { node @pat.defs } -[ ; NOTE these are the ones not also variables - (for_in_statement ["var" "let" "const"] left:(identifier)@name) - (variable_declarator name:(identifier)@name) - (pattern/identifier)@name - (rest_pattern (identifier)@name) -] { - node @name.cotype - node @name.lexical_scope -} - [ (for_in_statement ["var" "let" "const"] left:(identifier)@name) (variable_declarator name:(identifier)@name) @@ -5603,8 +5565,14 @@ if none @is_acc { [ ; X (nested_type_identifier module:(identifier)@name) - ; X._, _.X._ + ; X._ (nested_identifier object:(identifier)@name) + ; _.X._ + (member_expression object:(identifier)@name) + ; _.X + (nested_identifier property:(_)@name) + ; _._.X + (member_expression property:(_)@name) ] { node @name.type_ref attr (@name.type_ref) node_reference = @name @@ -5615,16 +5583,25 @@ if none @is_acc { edge @name.type_ref_member -> @name.type_ref } -(nested_identifier object:(_)@mod) @nested { +[ + (nested_identifier object:(_)@mod) + (member_expression object:[(member_expression) (identifier)]@mod) +]@nested { node @nested.type_ref edge @mod.type_ref -> @nested.type_ref } -(nested_identifier . (_)@mod . (_)@name .) { +[ + (nested_identifier object:(_)@mod property:(_)@name) + (member_expression object:[(member_expression) (identifier)]@mod property:(_)@name) +] { edge @name.type_ref -> @mod.type_ref_member } -(nested_identifier property:(_)@name) @nested { +[ + (nested_identifier property:(_)@name) + (member_expression property:(_)@name) +]@nested { node @nested.type_ref_member edge @nested.type_ref_member -> @name.type_ref_member } diff --git a/languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_namespace_name.tsx.skip b/languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_namespace_name.tsx similarity index 100% rename from languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_namespace_name.tsx.skip rename to languages/tree-sitter-stack-graphs-typescript/test/jsx/jsx_namespace_name.tsx diff --git a/languages/tree-sitter-stack-graphs-typescript/test/modules/very-deep-namespace.ts.skip b/languages/tree-sitter-stack-graphs-typescript/test/modules/very-deep-namespace.ts similarity index 100% rename from languages/tree-sitter-stack-graphs-typescript/test/modules/very-deep-namespace.ts.skip rename to languages/tree-sitter-stack-graphs-typescript/test/modules/very-deep-namespace.ts diff --git a/languages/tree-sitter-stack-graphs-typescript/test/statements/refer-to-interface-in-nested-namespace-by-fully-qualified-name.ts.skip b/languages/tree-sitter-stack-graphs-typescript/test/statements/refer-to-interface-in-nested-namespace-by-fully-qualified-name.ts similarity index 100% rename from languages/tree-sitter-stack-graphs-typescript/test/statements/refer-to-interface-in-nested-namespace-by-fully-qualified-name.ts.skip rename to languages/tree-sitter-stack-graphs-typescript/test/statements/refer-to-interface-in-nested-namespace-by-fully-qualified-name.ts diff --git a/languages/tree-sitter-stack-graphs-typescript/test/statements/refer-to-interface-in-qualified-namespace-by-fully-qualified-name.ts.skip b/languages/tree-sitter-stack-graphs-typescript/test/statements/refer-to-interface-in-qualified-namespace-by-fully-qualified-name.ts similarity index 100% rename from languages/tree-sitter-stack-graphs-typescript/test/statements/refer-to-interface-in-qualified-namespace-by-fully-qualified-name.ts.skip rename to languages/tree-sitter-stack-graphs-typescript/test/statements/refer-to-interface-in-qualified-namespace-by-fully-qualified-name.ts From bba2dc482d1206209837f699f49527895c48619e Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 12 Dec 2024 12:32:35 +0100 Subject: [PATCH 187/202] Try updated runner image to fix valgrind problem --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d6ec91bb..f217e8140 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,9 @@ concurrency: jobs: test-rust: - runs-on: ubuntu-latest + # We force a newer runner version to fix a problem with Valgrind. + # Currently, ubuntu-latest is set to 22.04. Revert this back to ubuntu-latest once it is set to 24.04. + runs-on: ubuntu-24.04 strategy: matrix: rust: [stable] From aea8b85a19746326c8e707f6b10ea724b6f78c74 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 12 Dec 2024 12:06:30 +0000 Subject: [PATCH 188/202] Ignore Valgrind warnings introduced by Rust 1.83 --- .github/workflows/ci.yml | 4 +++ stack-graphs/valgrind.supp | 74 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 stack-graphs/valgrind.supp diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f217e8140..36cab862c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,6 +57,10 @@ jobs: - name: Run test suite under valgrind (default features) # We only need to use valgrind to test the crates that have C bindings. run: cargo valgrind test -p stack-graphs + env: + # Since Rust 1.83, Valgrind reports some possible leaks that cargo-valgrind + # treats as fatal. The given suppressions file makes sure these are ignored. + VALGRINDFLAGS: --suppressions=valgrind.supp - name: Ensure C headers are up to date run: | script/cbindgen diff --git a/stack-graphs/valgrind.supp b/stack-graphs/valgrind.supp new file mode 100644 index 000000000..3986abc5b --- /dev/null +++ b/stack-graphs/valgrind.supp @@ -0,0 +1,74 @@ +{ + rust-1.83-false-positive-1 + Memcheck:Param + statx(file_name) + fun:statx + fun:statx + fun:_ZN3std3sys3pal4unix2fs9try_statx17h2609435043bb8525E + fun:{closure#0} + fun:run_with_cstr_stack + fun:run_with_cstr + fun:run_path_with_cstr + fun:_ZN3std3sys3pal4unix2fs4stat17ha588398797a44835E + fun:metadata<&std::path::PathBuf> + fun:get_dbpath_for_term + fun:from_name + fun:_ZN4test4term8terminfo8TermInfo8from_env17h9b3ad5763ddd396cE + fun:new + fun:_ZN4test4term6stdout17hf274a19176f765bcE + fun:_ZN4test7console17run_tests_console17h3d81643311f50681E + fun:_ZN4test9test_main17h6c0fc3221ed0faa4E + fun:_ZN4test16test_main_static17h897b969e33229363E + fun:_ZN2it4main17hfbc3179ed1c35941E + fun:_ZN4core3ops8function6FnOnce9call_once17h945f64a17647f84cE + fun:_ZN3std3sys9backtrace28__rust_begin_short_backtrace17h41138d0332b09746E + fun:_ZN3std2rt10lang_start28_$u7b$$u7b$closure$u7d$$u7d$17h98fa5fc32f9b0a38E +} +{ + rust-1.83-false-positive-2 + Memcheck:Param + statx(buf) + fun:statx + fun:statx + fun:_ZN3std3sys3pal4unix2fs9try_statx17h2609435043bb8525E + fun:{closure#0} + fun:run_with_cstr_stack + fun:run_with_cstr + fun:run_path_with_cstr + fun:_ZN3std3sys3pal4unix2fs4stat17ha588398797a44835E + fun:metadata<&std::path::PathBuf> + fun:get_dbpath_for_term + fun:from_name + fun:_ZN4test4term8terminfo8TermInfo8from_env17h9b3ad5763ddd396cE + fun:new + fun:_ZN4test4term6stdout17hf274a19176f765bcE + fun:_ZN4test7console17run_tests_console17h3d81643311f50681E + fun:_ZN4test9test_main17h6c0fc3221ed0faa4E + fun:_ZN4test16test_main_static17h897b969e33229363E + fun:_ZN2it4main17hfbc3179ed1c35941E + fun:_ZN4core3ops8function6FnOnce9call_once17h945f64a17647f84cE + fun:_ZN3std3sys9backtrace28__rust_begin_short_backtrace17h41138d0332b09746E + fun:_ZN3std2rt10lang_start28_$u7b$$u7b$closure$u7d$$u7d$17h98fa5fc32f9b0a38E +} +{ + rust-1.83-false-positive-3 + Memcheck:Leak + match-leak-kinds: possible + fun:malloc + fun:alloc + fun:alloc_impl + fun:allocate + fun:{closure#0} + fun:allocate_for_layout, alloc::sync::{impl#14}::new_uninit::{closure_env#0}, fn(*mut u8) -> *mut alloc::sync::ArcInner>> + fun:new_uninit + fun:new_inner + fun:new_main + fun:init + fun:{closure#0} + fun:do_call + fun:try<(), std::rt::lang_start_internal::{closure_env#0}> + fun:catch_unwind + fun:_ZN3std2rt19lang_start_internal17h1c66660c99c8424cE + fun:_ZN3std2rt10lang_start17hb778ad044944e8a4E + fun:main +} From af722227cfdffc9823bb40c39be89cfcc763b5ef Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 12 Dec 2024 13:14:42 +0100 Subject: [PATCH 189/202] Set release dates --- languages/tree-sitter-stack-graphs-java/CHANGELOG.md | 2 +- languages/tree-sitter-stack-graphs-javascript/CHANGELOG.md | 2 +- languages/tree-sitter-stack-graphs-python/CHANGELOG.md | 2 +- lsp-positions/CHANGELOG.md | 2 +- stack-graphs/CHANGELOG.md | 2 +- tree-sitter-stack-graphs/CHANGELOG.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-java/CHANGELOG.md b/languages/tree-sitter-stack-graphs-java/CHANGELOG.md index 23400faf0..d295d8ce0 100644 --- a/languages/tree-sitter-stack-graphs-java/CHANGELOG.md +++ b/languages/tree-sitter-stack-graphs-java/CHANGELOG.md @@ -5,7 +5,7 @@ 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.5.0 -- Unreleased +## v0.5.0 -- 2024-12-12 - The `tree-sitter-stack-graphs` dependency is updated to version 0.10. diff --git a/languages/tree-sitter-stack-graphs-javascript/CHANGELOG.md b/languages/tree-sitter-stack-graphs-javascript/CHANGELOG.md index 10f85abdd..ae90a2f01 100644 --- a/languages/tree-sitter-stack-graphs-javascript/CHANGELOG.md +++ b/languages/tree-sitter-stack-graphs-javascript/CHANGELOG.md @@ -5,7 +5,7 @@ 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 +## v0.3.0 -- 2024-12-12 - The `tree-sitter-stack-graphs` dependency is updated to version 0.10. diff --git a/languages/tree-sitter-stack-graphs-python/CHANGELOG.md b/languages/tree-sitter-stack-graphs-python/CHANGELOG.md index 8ec44913d..f21aecc9f 100644 --- a/languages/tree-sitter-stack-graphs-python/CHANGELOG.md +++ b/languages/tree-sitter-stack-graphs-python/CHANGELOG.md @@ -5,7 +5,7 @@ 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 +## v0.3.0 -- 2024-12-12 - The `tree-sitter-stack-graphs` dependency is updated to version 0.10. diff --git a/lsp-positions/CHANGELOG.md b/lsp-positions/CHANGELOG.md index 84aa962b4..f80bc5c5d 100644 --- a/lsp-positions/CHANGELOG.md +++ b/lsp-positions/CHANGELOG.md @@ -5,7 +5,7 @@ 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.4 -- Unreleased +## v0.3.4 -- 2024-12-12 Upgraded the `tree-sitter` dependency to version 0.24. diff --git a/stack-graphs/CHANGELOG.md b/stack-graphs/CHANGELOG.md index aae6a2998..802275fc2 100644 --- a/stack-graphs/CHANGELOG.md +++ b/stack-graphs/CHANGELOG.md @@ -5,7 +5,7 @@ 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.14.1 -- Unpublished +## v0.14.1 -- 2024-12-12 ### Fixed diff --git a/tree-sitter-stack-graphs/CHANGELOG.md b/tree-sitter-stack-graphs/CHANGELOG.md index b45b69b64..e1df552e4 100644 --- a/tree-sitter-stack-graphs/CHANGELOG.md +++ b/tree-sitter-stack-graphs/CHANGELOG.md @@ -5,7 +5,7 @@ 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.10.0 -- Unreleased +## v0.10.0 -- 2024-12-12 Upgraded `tree-sitter` dependency to version 0.24. From 0bd07ba011ac7ae519e246af395e0c80d85eec8f Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 12 Dec 2024 13:19:48 +0100 Subject: [PATCH 190/202] Update test dependency version --- script/ci-test-init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/ci-test-init b/script/ci-test-init index c58532fd5..0ecc60788 100755 --- a/script/ci-test-init +++ b/script/ci-test-init @@ -7,7 +7,7 @@ cargo run --bin tree-sitter-stack-graphs --features cli -- init \ --language-id init_test \ --language-file-extension it \ --grammar-crate-name tree-sitter-python \ - --grammar-crate-version 0.20.0 \ + --grammar-crate-version 0.23.2 \ --internal \ --non-interactive From 68ce497b225fdccf34347d87b6458aca41b8bb5e Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 12 Dec 2024 13:51:20 +0100 Subject: [PATCH 191/202] Bump actions versions --- .github/workflows/ci.yml | 18 +++++------ .github/workflows/perf.yml | 30 +++++++++---------- .github/workflows/publish-lsp-positions.yml | 4 +-- .github/workflows/publish-stack-graphs.yml | 4 +-- .../publish-tree-sitter-stack-graphs-java.yml | 4 +-- ...sh-tree-sitter-stack-graphs-javascript.yml | 4 +-- ...ublish-tree-sitter-stack-graphs-python.yml | 4 +-- ...sh-tree-sitter-stack-graphs-typescript.yml | 4 +-- .../publish-tree-sitter-stack-graphs.yml | 4 +-- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36cab862c..41105a33c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,11 +31,11 @@ jobs: - name: Install cargo-hack run: cargo install cargo-hack - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Check formatting run: cargo fmt --all -- --check - name: Cache dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.cargo @@ -79,9 +79,9 @@ jobs: with: rust-version: ${{ matrix.rust }} - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Cache dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.cargo @@ -99,7 +99,7 @@ jobs: working-directory: languages steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: List languages id: language-list run: echo "languages=$(find -mindepth 1 -maxdepth 1 -type d -printf '%P\n' | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT @@ -122,7 +122,7 @@ jobs: - name: Install cargo-hack run: cargo install cargo-hack - name: Cache dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.cargo @@ -131,7 +131,7 @@ jobs: restore-keys: | ${{ runner.OS }}-cargo- - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build (all feature combinations) run: cargo hack -p ${{ matrix.language }} --feature-powerset build - name: Test (all features) @@ -152,7 +152,7 @@ jobs: with: rust-version: ${{ matrix.rust }} - name: Cache dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.cargo @@ -161,7 +161,7 @@ jobs: restore-keys: | ${{ runner.OS }}-cargo- - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: lfs: true - name: Build diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 5c4288c84..7da0f9ef8 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -37,7 +37,7 @@ jobs: done: ${{ steps.done.outputs.cache-hit }} steps: - name: "Checkout base code" - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ${{ env.BASE_REPO }} ref: ${{ env.BASE_SHA }} @@ -49,7 +49,7 @@ jobs: printf 'BASE_SHA=%s\n' "$(git rev-list -1 ${{ env.BASE_SHA }} -- stack-graphs)" >> $GITHUB_ENV working-directory: ${{ env.BASE_DIR }} - name: "Checkout head code" - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ${{ env.HEAD_REPO }} ref: ${{ env.HEAD_SHA }} @@ -62,7 +62,7 @@ jobs: working-directory: ${{ env.HEAD_DIR }} - name: "Check cached status" id: done - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: path: done key: ${{ runner.os }}-perf-tested-${{ env.BASE_REPO }}@${{ env.BASE_SHA }}-${{ env.HEAD_REPO }}@${{ env.HEAD_SHA }}-${{ env.TEST_NAME }} @@ -83,7 +83,7 @@ jobs: with: rust-version: stable - name: Cache Rust dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.cargo @@ -94,7 +94,7 @@ jobs: sudo apt-get install -y valgrind - name: "Cache base result" id: cache-base-result - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ${{ env.MASSIF_OUT }} @@ -102,7 +102,7 @@ jobs: key: ${{ runner.os }}-perf-result-${{ env.BASE_REPO }}@${{ env.BASE_SHA }}-${{ env.TEST_NAME }} - name: "Checkout base code" if: steps.cache-base-result.outputs.cache-hit != 'true' - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ${{ env.BASE_REPO }} ref: ${{ env.BASE_SHA }} @@ -130,7 +130,7 @@ jobs: ${{ env.BASE_DIR }}/data/${{ env.TEST_NAME }} ms_print ${{ env.MASSIF_OUT }} > ${{ env.MASSIF_REPORT }} - name: Upload results - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.BASE_ARTIFACT }} path: | @@ -152,7 +152,7 @@ jobs: with: rust-version: stable - name: Cache Rust dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.cargo @@ -163,7 +163,7 @@ jobs: sudo apt-get install -y valgrind - name: "Cache head result" id: cache-head-result - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ${{ env.MASSIF_OUT }} @@ -171,7 +171,7 @@ jobs: key: ${{ runner.os }}-perf-result-${{ env.HEAD_REPO }}@${{ env.HEAD_SHA }}-${{ env.TEST_NAME }} - name: "Checkout head code" if: steps.cache-head-result.outputs.cache-hit != 'true' - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ${{ env.HEAD_REPO }} ref: ${{ env.HEAD_SHA }} @@ -199,7 +199,7 @@ jobs: ${{ env.HEAD_DIR }}/data/${{ env.TEST_NAME }} ms_print ${{ env.MASSIF_OUT }} > ${{ env.MASSIF_REPORT }} - name: Upload results - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.HEAD_ARTIFACT }} path: | @@ -233,12 +233,12 @@ jobs: # Download results # - name: Download base results - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ env.BASE_ARTIFACT }} path: ${{ env.BASE_ARTIFACT }} - name: Download head results - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ env.HEAD_ARTIFACT }} path: ${{ env.HEAD_ARTIFACT }} @@ -246,7 +246,7 @@ jobs: # Create report # - name: "Checkout code" - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ${{ env.SRC_DIR }} - name: Generate summary @@ -268,7 +268,7 @@ jobs: - name: Create status marker run: touch done - name: "Cache status" - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 with: path: done key: ${{ runner.os }}-perf-tested-${{ env.BASE_REPO }}@${{ env.BASE_SHA }}-${{ env.HEAD_REPO }}@${{ env.HEAD_SHA }}-${{ env.TEST_NAME }} diff --git a/.github/workflows/publish-lsp-positions.yml b/.github/workflows/publish-lsp-positions.yml index 210662a00..dd021646b 100644 --- a/.github/workflows/publish-lsp-positions.yml +++ b/.github/workflows/publish-lsp-positions.yml @@ -16,7 +16,7 @@ jobs: - name: Install Rust environment uses: hecrj/setup-rust-action@v1 - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # TODO Verify the crate version matches the tag - name: Test crate run: cargo test --all-features @@ -36,7 +36,7 @@ jobs: contents: write steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Create GitHub release uses: ncipollo/release-action@v1 with: diff --git a/.github/workflows/publish-stack-graphs.yml b/.github/workflows/publish-stack-graphs.yml index 641a93488..b94e0337f 100644 --- a/.github/workflows/publish-stack-graphs.yml +++ b/.github/workflows/publish-stack-graphs.yml @@ -16,7 +16,7 @@ jobs: - name: Install Rust environment uses: hecrj/setup-rust-action@v1 - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # TODO Verify the crate version matches the tag - name: Test crate run: cargo test --all-features @@ -36,7 +36,7 @@ jobs: contents: write steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Create GitHub release uses: ncipollo/release-action@v1 with: diff --git a/.github/workflows/publish-tree-sitter-stack-graphs-java.yml b/.github/workflows/publish-tree-sitter-stack-graphs-java.yml index 6d7afb769..64e9f3bf2 100644 --- a/.github/workflows/publish-tree-sitter-stack-graphs-java.yml +++ b/.github/workflows/publish-tree-sitter-stack-graphs-java.yml @@ -16,7 +16,7 @@ jobs: - name: Install Rust environment uses: hecrj/setup-rust-action@v1 - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # TODO Verify the crate version matches the tag - name: Test crate run: cargo test --all-features @@ -36,7 +36,7 @@ jobs: contents: write steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Create GitHub release uses: ncipollo/release-action@v1 with: diff --git a/.github/workflows/publish-tree-sitter-stack-graphs-javascript.yml b/.github/workflows/publish-tree-sitter-stack-graphs-javascript.yml index ff6826770..48375d9d4 100644 --- a/.github/workflows/publish-tree-sitter-stack-graphs-javascript.yml +++ b/.github/workflows/publish-tree-sitter-stack-graphs-javascript.yml @@ -16,7 +16,7 @@ jobs: - name: Install Rust environment uses: hecrj/setup-rust-action@v1 - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # TODO Verify the crate version matches the tag - name: Test crate run: cargo test --all-features @@ -36,7 +36,7 @@ jobs: contents: write steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Create GitHub release uses: ncipollo/release-action@v1 with: diff --git a/.github/workflows/publish-tree-sitter-stack-graphs-python.yml b/.github/workflows/publish-tree-sitter-stack-graphs-python.yml index 5d6c83ba2..77804c28e 100644 --- a/.github/workflows/publish-tree-sitter-stack-graphs-python.yml +++ b/.github/workflows/publish-tree-sitter-stack-graphs-python.yml @@ -16,7 +16,7 @@ jobs: - name: Install Rust environment uses: hecrj/setup-rust-action@v1 - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # TODO Verify the crate version matches the tag - name: Test crate run: cargo test --all-features @@ -36,7 +36,7 @@ jobs: contents: write steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Create GitHub release uses: ncipollo/release-action@v1 with: diff --git a/.github/workflows/publish-tree-sitter-stack-graphs-typescript.yml b/.github/workflows/publish-tree-sitter-stack-graphs-typescript.yml index a3409f397..3fdbe17e2 100644 --- a/.github/workflows/publish-tree-sitter-stack-graphs-typescript.yml +++ b/.github/workflows/publish-tree-sitter-stack-graphs-typescript.yml @@ -16,7 +16,7 @@ jobs: - name: Install Rust environment uses: hecrj/setup-rust-action@v1 - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # TODO Verify the crate version matches the tag - name: Test crate run: cargo test --all-features @@ -36,7 +36,7 @@ jobs: contents: write steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Create GitHub release uses: ncipollo/release-action@v1 with: diff --git a/.github/workflows/publish-tree-sitter-stack-graphs.yml b/.github/workflows/publish-tree-sitter-stack-graphs.yml index 031289464..2dfb743a1 100644 --- a/.github/workflows/publish-tree-sitter-stack-graphs.yml +++ b/.github/workflows/publish-tree-sitter-stack-graphs.yml @@ -16,7 +16,7 @@ jobs: - name: Install Rust environment uses: hecrj/setup-rust-action@v1 - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # TODO Verify the crate version matches the tag - name: Test crate run: cargo test --all-features @@ -36,7 +36,7 @@ jobs: contents: write steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Create GitHub release uses: ncipollo/release-action@v1 with: From b3409fca73900d01656d02ddea86084a37b25e8d Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 12 Dec 2024 13:59:37 +0100 Subject: [PATCH 192/202] Revert "Try updated runner image to fix valgrind problem" This reverts commit bba2dc482d1206209837f699f49527895c48619e. --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41105a33c..0b025b26d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,9 +13,7 @@ concurrency: jobs: test-rust: - # We force a newer runner version to fix a problem with Valgrind. - # Currently, ubuntu-latest is set to 22.04. Revert this back to ubuntu-latest once it is set to 24.04. - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest strategy: matrix: rust: [stable] From 11c05cb0b49c9330ad077fdfce13768d016e449d Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 12 Dec 2024 13:19:15 +0000 Subject: [PATCH 193/202] Simplify suppresion traces --- stack-graphs/valgrind.supp | 56 ++++---------------------------------- 1 file changed, 6 insertions(+), 50 deletions(-) diff --git a/stack-graphs/valgrind.supp b/stack-graphs/valgrind.supp index 3986abc5b..dbccaa257 100644 --- a/stack-graphs/valgrind.supp +++ b/stack-graphs/valgrind.supp @@ -3,72 +3,28 @@ Memcheck:Param statx(file_name) fun:statx - fun:statx - fun:_ZN3std3sys3pal4unix2fs9try_statx17h2609435043bb8525E - fun:{closure#0} - fun:run_with_cstr_stack - fun:run_with_cstr - fun:run_path_with_cstr - fun:_ZN3std3sys3pal4unix2fs4stat17ha588398797a44835E - fun:metadata<&std::path::PathBuf> + ... fun:get_dbpath_for_term - fun:from_name - fun:_ZN4test4term8terminfo8TermInfo8from_env17h9b3ad5763ddd396cE - fun:new - fun:_ZN4test4term6stdout17hf274a19176f765bcE - fun:_ZN4test7console17run_tests_console17h3d81643311f50681E - fun:_ZN4test9test_main17h6c0fc3221ed0faa4E - fun:_ZN4test16test_main_static17h897b969e33229363E - fun:_ZN2it4main17hfbc3179ed1c35941E - fun:_ZN4core3ops8function6FnOnce9call_once17h945f64a17647f84cE - fun:_ZN3std3sys9backtrace28__rust_begin_short_backtrace17h41138d0332b09746E - fun:_ZN3std2rt10lang_start28_$u7b$$u7b$closure$u7d$$u7d$17h98fa5fc32f9b0a38E + ... } { rust-1.83-false-positive-2 Memcheck:Param statx(buf) fun:statx - fun:statx - fun:_ZN3std3sys3pal4unix2fs9try_statx17h2609435043bb8525E - fun:{closure#0} - fun:run_with_cstr_stack - fun:run_with_cstr - fun:run_path_with_cstr - fun:_ZN3std3sys3pal4unix2fs4stat17ha588398797a44835E - fun:metadata<&std::path::PathBuf> + ... fun:get_dbpath_for_term - fun:from_name - fun:_ZN4test4term8terminfo8TermInfo8from_env17h9b3ad5763ddd396cE - fun:new - fun:_ZN4test4term6stdout17hf274a19176f765bcE - fun:_ZN4test7console17run_tests_console17h3d81643311f50681E - fun:_ZN4test9test_main17h6c0fc3221ed0faa4E - fun:_ZN4test16test_main_static17h897b969e33229363E - fun:_ZN2it4main17hfbc3179ed1c35941E - fun:_ZN4core3ops8function6FnOnce9call_once17h945f64a17647f84cE - fun:_ZN3std3sys9backtrace28__rust_begin_short_backtrace17h41138d0332b09746E - fun:_ZN3std2rt10lang_start28_$u7b$$u7b$closure$u7d$$u7d$17h98fa5fc32f9b0a38E + ... } { rust-1.83-false-positive-3 Memcheck:Leak match-leak-kinds: possible fun:malloc - fun:alloc - fun:alloc_impl - fun:allocate - fun:{closure#0} - fun:allocate_for_layout, alloc::sync::{impl#14}::new_uninit::{closure_env#0}, fn(*mut u8) -> *mut alloc::sync::ArcInner>> + ... fun:new_uninit fun:new_inner fun:new_main fun:init - fun:{closure#0} - fun:do_call - fun:try<(), std::rt::lang_start_internal::{closure_env#0}> - fun:catch_unwind - fun:_ZN3std2rt19lang_start_internal17h1c66660c99c8424cE - fun:_ZN3std2rt10lang_start17hb778ad044944e8a4E - fun:main + ... } From e3b1afea05c5c32244c5fee06a5bfe649fc4d505 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 12 Dec 2024 14:33:36 +0100 Subject: [PATCH 194/202] Save valgrind logs on failure --- .github/workflows/ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b025b26d..1c2c613d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,7 +58,13 @@ jobs: env: # Since Rust 1.83, Valgrind reports some possible leaks that cargo-valgrind # treats as fatal. The given suppressions file makes sure these are ignored. - VALGRINDFLAGS: --suppressions=valgrind.supp + VALGRINDFLAGS: --suppressions=valgrind.supp --gen-suppressions=all --log-file=${{ runner.temp }}/valgrind.log + - name: Upload valgrind log + if: ${{ failure() }} + uses: actions/upload-artifact@v4 + with: + name: valgrind logs + path: ${{ runner.temp }}/valgrind.log - name: Ensure C headers are up to date run: | script/cbindgen From 9998fbd2f42b1665475aa2cbf71515d4fa8abf2c Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 12 Dec 2024 14:21:27 +0000 Subject: [PATCH 195/202] Custom valgrind runner to allow capturing logs --- .github/workflows/ci.yml | 12 ++++------- script/ci-test-valgrind | 23 +++++++++++++++++++++ stack-graphs/valgrind.supp => valgrind.supp | 0 3 files changed, 27 insertions(+), 8 deletions(-) create mode 100755 script/ci-test-valgrind rename stack-graphs/valgrind.supp => valgrind.supp (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c2c613d9..adc70b3c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,20 +47,16 @@ jobs: run: ${{ env.CARGO_HACK }} test - name: Run test suite with all optimizations (default features) run: cargo test --release - - name: Install cargo-valgrind + - name: Install valgrind run: | sudo apt-get update sudo apt-get install -y valgrind - cargo install cargo-valgrind - name: Run test suite under valgrind (default features) + id: valgrind # We only need to use valgrind to test the crates that have C bindings. - run: cargo valgrind test -p stack-graphs - env: - # Since Rust 1.83, Valgrind reports some possible leaks that cargo-valgrind - # treats as fatal. The given suppressions file makes sure these are ignored. - VALGRINDFLAGS: --suppressions=valgrind.supp --gen-suppressions=all --log-file=${{ runner.temp }}/valgrind.log + run: script/ci-test-valgrind -p stack-graphs - name: Upload valgrind log - if: ${{ failure() }} + if: ${{ failure() && steps.valgrind.outcome == 'failure' }} uses: actions/upload-artifact@v4 with: name: valgrind logs diff --git a/script/ci-test-valgrind b/script/ci-test-valgrind new file mode 100755 index 000000000..3f5e3dae6 --- /dev/null +++ b/script/ci-test-valgrind @@ -0,0 +1,23 @@ +#!/usr/bin/env bash + +set -eu + +# Start by building the test binary, before we try to get its filename +cargo test "$@" --no-run + +# Cargo does not have a clean way to get the test binary, so we do some text processing here to get it +test="$(cargo test "$@" --no-run 2>&1 | grep 'Executable' | head -1 | sed -e 's/[^(]*(\(.*\)).*$/\1/')" +log="${RUNNER_TEMP-.}/valgrind.log" + +# Run the test binary under valgrind +if ! valgrind \ + --leak-check=full \ + --show-leak-kinds=all \ + --error-exitcode=1 \ + --suppressions=valgrind.supp \ + --gen-suppressions=all \ + --log-file="$log" \ + "$test"; then + echo "Valgrind detected errors! See logs: $log" + exit 1 +fi diff --git a/stack-graphs/valgrind.supp b/valgrind.supp similarity index 100% rename from stack-graphs/valgrind.supp rename to valgrind.supp From d2fd2281ef18af9c822e6cdcbc20f971c09be276 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 12 Dec 2024 14:28:15 +0000 Subject: [PATCH 196/202] Update suppressions from CI log --- valgrind.supp | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/valgrind.supp b/valgrind.supp index dbccaa257..19b8bb400 100644 --- a/valgrind.supp +++ b/valgrind.supp @@ -1,30 +1,9 @@ { rust-1.83-false-positive-1 - Memcheck:Param - statx(file_name) - fun:statx - ... - fun:get_dbpath_for_term - ... -} -{ - rust-1.83-false-positive-2 - Memcheck:Param - statx(buf) - fun:statx - ... - fun:get_dbpath_for_term - ... -} -{ - rust-1.83-false-positive-3 Memcheck:Leak match-leak-kinds: possible fun:malloc - ... - fun:new_uninit - fun:new_inner - fun:new_main - fun:init - ... + fun:_ZN3std2rt19lang_start_internal17h1c66660c99c8424cE + fun:_ZN3std2rt10lang_start17hb778ad044944e8a4E + fun:main } From 6223c06da3344bd5336cc61c70633985c4c73860 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Thu, 12 Dec 2024 14:40:17 +0000 Subject: [PATCH 197/202] Remove mangled entries --- valgrind.supp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/valgrind.supp b/valgrind.supp index 19b8bb400..25c3cfbda 100644 --- a/valgrind.supp +++ b/valgrind.supp @@ -3,7 +3,6 @@ Memcheck:Leak match-leak-kinds: possible fun:malloc - fun:_ZN3std2rt19lang_start_internal17h1c66660c99c8424cE - fun:_ZN3std2rt10lang_start17hb778ad044944e8a4E + ... fun:main } From 5d82a0c6f028d1b028319097fbf33261a66fa2dd Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Fri, 13 Dec 2024 13:56:56 +0100 Subject: [PATCH 198/202] Bump tree-sitter-stack-graphs-typescript version --- languages/tree-sitter-stack-graphs-typescript/CHANGELOG.md | 6 ++++++ languages/tree-sitter-stack-graphs-typescript/Cargo.toml | 2 +- languages/tree-sitter-stack-graphs-typescript/README.md | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-typescript/CHANGELOG.md b/languages/tree-sitter-stack-graphs-typescript/CHANGELOG.md index 47539831f..5a3bfa3d4 100644 --- a/languages/tree-sitter-stack-graphs-typescript/CHANGELOG.md +++ b/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.4.0 -- 2024-12-13 + +- The `tree-sitter-stack-graphs` dependency is updated to version 0.10. + +- The `tree-sitter-typescript` dependency is updated to version 0.23.2. + ## v0.3.0 -- 2024-07-09 ### Added diff --git a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml index 379d4d3fe..ed14d9112 100644 --- a/languages/tree-sitter-stack-graphs-typescript/Cargo.toml +++ b/languages/tree-sitter-stack-graphs-typescript/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tree-sitter-stack-graphs-typescript" -version = "0.3.0" +version = "0.4.0" description = "Stack graphs definition for TypeScript & TSX using tree-sitter-typescript" readme = "README.md" keywords = ["tree-sitter", "stack-graphs", "typescript", "tsx"] diff --git a/languages/tree-sitter-stack-graphs-typescript/README.md b/languages/tree-sitter-stack-graphs-typescript/README.md index 46079a19a..c83d5849d 100644 --- a/languages/tree-sitter-stack-graphs-typescript/README.md +++ b/languages/tree-sitter-stack-graphs-typescript/README.md @@ -13,7 +13,7 @@ To use this library, add the following to your `Cargo.toml`: ```toml [dependencies] -tree-sitter-stack-graphs-typescript = "0.3" +tree-sitter-stack-graphs-typescript = "0.4" ``` Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs-typescript/*/) for more details on how to use this library. From 7fe3e0dc69ec5ab4054b511814e27e77be4c0b5b Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Tue, 4 Mar 2025 13:47:17 +0100 Subject: [PATCH 199/202] Pin thrid party actions to SHA --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/perf.yml | 4 ++-- .github/workflows/publish-lsp-positions.yml | 4 ++-- .github/workflows/publish-stack-graphs.yml | 4 ++-- .../workflows/publish-tree-sitter-stack-graphs-java.yml | 4 ++-- .../publish-tree-sitter-stack-graphs-javascript.yml | 4 ++-- .../workflows/publish-tree-sitter-stack-graphs-python.yml | 4 ++-- .../publish-tree-sitter-stack-graphs-typescript.yml | 4 ++-- .github/workflows/publish-tree-sitter-stack-graphs.yml | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index adc70b3c8..89be35c39 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Install Rust environment - uses: hecrj/setup-rust-action@v1 + uses: hecrj/setup-rust-action@110f36749599534ca96628b82f52ae67e5d95a3c # v2 with: rust-version: ${{ matrix.rust }} - name: Install cargo-hack @@ -75,7 +75,7 @@ jobs: steps: - name: Install Rust environment - uses: hecrj/setup-rust-action@v1 + uses: hecrj/setup-rust-action@110f36749599534ca96628b82f52ae67e5d95a3c # v2 with: rust-version: ${{ matrix.rust }} - name: Checkout code @@ -116,7 +116,7 @@ jobs: steps: - name: Install Rust environment - uses: hecrj/setup-rust-action@v1 + uses: hecrj/setup-rust-action@110f36749599534ca96628b82f52ae67e5d95a3c # v2 with: rust-version: ${{ matrix.rust }} - name: Install cargo-hack @@ -148,7 +148,7 @@ jobs: steps: - name: Install Rust environment - uses: hecrj/setup-rust-action@v1 + uses: hecrj/setup-rust-action@110f36749599534ca96628b82f52ae67e5d95a3c # v2 with: rust-version: ${{ matrix.rust }} - name: Cache dependencies diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 7da0f9ef8..1930ff2fb 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -79,7 +79,7 @@ jobs: BASE_SHA: ${{ needs.changes.outputs.base-sha }} steps: - name: Install Rust environment - uses: hecrj/setup-rust-action@v1 + uses: hecrj/setup-rust-action@110f36749599534ca96628b82f52ae67e5d95a3c # v2 with: rust-version: stable - name: Cache Rust dependencies @@ -148,7 +148,7 @@ jobs: HEAD_SHA: ${{ needs.changes.outputs.head-sha }} steps: - name: Install Rust environment - uses: hecrj/setup-rust-action@v1 + uses: hecrj/setup-rust-action@110f36749599534ca96628b82f52ae67e5d95a3c # v2 with: rust-version: stable - name: Cache Rust dependencies diff --git a/.github/workflows/publish-lsp-positions.yml b/.github/workflows/publish-lsp-positions.yml index dd021646b..5c48ed71f 100644 --- a/.github/workflows/publish-lsp-positions.yml +++ b/.github/workflows/publish-lsp-positions.yml @@ -14,7 +14,7 @@ jobs: CRATE_DIR: './lsp-positions' steps: - name: Install Rust environment - uses: hecrj/setup-rust-action@v1 + uses: hecrj/setup-rust-action@110f36749599534ca96628b82f52ae67e5d95a3c # v2 - name: Checkout repository uses: actions/checkout@v4 # TODO Verify the crate version matches the tag @@ -38,7 +38,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Create GitHub release - uses: ncipollo/release-action@v1 + uses: ncipollo/release-action@440c8c1cb0ed28b9f43e4d1d670870f059653174 # v1 with: body: | Find more info on all releases at https://crates.io/crates/lsp-positions. diff --git a/.github/workflows/publish-stack-graphs.yml b/.github/workflows/publish-stack-graphs.yml index b94e0337f..cc7b6667b 100644 --- a/.github/workflows/publish-stack-graphs.yml +++ b/.github/workflows/publish-stack-graphs.yml @@ -14,7 +14,7 @@ jobs: CRATE_DIR: './stack-graphs' steps: - name: Install Rust environment - uses: hecrj/setup-rust-action@v1 + uses: hecrj/setup-rust-action@110f36749599534ca96628b82f52ae67e5d95a3c # v2 - name: Checkout repository uses: actions/checkout@v4 # TODO Verify the crate version matches the tag @@ -38,7 +38,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Create GitHub release - uses: ncipollo/release-action@v1 + uses: ncipollo/release-action@440c8c1cb0ed28b9f43e4d1d670870f059653174 # v1 with: body: | Find more info on all releases at https://crates.io/crates/stack-graphs. diff --git a/.github/workflows/publish-tree-sitter-stack-graphs-java.yml b/.github/workflows/publish-tree-sitter-stack-graphs-java.yml index 64e9f3bf2..31196048c 100644 --- a/.github/workflows/publish-tree-sitter-stack-graphs-java.yml +++ b/.github/workflows/publish-tree-sitter-stack-graphs-java.yml @@ -14,7 +14,7 @@ jobs: CRATE_DIR: './languages/tree-sitter-stack-graphs-java' steps: - name: Install Rust environment - uses: hecrj/setup-rust-action@v1 + uses: hecrj/setup-rust-action@110f36749599534ca96628b82f52ae67e5d95a3c # v2 - name: Checkout repository uses: actions/checkout@v4 # TODO Verify the crate version matches the tag @@ -38,7 +38,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Create GitHub release - uses: ncipollo/release-action@v1 + uses: ncipollo/release-action@440c8c1cb0ed28b9f43e4d1d670870f059653174 # v1 with: body: | Find more info on all releases at https://crates.io/crates/tree-sitter-stack-graphs-java. diff --git a/.github/workflows/publish-tree-sitter-stack-graphs-javascript.yml b/.github/workflows/publish-tree-sitter-stack-graphs-javascript.yml index 48375d9d4..f571900b2 100644 --- a/.github/workflows/publish-tree-sitter-stack-graphs-javascript.yml +++ b/.github/workflows/publish-tree-sitter-stack-graphs-javascript.yml @@ -14,7 +14,7 @@ jobs: CRATE_DIR: './languages/tree-sitter-stack-graphs-javascript' steps: - name: Install Rust environment - uses: hecrj/setup-rust-action@v1 + uses: hecrj/setup-rust-action@110f36749599534ca96628b82f52ae67e5d95a3c # v2 - name: Checkout repository uses: actions/checkout@v4 # TODO Verify the crate version matches the tag @@ -38,7 +38,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Create GitHub release - uses: ncipollo/release-action@v1 + uses: ncipollo/release-action@440c8c1cb0ed28b9f43e4d1d670870f059653174 # v1 with: body: | Find more info on all releases at https://crates.io/crates/tree-sitter-stack-graphs-javascript. diff --git a/.github/workflows/publish-tree-sitter-stack-graphs-python.yml b/.github/workflows/publish-tree-sitter-stack-graphs-python.yml index 77804c28e..28d61b11e 100644 --- a/.github/workflows/publish-tree-sitter-stack-graphs-python.yml +++ b/.github/workflows/publish-tree-sitter-stack-graphs-python.yml @@ -14,7 +14,7 @@ jobs: CRATE_DIR: './languages/tree-sitter-stack-graphs-python' steps: - name: Install Rust environment - uses: hecrj/setup-rust-action@v1 + uses: hecrj/setup-rust-action@110f36749599534ca96628b82f52ae67e5d95a3c # v2 - name: Checkout repository uses: actions/checkout@v4 # TODO Verify the crate version matches the tag @@ -38,7 +38,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Create GitHub release - uses: ncipollo/release-action@v1 + uses: ncipollo/release-action@440c8c1cb0ed28b9f43e4d1d670870f059653174 # v1 with: body: | Find more info on all releases at https://crates.io/crates/tree-sitter-stack-graphs-python. diff --git a/.github/workflows/publish-tree-sitter-stack-graphs-typescript.yml b/.github/workflows/publish-tree-sitter-stack-graphs-typescript.yml index 3fdbe17e2..a1f387afd 100644 --- a/.github/workflows/publish-tree-sitter-stack-graphs-typescript.yml +++ b/.github/workflows/publish-tree-sitter-stack-graphs-typescript.yml @@ -14,7 +14,7 @@ jobs: CRATE_DIR: './languages/tree-sitter-stack-graphs-typescript' steps: - name: Install Rust environment - uses: hecrj/setup-rust-action@v1 + uses: hecrj/setup-rust-action@110f36749599534ca96628b82f52ae67e5d95a3c # v2 - name: Checkout repository uses: actions/checkout@v4 # TODO Verify the crate version matches the tag @@ -38,7 +38,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Create GitHub release - uses: ncipollo/release-action@v1 + uses: ncipollo/release-action@440c8c1cb0ed28b9f43e4d1d670870f059653174 # v1 with: body: | Find more info on all releases at https://crates.io/crates/tree-sitter-stack-graphs-typescript. diff --git a/.github/workflows/publish-tree-sitter-stack-graphs.yml b/.github/workflows/publish-tree-sitter-stack-graphs.yml index 2dfb743a1..6e14ab5b1 100644 --- a/.github/workflows/publish-tree-sitter-stack-graphs.yml +++ b/.github/workflows/publish-tree-sitter-stack-graphs.yml @@ -14,7 +14,7 @@ jobs: CRATE_DIR: './tree-sitter-stack-graphs' steps: - name: Install Rust environment - uses: hecrj/setup-rust-action@v1 + uses: hecrj/setup-rust-action@110f36749599534ca96628b82f52ae67e5d95a3c # v2 - name: Checkout repository uses: actions/checkout@v4 # TODO Verify the crate version matches the tag @@ -38,7 +38,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Create GitHub release - uses: ncipollo/release-action@v1 + uses: ncipollo/release-action@440c8c1cb0ed28b9f43e4d1d670870f059653174 # v1 with: body: | Find more info on all releases at https://crates.io/crates/tree-sitter-stack-graphs. From a6b0f7f6af89a3cb8e834866a87c568fcccf02ac Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Tue, 4 Mar 2025 13:52:47 +0100 Subject: [PATCH 200/202] Explicit workflow permissions --- .github/workflows/ci.yml | 4 ++++ .github/workflows/perf.yml | 5 +++++ .github/workflows/publish-lsp-positions.yml | 3 +++ .github/workflows/publish-stack-graphs.yml | 3 +++ .github/workflows/publish-tree-sitter-stack-graphs-java.yml | 3 +++ .../publish-tree-sitter-stack-graphs-javascript.yml | 3 +++ .../workflows/publish-tree-sitter-stack-graphs-python.yml | 3 +++ .../publish-tree-sitter-stack-graphs-typescript.yml | 3 +++ .github/workflows/publish-tree-sitter-stack-graphs.yml | 3 +++ 9 files changed, 30 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89be35c39..e8bb697e7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,5 @@ name: Continuous integration + on: push: branches: [main] @@ -6,6 +7,9 @@ on: schedule: - cron: "0 0 1,15 * *" +permissions: + contents: read + # In the event that there is a new push to the ref, cancel any running jobs because there are now obsolete, and wasting resources. concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 1930ff2fb..d68ffa75d 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -1,9 +1,14 @@ name: Performance testing + on: pull_request: paths: - 'stack-graphs/**' +permissions: + contents: read + pull-requests: write + # In the event that there is a new push to the ref, cancel any running jobs because there are now obsolete, and wasting resources. concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/publish-lsp-positions.yml b/.github/workflows/publish-lsp-positions.yml index 5c48ed71f..2ca05a133 100644 --- a/.github/workflows/publish-lsp-positions.yml +++ b/.github/workflows/publish-lsp-positions.yml @@ -5,6 +5,9 @@ on: tags: - lsp-positions-v* +permissions: + contents: write + jobs: publish-crate: runs-on: ubuntu-latest diff --git a/.github/workflows/publish-stack-graphs.yml b/.github/workflows/publish-stack-graphs.yml index cc7b6667b..29b21020b 100644 --- a/.github/workflows/publish-stack-graphs.yml +++ b/.github/workflows/publish-stack-graphs.yml @@ -5,6 +5,9 @@ on: tags: - stack-graphs-v* +permissions: + contents: write + jobs: publish-crate: runs-on: ubuntu-latest diff --git a/.github/workflows/publish-tree-sitter-stack-graphs-java.yml b/.github/workflows/publish-tree-sitter-stack-graphs-java.yml index 31196048c..40878de95 100644 --- a/.github/workflows/publish-tree-sitter-stack-graphs-java.yml +++ b/.github/workflows/publish-tree-sitter-stack-graphs-java.yml @@ -5,6 +5,9 @@ on: tags: - tree-sitter-stack-graphs-java-v* +permissions: + contents: write + jobs: publish-crate: runs-on: ubuntu-latest diff --git a/.github/workflows/publish-tree-sitter-stack-graphs-javascript.yml b/.github/workflows/publish-tree-sitter-stack-graphs-javascript.yml index f571900b2..b9fbceec3 100644 --- a/.github/workflows/publish-tree-sitter-stack-graphs-javascript.yml +++ b/.github/workflows/publish-tree-sitter-stack-graphs-javascript.yml @@ -5,6 +5,9 @@ on: tags: - tree-sitter-stack-graphs-javascript-v* +permissions: + contents: write + jobs: publish-crate: runs-on: ubuntu-latest diff --git a/.github/workflows/publish-tree-sitter-stack-graphs-python.yml b/.github/workflows/publish-tree-sitter-stack-graphs-python.yml index 28d61b11e..dc90a6974 100644 --- a/.github/workflows/publish-tree-sitter-stack-graphs-python.yml +++ b/.github/workflows/publish-tree-sitter-stack-graphs-python.yml @@ -5,6 +5,9 @@ on: tags: - tree-sitter-stack-graphs-python-v* +permissions: + contents: write + jobs: publish-crate: runs-on: ubuntu-latest diff --git a/.github/workflows/publish-tree-sitter-stack-graphs-typescript.yml b/.github/workflows/publish-tree-sitter-stack-graphs-typescript.yml index a1f387afd..9eb696e2a 100644 --- a/.github/workflows/publish-tree-sitter-stack-graphs-typescript.yml +++ b/.github/workflows/publish-tree-sitter-stack-graphs-typescript.yml @@ -5,6 +5,9 @@ on: tags: - tree-sitter-stack-graphs-typescript-v* +permissions: + contents: write + jobs: publish-crate: runs-on: ubuntu-latest diff --git a/.github/workflows/publish-tree-sitter-stack-graphs.yml b/.github/workflows/publish-tree-sitter-stack-graphs.yml index 6e14ab5b1..0bf56c143 100644 --- a/.github/workflows/publish-tree-sitter-stack-graphs.yml +++ b/.github/workflows/publish-tree-sitter-stack-graphs.yml @@ -5,6 +5,9 @@ on: tags: - tree-sitter-stack-graphs-v* +permissions: + contents: write + jobs: publish-crate: runs-on: ubuntu-latest From 3a596d8354f1c70f7e18415c10d37aa7b95cff82 Mon Sep 17 00:00:00 2001 From: Hendrik van Antwerpen Date: Tue, 4 Mar 2025 18:02:48 +0100 Subject: [PATCH 201/202] Add Blackbird team to codeowners --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c010ba8c1..a4042b8bc 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @github/semantic-code +* @github/semantic-code @github/blackbird From 4c99b605eea91c28e47e15ce4a0660dc5aa42430 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Jun 2025 21:33:25 +0000 Subject: [PATCH 202/202] Bump brace-expansion Bumps the npm_and_yarn group with 1 update in the /languages/tree-sitter-stack-graphs-typescript/vscode directory: [brace-expansion](https://github.com/juliangruber/brace-expansion). Updates `brace-expansion` from 2.0.1 to 2.0.2 - [Release notes](https://github.com/juliangruber/brace-expansion/releases) - [Commits](https://github.com/juliangruber/brace-expansion/compare/v2.0.1...v2.0.2) --- updated-dependencies: - dependency-name: brace-expansion dependency-version: 2.0.2 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] --- .../vscode/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/languages/tree-sitter-stack-graphs-typescript/vscode/package-lock.json b/languages/tree-sitter-stack-graphs-typescript/vscode/package-lock.json index 9cc00e7ae..4d95b10b3 100644 --- a/languages/tree-sitter-stack-graphs-typescript/vscode/package-lock.json +++ b/languages/tree-sitter-stack-graphs-typescript/vscode/package-lock.json @@ -38,9 +38,9 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "dependencies": { "balanced-match": "^1.0.0" }