Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
7a208a9
include php blade plugin in php cluster
haidubogdan Jul 28, 2024
a053256
feedback resolve: license header, tab -> whitespace on project.xml, /…
haidubogdan Jul 31, 2024
77ea0a9
image license, use a fallback blade icon, license on generated lexer,
haidubogdan Aug 4, 2024
8bd8a2a
remove laravel from friend package list, move icon path in ResourceUt…
haidubogdan Aug 5, 2024
dcb2395
fix duplicated project.xml, using new switch syntax, // NOI18N
haidubogdan Aug 5, 2024
dada6ec
batch of reviews, adding // NOI18N, refactoring the switch syntax, mo…
haidubogdan Aug 7, 2024
2965760
batch of reviews, first set of unit tests, remove old test base
haidubogdan Aug 8, 2024
495cc29
batch of reviews changes //NOI18N for strings, permission refactoring…
haidubogdan Aug 12, 2024
6f10f8d
switch refacotr, // NOI18N, safe case for null pointer
haidubogdan Aug 12, 2024
44a03ef
remove BladeLanguage commented scripts
haidubogdan Aug 12, 2024
c2798b0
cover all possilities for some 17 syntax switch rules
haidubogdan Aug 12, 2024
a861ff6
reviews on PhpFunctionElement - modify namespace access, use List.of …
haidubogdan Aug 12, 2024
bf04329
review updates for 12 august
haidubogdan Aug 20, 2024
be495c9
comment update, syncronize blade project properties cleanup
haidubogdan Aug 20, 2024
33cb253
batch of java code compliance changes for hyperlinkprovider, blade co…
haidubogdan Sep 4, 2024
2218fa7
refactor+ wip compliance code on blade parser, remove comment
haidubogdan Sep 4, 2024
b602a55
refactor, code compliance, update lexer for css at rules, embedding t…
haidubogdan Sep 13, 2024
52f12ce
improve embedded php brace matcher freeze issue, remove hyperlink, ph…
haidubogdan Sep 27, 2024
4f03632
internationalization comments, remove unecessary CompletionRequest co…
haidubogdan Sep 30, 2024
c9697cc
switch case code review, NOI18N, use Set instead of List for contains…
haidubogdan Oct 1, 2024
59277d3
add test action for php module workflow, add sample files in license …
haidubogdan Oct 1, 2024
0d4c1a6
add brace matcher tests, typinghook tests, removed comments, wip form…
haidubogdan Oct 4, 2024
aa7ed46
add position for mime service, unix endline for braces test files, in…
haidubogdan Oct 5, 2024
f5ec6e7
wip formatter fixes and tests, move BladeError outside of parser class
haidubogdan Oct 7, 2024
f6cefc5
using set.of for immutable sets, reset parse error tests
haidubogdan Oct 8, 2024
dad0e65
add new parser tests, exclude directive parenteshis from php emebedde…
haidubogdan Oct 9, 2024
5eab624
//NOI18N, move folder and names to constant, encapsulation
haidubogdan Oct 10, 2024
8867b05
remove antlr generated files
haidubogdan Oct 11, 2024
71c87ad
remove out of the ide parsing implementation and utils, replace it wi…
haidubogdan Oct 11, 2024
73d3956
code compliance updates
haidubogdan Oct 11, 2024
0a6f22e
rebased branch, remove apache commons lang lib, update antlr parser b…
haidubogdan Oct 11, 2024
5d69251
add classpathref attribute in build config
haidubogdan Oct 12, 2024
5ee63cb
add antlr-parser to build-init, add new directives
haidubogdan Oct 19, 2024
c38e5ce
php embedding adjustments, fix parser error for includeFirst
haidubogdan Oct 21, 2024
7b80f2b
refactor part2 from personal plugin evolution
haidubogdan Feb 22, 2025
7188d86
wip adapt code refactor for tests
haidubogdan Feb 23, 2025
28cb6df
remove antlr generated lexer & parser for html & php code
haidubogdan Feb 23, 2025
4a08988
add license to new files, include missing compile antlr classes, incl…
haidubogdan Feb 24, 2025
73b97f1
add gitignored util class BladeAntlrLexerUtils, include license on fo…
haidubogdan Feb 26, 2025
83a9e5e
sync plugin latest fixes
haidubogdan Mar 27, 2025
775591b
cleanup, include blade navigator test, include missing directive props
haidubogdan Mar 27, 2025
a6b32d6
add missing classpath for antlr php lexer build
haidubogdan Mar 31, 2025
2f91e30
refactor code after php embedded code fix on braces matcher, sync lat…
haidubogdan Feb 8, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2420,6 +2420,9 @@ jobs:
- name: php.atoum
run: ant $OPTS -f php/php.atoum test

