Logical operators are not detected if they are at the beginning of a line

[nikitaourazbaev]

Given this code:

{%- if section.settings.cta_link != blank
  and section.settings.cta_text != ''
-%}
  {{ link }}
{% endif %}

{%- if section.settings.cta_link != blank and section.settings.cta_text != ''
-%}
  {{ link }}
{% endif %}

Expected behaviour is that both ands should be keyword.operator.logical.liquid.

Instead, the top one has the scope:

text.html.liquid meta.template.liquid meta.embedded.liquid source.liquid meta.statement.liquid keyword.other.liquid

Whereas the bottom one has the correct scope:

text.html.liquid meta.template.liquid meta.embedded.liquid source.liquid meta.statement.liquid keyword.operator.logical.liquid

Inserting any characters in front of the top one makes it have the correct scope.

In fact, it seems putting anything in the spot of that first and gives it the keyword.other.liquid scope.

[nikitaourazbaev]

I think the - include: eol-pop on line 177 is what’s causing it, however removing it there messes up multi-line {% liquid %} tags.

[deathaxe]

Due to multi-line statements expressions are restricted to be terminated at eol as there are no other reliable markers about when new statement starts. Literly any alphanumeric token at beginning of a line can start a new statement (custom function call).

[nikitaourazbaev]

Thanks for the quick fix!