</fileTypes>
<fileTypes
type="text"
- extension="php5">
+ extension="php5">
</fileTypes>
<fileTypes
type="text"
type="text"
extension="phtml">
</fileTypes>
- <!-- <fileTypes
+ <fileTypes
type="text"
extension="html">
</fileTypes>
</fileTypes>
<fileTypes
type="text"
- extension="xml">
+ extension="xhtml">
</fileTypes>
- <fileTypes
+ <!-- <fileTypes
type="text"
extension="tpl">
</fileTypes> -->
symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont"
id="net.sourceforge.phpeclipse.PHPUnitEditor">
</editor>
- <!-- <editor
+ <editor
name="%phpEditorName"
default="true"
icon="icons/obj16/htmledit.gif"
<editor
name="%phpEditorName"
default="true"
- icon="icons/obj16/xmledit.gif"
- extensions="xml"
+ icon="icons/obj16/htmledit.gif"
+ extensions="xhtml"
contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor"
class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont"
id="net.sourceforge.phpeclipse.PHPUnitEditor">
</editor>
- <editor
+ <!-- <editor
name="%phpEditorName"
default="true"
icon="icons/obj16/htmledit.gif"
id="net.sourceforge.phpeclipse.actions.showAction">
</action>
</objectContribution>
- <objectContribution
+ <objectContribution
objectClass="org.eclipse.core.resources.IFile"
nameFilter="*.xml"
id="net.sourceforge.phpeclipse.actions.popupShowAction">
name="%javaDocumentSetupParticipant"
point="org.eclipse.core.filebuffers.documentSetup">
<participant
- extensions="php,php3,php4,php5,module,inc,phtml"
+ extensions="php,php3,php4,php5,module,inc,phtml,html,htm,xhtml"
class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentSetupParticipant">
</participant>
<!-- <participant
id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
</provider>
</extension>
-<!-- <extension
+ <extension
point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%htmlFileExtension"
<extension
point="org.eclipse.ui.editors.documentProviders">
<provider
- extensions="%xmlFileExtension"
+ extensions="xhtml"
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
</provider>
</extension>
- <extension
+ <!-- <extension
point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%tplFileExtension"
break;
case TokenNameVariable :
case TokenNameDOLLAR_LBRACE :
- case TokenNameCURLY_OPEN :
+ case TokenNameLBRACE_DOLLAR :
encaps_var();
break;
- // case TokenNameDOLLAR :
- // getNextToken();
- // if (token == TokenNameLBRACE) {
- // token = TokenNameDOLLAR_LBRACE;
- // encaps_var();
- // }
- // break;
default :
char encapsedChar = ((Character) scanner.encapsedStringStack.peek()).charValue();
if (encapsedChar == '$') {
break;
case TokenNameDOLLAR_LBRACE :
getNextToken();
- if (token == TokenNameIdentifier) {
+ if (token == TokenNameDOLLAR_LBRACE) {
+ encaps_var();
+ } else if (token == TokenNameIdentifier) {
getNextToken();
if (token == TokenNameLBRACKET) {
getNextToken();
getNextToken();
// }
}
- if (token != TokenNameRBRACE) {
- throwSyntaxError("'}' expected after '${'.");
- }
- // scanner.encapsedStringStack.pop();
- getNextToken();
} else {
expr();
- if (token != TokenNameRBRACE) {
- throwSyntaxError("'}' expected.");
- }
- // scanner.encapsedStringStack.pop();
- getNextToken();
}
+ if (token != TokenNameRBRACE) {
+ throwSyntaxError("'}' expected.");
+ }
+ getNextToken();
break;
- case TokenNameCURLY_OPEN :
+ case TokenNameLBRACE_DOLLAR :
getNextToken();
- if (token == TokenNameIdentifier || token > TokenNameKEYWORD) {
+ if (token == TokenNameLBRACE_DOLLAR) {
+ encaps_var();
+ } else if (token == TokenNameIdentifier || token > TokenNameKEYWORD) {
getNextToken();
if (token == TokenNameLBRACKET) {
getNextToken();