tree-sitter/tree-sitter-php

bug: Wrong indentation

spcbfr opened this issue · 4 comments

Did you check existing issues?

  • I have read all the tree-sitter docs if it relates to using the parser
  • I have searched the existing issues of tree-sitter-php

Tree-Sitter CLI Version, if relevant (output of tree-sitter --version)

No response

Describe the bug

I get an extra indentation/tab when I create a new file in certain php files.

Steps To Reproduce/Bad Parse Tree

  1. enable indent for treesitter
  2. install php parser for treesitter
  3. open file included below
  4. place yourself at line 12 (function up)
  5. press or o in nvim
  6. notice the wrong indentation

Expected Behavior/Parse Tree

Correct indentation

Repro

<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration
{
    /**
     * Run the migrations.
     */
    public function up(): void
    {
        Schema::create('jobs', function (Blueprint $table) {
            $table->id();
            $table->string('queue')->index();
            $table->longText('payload');
            $table->unsignedTinyInteger('attempts');
            $table->unsignedInteger('reserved_at')->nullable();
            $table->unsignedInteger('available_at');
            $table->unsignedInteger('created_at');
        });

        Schema::create('job_batches', function (Blueprint $table) {
            $table->string('id')->primary();
            $table->string('name');
            $table->integer('total_jobs');
            $table->integer('pending_jobs');
            $table->integer('failed_jobs');
            $table->longText('failed_job_ids');
            $table->mediumText('options')->nullable();
            $table->integer('cancelled_at')->nullable();
            $table->integer('created_at');
            $table->integer('finished_at')->nullable();
        });

        Schema::create('failed_jobs', function (Blueprint $table) {
            $table->id();
            $table->string('uuid')->unique();
            $table->text('connection');
            $table->text('queue');
            $table->longText('payload');
            $table->longText('exception');
            $table->timestamp('failed_at')->useCurrent();
        });
    }

    /**
     * Reverse the migrations.
     */
    public function down(): void
    {
        Schema::dropIfExists('jobs');
        Schema::dropIfExists('job_batches');
        Schema::dropIfExists('failed_jobs');
    }
};

Yes this has to do with returning the anonymous class, I created a query to fix this in my own dotfiles, but I'll push that up when I get the change.

However, since you're using neovim these queries aren't going to affect you as nvim-treesitter contains their own queries (I'll go ahead and submit a pr there as well, but just fyi).

Sounds good! I searched through your config yesterday and found the relevant fix that you had. so as far as I am concerned this issue is fixed!

Turns out there's nothing to do on this end---indent queries are Neovim specific. However, I'll still try to submit a PR for the issue above