Skip to content

Commit

Permalink
fix whitespace php lexer embedding
Browse files Browse the repository at this point in the history
  • Loading branch information
haidubogdan committed Oct 20, 2024
1 parent fb8afee commit 3b872ca
Show file tree
Hide file tree
Showing 6 changed files with 1,178 additions and 1,161 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven_nbm_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
draft: false
prerelease: false
release_name: Netbeans Blade Php release ${{ steps.nbm_version.outputs.version }}
tag_name: nbpr1.0.13
tag_name: nbpr1.0.14
body_path: .github/workflows/CHANGELOG.md
- name: upload nbm artifact
uses: actions/upload-release-asset@v1
Expand Down
2 changes: 1 addition & 1 deletion manifest.mf
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ OpenIDE-Module: php.blade
OpenIDE-Module-Implementation-Version: 2
OpenIDE-Module-Layer: org/netbeans/modules/php/blade/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/blade/resources/Bundle.properties
OpenIDE-Module-Specification-Version: 2.5.0.7
OpenIDE-Module-Specification-Version: 2.5.0.8

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ OpenIDE-Module-Display-Category=PHP
OpenIDE-Module-Long-Description=\
Support for Blade template syntax for PHP.\n\
Still experimental.\n\
<p>@author Haidu Bogdan</p>\n\n<h2>Latest updates</h2>\n\n[2.5.0.7] - regression fix for directive php embedding<br>\n[2.5.0.6] - include `@when`, `@bool` directive, no more php embedding on directive parenthesis wrapping<br>\n[2.5.0.5] -simplifying php brace matcher freeze issue for chars with ":" wrapped in brackets<br>\n[2.5.0.4] - lexer for css at rules<br>\n[2.5.0.3] - brace higlight for custom directive<br>\n[2.5.0.2] - fix syntax highlight issue 67<br>\n[2.5.0.1] - fix syntax highlight issue 66, stop completion inside php strings<br>\n[2.5.0.0] - fix IDE freeze on '?\
<p>@author Haidu Bogdan</p>\n\n<h2>Latest updates</h2>\n\n[2.5.0.8] - regression fix adjustments for directive php embedding<br>\n[2.5.0.7] - regression fix for directive php embedding<br>\n[2.5.0.6] - include `@when`, `@bool` directive, no more php embedding on directive parenthesis wrapping<br>\n[2.5.0.5] -simplifying php brace matcher freeze issue for chars with ":" wrapped in brackets<br>\n[2.5.0.4] - lexer for css at rules<br>\n[2.5.0.3] - brace higlight for custom directive<br>\n[2.5.0.2] - fix syntax highlight issue 67<br>\n[2.5.0.1] - fix syntax highlight issue 66, stop completion inside php strings<br>\n[2.5.0.0] - fix IDE freeze on '?\
:' short if expr, fix namespace static method completion<br>\n[2.4.9.9] - limited go to file + completion for vite assets, decl finder fixes + refactor for php code<br>\n[2.4.9.8] - fix comment highlight issue in directive php expression, improvements on php namespace completion<br>\n[2.4.9.7] - fix livewire component formatting, display namespace path on class method completion<br>\n[2.4.9.6] - detect namespace path on directives php expression\n[2.4.9.5] - fix directive completion before double quote html, add attr directive to completion list<br>\n[2.4.9.4] - fix issue 57 formatting with optgroup<br>\n[2.4.9.3] - configurable declaration finder for view paths<br>\n[2.4.9.1] - fix block tag completion cursor preview<br>\n[2.4.8.9] - auto tag completion is true by default<br>\n[2.4.8.8] - fix issue 61, endcan tag breaks syntax highlighting<br>\n[2.4.8.7] - cleaning code, refactor<br>\n[2.4.8.7] - cleaning code, refactor<br>\n[2.4.8] - change License to Apache, blade tag autocomplete<br>\n[2.4.7] - debug lag with completion<br>\n[2.4.6] - use custom BladeCompletionItem, add @lang<br>\n[2.4.5] - use custom BladeCompletionItem<br>\n[2.4.3.2] - disable unused parser caching<br>\n[2.3.4.3] - [code] brace matcher is using annotation<br>\n[2.3.4.2] - fix navigator regression hafter disabling the ParserListener<br>\n[2.3.4.1] - fix php parser error for empty `@php` blocks<br>\n[2.3.9.3] - fix comment parser error regression<br>\n[2.3.7.2 - 2.3.8.3] - refactor directive completion<br>\n[2.3.6.2] - refactored parser for optimisation
OpenIDE-Module-Name=Php Blade
OpenIDE-Module-Short-Description=Support for Blade template engine for PHP.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,12 @@ EXIT_RAW_ECHO_EOF : EOF->type(ERROR),popMode;
mode INSIDE_PHP_EXPRESSION;

OPEN_PAREN : '(' {this.consumeOpenParen();};
CLOSE_PAREN : [ ]* ')' {this.consumeCloseParen();};
CLOSE_PAREN : ')' {this.consumeCloseParen();};

PHP_EXPRESSION_COMMENT : ('/*' .*? '*/')->skip;

WS_EXPRESSION_MORE : [ ]+ {this.consumeExprToken();};

PHP_EXPRESSION_MORE : . {this.consumeExprToken();};

EXIT_EOF : EOF->type(ERROR),mode(DEFAULT_MODE);
Expand Down
Loading

0 comments on commit 3b872ca

Please sign in to comment.