- name: php.blade
run: ant $OPTS -f php/php.blade test

- name: php.code.analysis
run: ant $OPTS -f php/php.code.analysis test

Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -119,5 +119,10 @@ derby.log

/webcommon/javascript2.json/src/org/netbeans/modules/javascript2/json/parser/Json*.java

php/php.blade/src/org/netbeans/modules/php/blade/syntax/antlr4/v10/BladeAntlr*.java
php/php.blade/src/org/netbeans/modules/php/blade/syntax/antlr4/formatter/BladeAntlr*.java
php/php.blade/src/org/netbeans/modules/php/blade/syntax/antlr4/html_components/Blade*.java
php/php.blade/src/org/netbeans/modules/php/blade/syntax/antlr4/php/Blade*.java

# idea
.idea
1 change: 1 addition & 0 deletions nbbuild/cluster.properties
Original file line number Diff line number Diff line change
Expand Up @@ -933,6 +933,7 @@ nb.cluster.php=\
php.api.testing,\
php.apigen,\
php.atoum,\
php.blade,\
php.code.analysis,\
php.codeception,\
php.composer,\
Expand Down
1 change: 1 addition & 0 deletions php/php.api.editor/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
<friend>org.nbphpcouncil.modules.php.yii2</friend>
<friend>org.netbeans.modules.php.api.framework</friend>
<friend>org.netbeans.modules.php.api.testing</friend>
<friend>org.netbeans.modules.php.blade</friend>
<friend>org.netbeans.modules.php.atoum</friend>
<friend>org.netbeans.modules.php.cake3</friend>
<friend>org.netbeans.modules.php.codeception</friend>
Expand Down
1 change: 1 addition & 0 deletions php/php.api.framework/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@
<friend>org.nbphpcouncil.modules.php.laravel4</friend>
<friend>org.nbphpcouncil.modules.php.yii</friend>
<friend>org.nbphpcouncil.modules.php.yii2</friend>
<friend>org.netbeans.modules.php.blade</friend>
<friend>org.netbeans.modules.php.cake3</friend>
<friend>org.netbeans.modules.php.doctrine2</friend>
<friend>org.netbeans.modules.php.fuel</friend>
Expand Down
1 change: 1 addition & 0 deletions php/php.api.phpmodule/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@
<friend>org.netbeans.modules.php.api.testing</friend>
<friend>org.netbeans.modules.php.apigen</friend>
<friend>org.netbeans.modules.php.atoum</friend>
<friend>org.netbeans.modules.php.blade</friend>
<friend>org.netbeans.modules.php.cake3</friend>
<friend>org.netbeans.modules.php.code.analysis</friend>
<friend>org.netbeans.modules.php.codeception</friend>
Expand Down
14 changes: 14 additions & 0 deletions php/php.blade/TODO.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# TODO for module

## Sync update from plugin
- [ ] Hyperlinkimpl
- [ ] new Directives
- [ ] Plugin system (inertia)

## Include in module / link to documentation?

- [ ] Option controller

## Cleanup / simplification

- [ ] ??
85 changes: 85 additions & 0 deletions php/php.blade/build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.

-->
<project basedir="." default="build" name="php/php.blade">
<description>Builds, tests, and runs the project org.netbeans.modules.php.blade</description>
<import file="../../nbbuild/templates/projectized.xml"/>
<target name="build-init" description="Regenerate blade ANTLRv4 parser" depends="projectized.build-init" extensionOf="-pre-compile">
<echo message="Building antlr parser" />
<property name="v10.outdir" location="${src.dir}/org/netbeans/modules/php/blade/syntax/antlr4/v10"/>

