-
Notifications
You must be signed in to change notification settings - Fork 918
include php blade plugin in php cluster #7618
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
Draft
haidubogdan
wants to merge
43
commits into
apache:master
Choose a base branch
from
haidubogdan:7531_php_blade
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
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 a053256
feedback resolve: license header, tab -> whitespace on project.xml, /…
haidubogdan 77ea0a9
image license, use a fallback blade icon, license on generated lexer,
haidubogdan 8bd8a2a
remove laravel from friend package list, move icon path in ResourceUt…
haidubogdan dcb2395
fix duplicated project.xml, using new switch syntax, // NOI18N
haidubogdan dada6ec
batch of reviews, adding // NOI18N, refactoring the switch syntax, mo…
haidubogdan 2965760
batch of reviews, first set of unit tests, remove old test base
haidubogdan 495cc29
batch of reviews changes //NOI18N for strings, permission refactoring…
haidubogdan 6f10f8d
switch refacotr, // NOI18N, safe case for null pointer
haidubogdan 44a03ef
remove BladeLanguage commented scripts
haidubogdan c2798b0
cover all possilities for some 17 syntax switch rules
haidubogdan a861ff6
reviews on PhpFunctionElement - modify namespace access, use List.of …
haidubogdan bf04329
review updates for 12 august
haidubogdan be495c9
comment update, syncronize blade project properties cleanup
haidubogdan 33cb253
batch of java code compliance changes for hyperlinkprovider, blade co…
haidubogdan 2218fa7
refactor+ wip compliance code on blade parser, remove comment
haidubogdan b602a55
refactor, code compliance, update lexer for css at rules, embedding t…
haidubogdan 52f12ce
improve embedded php brace matcher freeze issue, remove hyperlink, ph…
haidubogdan 4f03632
internationalization comments, remove unecessary CompletionRequest co…
haidubogdan c9697cc
switch case code review, NOI18N, use Set instead of List for contains…
haidubogdan 59277d3
add test action for php module workflow, add sample files in license …
haidubogdan 0d4c1a6
add brace matcher tests, typinghook tests, removed comments, wip form…
haidubogdan aa7ed46
add position for mime service, unix endline for braces test files, in…
haidubogdan f5ec6e7
wip formatter fixes and tests, move BladeError outside of parser class
haidubogdan f6cefc5
using set.of for immutable sets, reset parse error tests
haidubogdan dad0e65
add new parser tests, exclude directive parenteshis from php emebedde…
haidubogdan 5eab624
//NOI18N, move folder and names to constant, encapsulation
haidubogdan 8867b05
remove antlr generated files
haidubogdan 71c87ad
remove out of the ide parsing implementation and utils, replace it wi…
haidubogdan 73d3956
code compliance updates
haidubogdan 0a6f22e
rebased branch, remove apache commons lang lib, update antlr parser b…
haidubogdan 5d69251
add classpathref attribute in build config
haidubogdan 5ee63cb
add antlr-parser to build-init, add new directives
haidubogdan c38e5ce
php embedding adjustments, fix parser error for includeFirst
haidubogdan 7b80f2b
refactor part2 from personal plugin evolution
haidubogdan 7188d86
wip adapt code refactor for tests
haidubogdan 28cb6df
remove antlr generated lexer & parser for html & php code
haidubogdan 4a08988
add license to new files, include missing compile antlr classes, incl…
haidubogdan 73b97f1
add gitignored util class BladeAntlrLexerUtils, include license on fo…
haidubogdan 83a9e5e
sync plugin latest fixes
haidubogdan 775591b
cleanup, include blade navigator test, include missing directive props
haidubogdan a6b32d6
add missing classpath for antlr php lexer build
haidubogdan 2f91e30
refactor code after php embedded code fix on braces matcher, sync lat…
haidubogdan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
|
|
||
| - [ ] ?? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.