Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

include php blade plugin in php cluster #7618

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
80f81ca
include php blade plugin in php cluster
haidubogdan Jul 28, 2024
24fd8df
feedback resolve: license header, tab -> whitespace on project.xml, /…
haidubogdan Jul 31, 2024
fb66388
image license, use a fallback blade icon, license on generated lexer,
Aug 4, 2024
3471adb
remove laravel from friend package list, move icon path in ResourceUt…
haidubogdan Aug 5, 2024
17f2462
fix duplicated project.xml, using new switch syntax, // NOI18N
haidubogdan Aug 5, 2024
b250342
batch of reviews, adding // NOI18N, refactoring the switch syntax, mo…
haidubogdan Aug 7, 2024
a0c18f4
batch of reviews, first set of unit tests, remove old test base
haidubogdan Aug 8, 2024
07e4733
batch of reviews changes //NOI18N for strings, permission refactoring…
haidubogdan Aug 12, 2024
91300fd
switch refacotr, // NOI18N, safe case for null pointer
haidubogdan Aug 12, 2024
ca4d05f
remove BladeLanguage commented scripts
haidubogdan Aug 12, 2024
db25893
cover all possilities for some 17 syntax switch rules
haidubogdan Aug 12, 2024
779f4d6
reviews on PhpFunctionElement - modify namespace access, use List.of …
haidubogdan Aug 12, 2024
06a83a6
review updates for 12 august
haidubogdan Aug 20, 2024
8af4c34
comment update, syncronize blade project properties cleanup
haidubogdan Aug 20, 2024
899225f
batch of java code compliance changes for hyperlinkprovider, blade co…
haidubogdan Sep 4, 2024
ca8cf16
refactor+ wip compliance code on blade parser, remove comment
haidubogdan Sep 4, 2024
1e0f97d
refactor, code compliance, update lexer for css at rules, embedding t…
haidubogdan Sep 13, 2024
5ecc8fd
improve embedded php brace matcher freeze issue, remove hyperlink, ph…
haidubogdan Sep 27, 2024
2c11a26
internationalization comments, remove unecessary CompletionRequest co…
haidubogdan Sep 30, 2024
cbcb77e
switch case code review, NOI18N, use Set instead of List for contains…
haidubogdan Oct 1, 2024
8b254a9
add test action for php module workflow, add sample files in license …
haidubogdan Oct 1, 2024
506d0b4
add brace matcher tests, typinghook tests, removed comments, wip form…
haidubogdan Oct 4, 2024
b739e7f
add position for mime service, unix endline for braces test files, in…
haidubogdan Oct 5, 2024
e687dd0
wip formatter fixes and tests, move BladeError outside of parser class
haidubogdan Oct 7, 2024
c5f3bf0
using set.of for immutable sets, reset parse error tests
haidubogdan Oct 8, 2024
8b296c2
add new parser tests, exclude directive parenteshis from php emebedde…
haidubogdan Oct 9, 2024
343f1c6
//NOI18N, move folder and names to constant, encapsulation
haidubogdan Oct 10, 2024
56132a4
remove antlr generated files
haidubogdan Oct 11, 2024
70db25a
remove out of the ide parsing implementation and utils, replace it wi…
haidubogdan Oct 11, 2024
18d5ad0
code compliance updates
haidubogdan Oct 11, 2024
1b46d62
rebased branch, remove apache commons lang lib, update antlr parser b…
haidubogdan Oct 11, 2024
c65b8c3
add classpathref attribute in build config
haidubogdan Oct 12, 2024
89fa55f
add antlr-parser to build-init, add new directives
haidubogdan Oct 19, 2024
c250246
php embedding adjustments, fix parser error for includeFirst
haidubogdan Oct 21, 2024
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 @@ -2377,6 +2377,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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -118,5 +118,8 @@ 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

# idea
.idea
1 change: 1 addition & 0 deletions nbbuild/cluster.properties
Original file line number Diff line number Diff line change
Expand Up @@ -956,6 +956,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>
haidubogdan marked this conversation as resolved.
Show resolved Hide resolved
<friend>org.netbeans.modules.php.cake3</friend>
<friend>org.netbeans.modules.php.code.analysis</friend>
<friend>org.netbeans.modules.php.codeception</friend>
Expand Down
56 changes: 56 additions & 0 deletions php/php.blade/build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?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"/>
<property name="formatter.outdir" location="${src.dir}/org/netbeans/modules/php/blade/syntax/antlr4/formatter"/>
<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>
<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>
<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>

<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="${v10.outdir}" includes="*.tokens"/>
<delete dir="${v10.outdir}" includes="*.interp"/>
<delete dir="${formatter.outdir}" includes="*.tokens"/>
<delete dir="${formatter.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