<path id="antlr4.tool">
<fileset dir="../../ide/libs.antlr4.runtime/external" includes="*.jar"/>
<fileset dir="../../ide/libs.antlr3.runtime/external" includes="antlr-runtime-*.jar"/>
</path>

<!--coloring-->
<java classname="org.antlr.v4.Tool" classpathref="antlr4.tool" fork="true" dir="${v10.outdir}">
<arg value="-o"/>
<arg value="${v10.outdir}"/>
<arg value="BladeAntlrColoringLexer.g4"/>
</java>

<!--ide parser-->
<java classname="org.antlr.v4.Tool" classpathref="antlr4.tool" fork="true" dir="${v10.outdir}">
<arg value="-o"/>
<arg value="${v10.outdir}"/>
<arg value="BladeAntlrLexer.g4"/>
<arg value="BladeAntlrParser.g4"/>
</java>
<delete dir="${v10.outdir}" includes="*.tokens"/>
<delete dir="${v10.outdir}" includes="*.interp"/>

<!--formatter-->
<property name="formatter.outdir" location="${src.dir}/org/netbeans/modules/php/blade/syntax/antlr4/formatter"/>
<java classname="org.antlr.v4.Tool" classpathref="antlr4.tool" fork="true" dir="${formatter.outdir}">
<arg value="-o"/>
<arg value="${formatter.outdir}"/>
<arg value="BladeAntlrFormatterLexer.g4"/>
<arg value="BladeAntlrFormatterParser.g4"/>
</java>
<delete dir="${formatter.outdir}" includes="*.tokens"/>
<delete dir="${formatter.outdir}" includes="*.interp"/>

<!--php-->
<property name="php.outdir" location="${src.dir}/org/netbeans/modules/php/blade/syntax/antlr4/php"/>
<java classname="org.antlr.v4.Tool" classpathref="antlr4.tool" fork="true" dir="${php.outdir}">
<arg value="-o"/>
<arg value="${php.outdir}"/>
<arg value="BladePhpAntlrLexer.g4"/>
<arg value="BladePhpAntlrParser.g4"/>
</java>
<delete dir="${php.outdir}" includes="*.tokens"/>
<delete dir="${php.outdir}" includes="*.interp"/>

<!--html-->
<property name="html_components.outdir" location="${src.dir}/org/netbeans/modules/php/blade/syntax/antlr4/html_components"/>
<java classname="org.antlr.v4.Tool" classpathref="antlr4.tool" fork="true" dir="${html_components.outdir}">
<arg value="-o"/>
<arg value="${html_components.outdir}"/>
<arg value="BladeHtmlAntlrLexer.g4"/>
<arg value="BladeHtmlAntlrParser.g4"/>
</java>
<delete dir="${html_components.outdir}" includes="*.tokens"/>
<delete dir="${html_components.outdir}" includes="*.interp"/>

</target>
</project>
39 changes: 39 additions & 0 deletions php/php.blade/licenseinfo.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.

-->
<licenseinfo>
<fileset>
<file>src/org/netbeans/modules/php/blade/resources/emptyBladeFile.blade.php</file>
<file>src/org/netbeans/modules/php/blade/resources/formattingExample.blade.php</file>
<file>src/org/netbeans/modules/php/blade/resources/highlightBlade.blade.php</file>
<file>src/org/netbeans/modules/php/blade/resources/NewBladeFileDescription.html</file>
<license ref="Apache-2.0-ASF" />
<comment type="GUI_USABILITY"/>
</fileset>
<fileset>
<file>src/org/netbeans/modules/php/blade/resources/icon.png</file>
<file>src/org/netbeans/modules/php/blade/resources/icons/at.png</file>
<file>src/org/netbeans/modules/php/blade/resources/icons/blade_file.png</file>
<file>src/org/netbeans/modules/php/blade/resources/icons/layout.png</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
</licenseinfo>
7 changes: 7 additions & 0 deletions php/php.blade/manifest.mf
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.php.blade/1
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: 1.0.0

20 changes: 20 additions & 0 deletions php/php.blade/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

javac.compilerargs=-Xlint -Xlint:-serial
spec.version.base.fatal.warning=false
javac.release=17
Loading
Loading