X-Git-Url: http://git.phpeclipse.com
diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 2605ebe..57699a0 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
-
<plugin
id="net.sourceforge.phpeclipse"
name="%pluginName"
- version="1.1.0"
+ version="1.1.2"
provider-name="%providerName"
class="net.sourceforge.phpeclipse.PHPeclipsePlugin">
@@ -12,6 +11,7 @@
<library name="phpeclipse.jar">
<export name="*"/>
</library>
+ <!-- <library name="lib/xstream-1.0.2.jar" /> -->
</runtime>
<requires>
<import plugin="org.eclipse.core.runtime.compatibility"/>
@@ -30,10 +30,16 @@
<import plugin="org.eclipse.ui.editors"/>
<import plugin="org.eclipse.ui.externaltools"/>
<import plugin="org.eclipse.help"/>
+ <import plugin="org.eclipse.team.core"/>
<import plugin="org.eclipse.swt"/>
<import plugin="org.eclipse.search"/>
<import plugin="org.eclipse.update.ui"/>
<import plugin="net.sourceforge.phpeclipse.quantum.sql"/>
+ <import plugin="net.sourceforge.phpeclipse.webbrowser"/>
+ <import plugin="net.sourceforge.phpeclipse.core"/>
+ <import plugin="net.sourceforge.phpeclipse.ui"/>
+ <import plugin="net.sourceforge.phpeclipse.xml.core"/>
+ <import plugin="net.sourceforge.phpeclipse.xml.ui"/>
</requires>
<extension
@@ -89,8 +95,53 @@
<persistent value="true"/>
</extension>
- <extension-point id="phpEditorTextHovers" name="%phpEditorTextHoversName" schema="schema/phpEditorTextHovers.exsd"/>
- <extension-point id="foldingStructureProviders" name="%foldingStructureProvidersExtensionPoint" schema="schema/foldingStructureProviders.exsd"/>
+<extension-point id="phpElementFilters" name="%elementFiltersName" schema="schema/phpElementFilters.exsd"/>
+<extension-point id="phpEditorTextHovers" name="%phpEditorTextHoversName" schema="schema/phpEditorTextHovers.exsd"/>
+<extension-point id="foldingStructureProviders" name="%foldingStructureProvidersExtensionPoint" schema="schema/foldingStructureProviders.exsd"/>
+
+ <extension
+ point="org.eclipse.ui.decorators">
+ <!--
+ <decorator
+ label="%ProblemsLabelDecorator.label"
+ state="false"
+ lightweight="true"
+ location="BOTTOM_LEFT"
+ class="net.sourceforge.phpdt.ui.ProblemsLabelDecorator"
+ id="net.sourceforge.phpdt.ui.problem.decorator">
+ <description>
+ %ProblemsLabelDecorator.description
+ </description>
+ <enablement>
+ <or>
+ <objectClass
+ name="org.eclipse.core.resources.IResource">
+ </objectClass>
+ <objectClass
+ name="net.sourceforge.phpdt.core.IJavaElement">
+ </objectClass>
+ </or>
+ </enablement>
+ </decorator>
+ -->
+ <decorator
+ label="%OverrideIndicatorLabelDecorator.label"
+ lightweight="true"
+ location="BOTTOM_RIGHT"
+ state="true"
+ class="net.sourceforge.phpdt.ui.OverrideIndicatorLabelDecorator"
+ id="net.sourceforge.phpdt.ui.override.decorator">
+ <description>
+ %OverrideIndicatorLabelDecorator.description
+ </description>
+ <enablement>
+ <objectClass
+ name="net.sourceforge.phpdt.core.IMethod">
+ </objectClass>
+ </enablement>
+ </decorator>
+</extension>
+
<extension
point="org.eclipse.team.core.fileTypes">
<fileTypes
@@ -107,6 +158,14 @@
</fileTypes>
<fileTypes
type="text"
+ extension="php5">
+ </fileTypes>
+ <fileTypes
+ type="text"
+ extension="module">
+ </fileTypes>
+ <fileTypes
+ type="text"
extension="inc">
</fileTypes>
<fileTypes
@@ -123,12 +182,12 @@
</fileTypes>
<fileTypes
type="text"
- extension="xml">
- </fileTypes>
- <fileTypes
+ extension="xhtml">
+ </fileTypes>
+ <!-- <fileTypes
type="text"
extension="tpl">
- </fileTypes>
+ </fileTypes> -->
</extension>
<extension
@@ -149,9 +208,12 @@
label="%sourceHover"
description="%sourceHoverDescription">
</hover>
-</extension>
- <extension
- point="net.sourceforge.phpeclipse.phpEditorTextHovers">
+ <hover
+ label="%problemHover"
+ description="%problemHoverDescription"
+ class="net.sourceforge.phpdt.internal.ui.text.java.hover.ProblemHover"
+ id="net.sourceforge.phpdt.ui.ProblemHover">
+ </hover>
<hover
class="net.sourceforge.phpdt.internal.ui.text.java.hover.AnnotationHover"
id="net.sourceforge.phpdt.ui.AnnotationHover"
@@ -218,6 +280,16 @@
Create a basic PHP file.
</description>
</wizard>
+ <wizard
+ name="%newWizardHTMLFile.name"
+ icon="icons/obj16/htmledit.gif"
+ category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
+ class="net.sourceforge.phpeclipse.wizards.HTMLFileWizard"
+ id="net.sourceforge.phpeclipse.wizards.HTMLFileWizard">
+ <description>
+ Create a basic HTML file.
+ </description>
+ </wizard>
</extension>
<extension point="org.eclipse.ui.exportWizards">
<wizard name="%ExportWizards.Obfuscator"
@@ -247,7 +319,7 @@
name="nature"
value="net.sourceforge.phpeclipse.phpnature">
</filter>
- </page> -->
+ </page>
<page
objectClass="org.eclipse.core.resources.IProject"
name="PHP Project Settings"
@@ -257,7 +329,7 @@
name="nature"
value="net.sourceforge.phpeclipse.phpnature">
</filter>
- </page>
+ </page> -->
<page
objectClass="org.eclipse.core.resources.IProject"
name="%todoPageName"
@@ -298,12 +370,12 @@
value="net.sourceforge.phpeclipse.phpnature">
</filter>
</page>
- <page
+ <!-- <page
objectClass="org.eclipse.core.resources.IFile"
name="PHP File Settings"
class="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences"
id="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences">
- </page>
+ </page> -->
</extension>
<!-- <extension
point="org.eclipse.ui.views">
@@ -320,13 +392,13 @@
name="%phpEditorName"
default="true"
icon="icons/obj16/phpedit.gif"
- extensions="php"
+ extensions="php,php3,php4,php5,phtml,inc,module"
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/phpedit.gif"
@@ -350,6 +422,26 @@
name="%phpEditorName"
default="true"
icon="icons/obj16/phpedit.gif"
+ extensions="module"
+ 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
+ name="%phpEditorName"
+ default="true"
+ icon="icons/obj16/phpedit.gif"
+ extensions="php5"
+ 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
+ name="%phpEditorName"
+ default="true"
+ icon="icons/obj16/phpedit.gif"
extensions="inc"
contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor"
class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
@@ -365,18 +457,18 @@
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"
- extensions="htm"
+ extensions="htm,html,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"
@@ -389,14 +481,14 @@
<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> -->
+ <!-- <editor
name="%phpEditorName"
default="true"
icon="icons/obj16/htmledit.gif"
@@ -405,7 +497,7 @@
class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont"
id="net.sourceforge.phpeclipse.PHPUnitEditor">
- </editor>
+ </editor> -->
</extension>
<extension
point="org.eclipse.ui.fontDefinitions">
@@ -456,7 +548,7 @@
annotationType="net.sourceforge.phpdt.ui.info"
annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.JavaAnnotationImageProvider">
</specification>
- <specification
+ <specification
annotationType="org.eclipse.debug.core.breakpoint"
icon="icons/full/obj16/brkp_obj.gif"
annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.BreakpointImageProvider">
@@ -534,11 +626,12 @@
id="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction">
</action>
</actionSet>
+
<actionSet
label="%CodingActionSet.label"
description="%CodingActionSet.description"
visible="false"
- id="net.sourceforge.phpeclipse.ui.CodingActionSet">
+ id="net.sourceforge.phpeclipse.ui.CodingActionSet">
<!-- =========================================================================== -->
<!-- Source Menu -->
<!-- =========================================================================== -->
@@ -646,6 +739,7 @@
<part id="net.sourceforge.phpeclipse.PHPUnitEditor" />
</actionSetPartAssociation>
</extension>
+
<!-- =========================================================================== -->
<!-- PHP Editor Action Definition IDs -->
<!-- =========================================================================== -->
@@ -696,7 +790,7 @@
<extension
point="org.eclipse.ui.popupMenus">
- <objectContribution
+ <!-- <objectContribution
objectClass="org.eclipse.core.resources.IProject"
id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction">
<action
@@ -705,7 +799,7 @@
menubarPath="additions"
id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction">
</action>
- </objectContribution>
+ </objectContribution> -->
<objectContribution
objectClass="org.eclipse.core.resources.IFile"
nameFilter="*.php"
@@ -741,6 +835,28 @@
</objectContribution>
<objectContribution
objectClass="org.eclipse.core.resources.IFile"
+ nameFilter="*.php5"
+ id="net.sourceforge.phpeclipse.actions.externalParserAction">
+ <action
+ label="Run External PHP Parser"
+ class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
+ menubarPath="additions"
+ id="net.sourceforge.phpeclipse.actions.externalParserAction">
+ </action>
+ </objectContribution>
+ <objectContribution
+ objectClass="org.eclipse.core.resources.IFile"
+ nameFilter="*.module"
+ id="net.sourceforge.phpeclipse.actions.externalParserAction">
+ <action
+ label="Run External PHP Parser"
+ class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
+ menubarPath="additions"
+ id="net.sourceforge.phpeclipse.actions.externalParserAction">
+ </action>
+ </objectContribution>
+ <objectContribution
+ objectClass="org.eclipse.core.resources.IFile"
nameFilter="*.inc"
id="net.sourceforge.phpeclipse.actions.externalParserAction">
<action
@@ -796,6 +912,28 @@
</objectContribution>
<objectContribution
objectClass="org.eclipse.core.resources.IFile"
+ nameFilter="*.php5"
+ id="net.sourceforge.phpeclipse.actions.popupShowAction">
+ <action
+ label="Open PHP Browser"
+ class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
+ menubarPath="additions"
+ id="net.sourceforge.phpeclipse.actions.showAction">
+ </action>
+ </objectContribution>
+ <objectContribution
+ objectClass="org.eclipse.core.resources.IFile"
+ nameFilter="*.module"
+ id="net.sourceforge.phpeclipse.actions.popupShowAction">
+ <action
+ label="Open PHP Browser"
+ class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
+ menubarPath="additions"
+ id="net.sourceforge.phpeclipse.actions.showAction">
+ </action>
+ </objectContribution>
+ <objectContribution
+ objectClass="org.eclipse.core.resources.IFile"
nameFilter="*.inc"
id="net.sourceforge.phpeclipse.actions.popupShowAction">
<action
@@ -838,7 +976,7 @@
id="net.sourceforge.phpeclipse.actions.showAction">
</action>
</objectContribution>
- <objectContribution
+ <objectContribution
objectClass="org.eclipse.core.resources.IFile"
nameFilter="*.xml"
id="net.sourceforge.phpeclipse.actions.popupShowAction">
@@ -852,35 +990,46 @@
<viewerContribution
targetID="#PHPEditorContext"
- id="net.sourceforge.phpeclipse.actions.popupOpenDeclaration">
+ id="net.sourceforge.phpeclipse.actions.popupOpenSQLTable">
<action
- label="Open PHP Declaration"
- class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"
+ label="Open Quantum SQL Table View"
+ class="net.sourceforge.phpeclipse.actions.PHPOpenSQLTableEditorAction"
menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.opendeclaration">
+ id="net.sourceforge.phpeclipse.actions.opensqltable">
</action>
</viewerContribution>
<viewerContribution
targetID="#PHPEditorContext"
- id="net.sourceforge.phpeclipse.actions.popupOpenInclude">
+ id="net.sourceforge.phpeclipse.actions.popupHTMLWizard">
<action
- label="Open Include File"
- class="net.sourceforge.phpeclipse.actions.PHPOpenIncludeEditorAction"
+ label="Insert HTML (dl,ul,ol,table)"
+ class="net.sourceforge.phpeclipse.wizards.html.InsertHTMLElementAction"
menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.openinclude">
+ id="net.sourceforge.phpeclipse.actions.wizards.html">
</action>
</viewerContribution>
<viewerContribution
targetID="#PHPEditorContext"
- id="net.sourceforge.phpeclipse.actions.popupOpenSQLTable">
+ id="net.sourceforge.phpeclipse.actions.popupOpenAllIncludes">
<action
- label="Open Quantum SQL Table View"
- class="net.sourceforge.phpeclipse.actions.PHPOpenSQLTableEditorAction"
+ label="Open Included Files List"
+ class="net.sourceforge.phpeclipse.actions.PHPOpenAllIncludesEditorAction"
menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.opensqltable">
+ id="net.sourceforge.phpeclipse.actions.openallincludes">
</action>
</viewerContribution>
-
+ <viewerContribution
+ targetID="#PHPEditorContext"
+ id="net.sourceforge.phpeclipse.actions.popupOpenDeclaration">
+ <action
+ label="%OpenDeclaration"
+ class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"
+ menubarPath="additions"
+ definitionId="net.sourceforge.phpeclipse.actions.opendeclaration"
+ id="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction">
+ </action>
+ </viewerContribution>
+
<viewerContribution
targetID="#PHPRulerContext"
id="net.sourceforge.phpdt.ui.PHPEditorPopupActions">
@@ -906,7 +1055,6 @@
<editorContribution
id="org.eclipse.ui.texteditor.ruler.actions"
targetID="net.sourceforge.phpeclipse.PHPUnitEditor">
-
<action
id="org.eclipse.ui.texteditor.BookmarkRulerAction"
actionID="RulerDoubleClick"
@@ -921,15 +1069,25 @@
id="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerAction">
</action>
</editorContribution>
+ <editorContribution
+ id="net.sourceforge.phpdt.editor.actions"
+ targetID="net.sourceforge.phpeclipse.PHPUnitEditor">
+ <action
+ definitionId="net.sourceforge.phpeclipse.actions.opendeclaration"
+ label="%OpenDeclaration"
+ class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"
+ id="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction">
+ </action>
+ </editorContribution>
</extension>
<extension
point="org.eclipse.ui.popupMenus">
- <viewerContribution
+ <viewerContribution
targetID="#CompilationUnitRulerContext"
id="net.sourceforge.phpeclipse.phpeditor.QuickFixRulerMenuAction">
<action
label="%Dummy.label"
- helpContextId="org.eclipse.jdt.ui.quick_fix_action"
+ helpContextId="net.sourceforge.phpeclipse.quick_fix_action"
class="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerAction"
menubarPath="additions"
id="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerMenuAction">
@@ -981,8 +1139,14 @@
</viewerContribution>
</extension>
<!-- =========================================================================== -->
-<!-- JDT/UI command definitions -->
+<!-- PHPDT/UI command definitions -->
<!-- =========================================================================== -->
+ <extension point="org.eclipse.ui.contexts">
+ <context name="%context.editingPHPSource.name"
+ description="%context.editingPHPSource.description"
+ parentId="org.eclipse.ui.textEditorScope"
+ id="net.sourceforge.phpdt.ui.phpEditorScope" />
+ </extension>
<extension
point="org.eclipse.ui.commands">
<category
@@ -990,18 +1154,6 @@
description="%category.source.description"
id="net.sourceforge.phpeclipse.ui.category.source">
</category>
- <command
- name="%ActionDefinition.showJavadoc.name"
- description="%ActionDefinition.showJavadoc.description"
- category="org.eclipse.ui.category.edit"
- id="net.sourceforge.phpeclipse.show.javadoc">
- </command>
- <keyBinding
- string="F2"
- scope="net.sourceforge.phpdt.ui.phpEditorScope"
- command="net.sourceforge.phpeclipse.show.javadoc"
- configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
<!-- source -->
<command
@@ -1016,12 +1168,13 @@
category="net.sourceforge.phpeclipse.ui.category.source"
id="net.sourceforge.phpeclipse.phpeditor.uncomment">
</command>
- <command
+ <command
name="%ActionDefinition.toggleComment.name"
description="%ActionDefinition.toggleComment.description"
category="net.sourceforge.phpeclipse.ui.category.source"
id="net.sourceforge.phpeclipse.phpeditor.toggle.comment">
</command>
+
<keyBinding
string="Ctrl+Shift+C"
scope="net.sourceforge.phpdt.ui.phpEditorScope"
@@ -1029,6 +1182,18 @@
configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
</keyBinding>
<keyBinding
+ string="Ctrl+/"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <keyBinding
+ string="Ctrl+7"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <keyBinding
platform="carbon"
string="Ctrl+Shift+C"
scope="net.sourceforge.phpdt.ui.phpEditorScope"
@@ -1043,6 +1208,34 @@
configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
</keyBinding>
<keyBinding
+ platform="carbon"
+ string="Ctrl+/"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command=""
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <keyBinding
+ platform="carbon"
+ string="Command+/"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <keyBinding
+ platform="carbon"
+ string="Ctrl+7"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command=""
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <keyBinding
+ platform="carbon"
+ string="Command+7"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <keyBinding
platform="gtk"
string="Ctrl+Shift+C"
scope="net.sourceforge.phpdt.ui.phpEditorScope"
@@ -1052,7 +1245,7 @@
<keyBinding
platform="gtk"
string="Esc Ctrl+C"
- scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
</keyBinding>
@@ -1161,23 +1354,64 @@
command="net.sourceforge.phpeclipse.phpeditor.format"
configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
</keyBinding>
+
+ <!-- navigate -->
+ <command
+ name="%ActionDefinition.gotoMatchingBracket.name"
+ description="%ActionDefinition.gotoMatchingBracket.description"
+ category="org.eclipse.ui.category.navigate"
+ id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket">
+ </command>
+ <keyBinding
+ string="Ctrl+Shift+P"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket"
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <keyBinding
+ platform="carbon"
+ string="Ctrl+Shift+P"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command=""
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <keyBinding
+ platform="carbon"
+ string="Command+Shift+P"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket"
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+
+ <command
+ name="%OpenDeclaration"
+ description="%OpenDeclaration"
+ category="net.sourceforge.phpeclipse.ui.category.source"
+ id="net.sourceforge.phpeclipse.actions.opendeclaration">
+ </command>
+ <keyBinding
+ string="F3"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command="net.sourceforge.phpeclipse.actions.opendeclaration"
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
</extension>
<extension
id="net.sourceforge.phpeclipse.JavaDocumentSetupParticipant"
name="%javaDocumentSetupParticipant"
point="org.eclipse.core.filebuffers.documentSetup">
<participant
- extensions="php,php3,php4,inc"
+ extensions="php,php3,php4,php5,module,inc,phtml,html,htm,xhtml"
class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentSetupParticipant">
</participant>
- <participant
+ <!-- <participant
extensions="html,xml"
class="net.sourceforge.phpeclipse.phpeditor.HTMLDocumentSetupParticipant">
</participant>
<participant
extensions="tpl"
class="net.sourceforge.phpeclipse.phpeditor.SmartyDocumentSetupParticipant">
- </participant>
+ </participant> -->
</extension>
<extension
id="net.sourceforge.phpeclipse.JavaDocumentFactory"
@@ -1193,33 +1427,46 @@
point="org.eclipse.ui.preferencePages">
<page
name="PHP"
+ category="net.sourceforge.phpeclipse.ui.preferencePage"
class="net.sourceforge.phpeclipse.PHPEclipseBasePreferencePage"
id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
</page>
<page
- name="PHP Parser"
+ name="Code Templates"
+ category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ class="net.sourceforge.phpdt.internal.ui.preferences.CodeTemplatePreferencePage"
+ id="net.sourceforge.phpeclipse.preference.CodeTemplatePreferencePage">
+ </page>
+ <!-- <page
+ name="Members Sort Order"
+ category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ class="net.sourceforge.phpdt.internal.ui.preferences.MembersOrderPreferencePage"
+ id="net.sourceforge.phpeclipse.preference.MembersOrderPreferencePage">
+ </page> -->
+ <page
+ name="PHP External Parser Command"
category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
- class="net.sourceforge.phpeclipse.PHPEclipseParserPreferencePage"
- id="net.sourceforge.phpeclipse.preference.PHPEclipseParserPreferencePage">
+ class="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage"
+ id="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage">
</page>
<!-- <page
name="Editor2"
category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
class="net.sourceforge.phpeclipse.PHPSyntaxEditorPreferencePage"
id="net.sourceforge.phpeclipse.preference.PHPSyntaxEditorPreferencePage">
- </page> -->
+ </page>
<page
category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
name="PHP Project Defaults"
class="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences"
id="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences">
- </page>
+ </page>
<page
category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
name="PHP Browser Preview"
class="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences"
id="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences">
- </page>
+ </page> -->
<page
name="%compilerOptionsPrefName"
category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
@@ -1233,45 +1480,55 @@
id="net.sourceforge.phpeclipse.preference.TodoTaskPreferencePage">
</page>
<page
- name="%templatePageName"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
- class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
- id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
- </page>
- <page
name="Formatter"
category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
class="net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage"
id="net.sourceforge.phpeclipse.preference.CodeFormatterPreferencePage">
</page>
- <!-- <page
- name="Editor"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
- class="net.sourceforge.phpdt.internal.ui.preferences.PHPEditorPreferencePage"
- id="net.sourceforge.phpeclipse.preference.PHPEditorPreferencePage">
- </page> -->
- <page
- name="Editor 2"
+ <page name="Editor"
category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
class="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
id="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage">
</page>
- <!-- <page
+ <page name="%codeAssistPageName"
+ category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+ class="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage"
+ id="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage">
+ </page>
+ <page
+ name="%templatePageName"
+ category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+ class="net.sourceforge.phpdt.internal.ui.preferences.JavaTemplatePreferencePage"
+ id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
+ </page>
+ <!-- <page
+ name="%templatePageName"
+ category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+ class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
+ id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
+ </page>
+ <page
name="Language Settings"
category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage">
</page> -->
+ <page
+ name="%spellingPrefName"
+ category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+ class="net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage"
+ id = "net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage">
+ </page>
</extension>
<extension
point="org.eclipse.ui.editors.documentProviders">
<provider
- extensions="%phpFileExtension"
+ extensions="php,php3,php4,php5,phtml,inc,module,html,htm,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="%php3FileExtension"
@@ -1290,6 +1547,22 @@
<extension
point="org.eclipse.ui.editors.documentProviders">
<provider
+ extensions="%php5FileExtension"
+ class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
+ id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
+ </provider>
+ </extension>
+ <extension
+ point="org.eclipse.ui.editors.documentProviders">
+ <provider
+ extensions="%moduleFileExtension"
+ class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
+ id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
+ </provider>
+ </extension>
+ <extension
+ point="org.eclipse.ui.editors.documentProviders">
+ <provider
extensions="%incFileExtension"
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
@@ -1303,7 +1576,7 @@
id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
</provider>
</extension>
- <extension
+ <extension
point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%htmlFileExtension"
@@ -1322,19 +1595,19 @@
<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> -->
+ <!-- <extension
point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%tplFileExtension"
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
</provider>
- </extension>
+ </extension> -->
<extension
point="org.eclipse.ui.views">
<category
@@ -1348,114 +1621,6 @@
class="net.sourceforge.phpeclipse.views.PHPConsole"
id="net.sourceforge.phpeclipse.views.phpconsoleview">
</view>
- <view
- name="%phpBrowserView"
- icon="icons/obj16/php.gif"
- category="net.sourceforge.phpeclipse.views.category"
- class="net.sourceforge.phpeclipse.views.browser.BrowserView"
- id="net.sourceforge.phpeclipse.views.browser">
- </view>
- </extension>
-
-<!-- =========================================================================== -->
-<!-- PHPDT/UI Editor Key Bindings -->
-<!-- =========================================================================== -->
- <extension
- point="org.eclipse.ui.acceleratorSets">
- <acceleratorSet
- scopeId="org.eclipse.ui.textEditorScope"
- configurationId="org.eclipse.ui.emacsAcceleratorConfiguration">
-<!-- edit -->
- <accelerator
- key="Ctrl+Shift+P"
- id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket">
- </accelerator>
- <accelerator
- key="Ctrl+1"
- id="org.eclipse.ui.edit.text.contentAssist.proposals">
- </accelerator>
-<!-- source -->
- <accelerator
- key="Ctrl+/"
- id="net.sourceforge.phpeclipse.phpeditor.comment">
- </accelerator>
- <accelerator
- key="Ctrl+\"
- id="net.sourceforge.phpeclipse.phpeditor.uncomment">
- </accelerator>
- <accelerator
- key="Ctrl+Shift+F"
- id="net.sourceforge.phpeclipse.phpeditor.format">
- </accelerator>
- <accelerator
- key="Ctrl+O"
- id="net.sourceforge.phpeclipse.ui.edit.text.php.show.outline">
- </accelerator>
- <accelerator
- key="Ctrl+F3"
- id="net.sourceforge.phpeclipse.ui.navigate.php.open.structure">
- </accelerator>
- </acceleratorSet>
- <acceleratorSet
- scopeId="org.eclipse.ui.textEditorScope"
- configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
-<!-- edit -->
- <accelerator
- key="Ctrl+Shift+P"
- id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket">
- </accelerator>
- <accelerator
- key="Ctrl+Space"
- id="org.eclipse.ui.edit.text.contentAssist.proposals">
- </accelerator>
-<!-- source -->
- <accelerator
- key="Ctrl+/"
- id="net.sourceforge.phpeclipse.phpeditor.comment">
- </accelerator>
- <accelerator
- key="Ctrl+\"
- id="net.sourceforge.phpeclipse.phpeditor.uncomment">
- </accelerator>
- <accelerator
- key="Ctrl+Shift+F"
- id="net.sourceforge.phpeclipse.phpeditor.format">
- </accelerator>
- <accelerator
- key="Ctrl+F3"
- id="net.sourceforge.phpeclipse.ui.navigate.php.open.structure">
- </accelerator>
- <accelerator
- key="Ctrl+O"
- id="net.sourceforge.phpeclipse.ui.edit.text.php.show.outline">
- </accelerator>
- </acceleratorSet>
- <acceleratorSet
- scopeId="org.eclipse.ui.textEditorScope"
- configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
-<!-- edit -->
- <accelerator
- platform="carbon"
- key="Command+Shift+P"
- id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket">
- </accelerator>
- <accelerator
- platform="carbon"
- key="Command+1"
- id="org.eclipse.ui.edit.text.contentAssist.proposals">
- </accelerator>
-<!-- source -->
- <accelerator
- platform="carbon"
- key="Command+/"
- id="net.sourceforge.phpeclipse.phpeditor.comment">
- </accelerator>
- <accelerator
- platform="carbon"
- key="Command+\"
- id="net.sourceforge.phpeclipse.phpeditor.uncomment">
- </accelerator>
- </acceleratorSet>
</extension>
<!-- external tools -->
@@ -1683,4 +1848,50 @@
preferencesClass="net.sourceforge.phpdt.internal.ui.text.folding.DefaultJavaFoldingPreferenceBlock">
</provider>
</extension>
+
+<!-- =========================================================================== -->
+<!-- Filter Support -->
+<!-- =========================================================================== -->
+ <extension
+ point="net.sourceforge.phpeclipse.phpElementFilters">
+<!-- Outline Page -->
+ <filter
+ targetId="net.sourceforge.phpeclipse.JavaOutlinePage"
+ name="%HideImportDeclaration.label"
+ enabled="false"
+ description="%HideImportDeclaration.description"
+ class="net.sourceforge.phpdt.internal.ui.filters.ImportDeclarationFilter"
+ id="net.sourceforge.phpeclipse.JavaOutlinePage.ImportDeclarationFilter">
+ </filter>
+ </extension>
+
+<!-- =========================================================================== -->
+<!-- Templates -->
+<!-- =========================================================================== -->
+ <extension
+ point="org.eclipse.ui.editors.templates">
+ <contextType
+ name="%templates.php.contextType.name"
+ class="net.sourceforge.phpdt.internal.corext.template.php.JavaContextType"
+ id="java">
+ </contextType>
+ <contextType
+ name="%templates.phpdoc.contextType.name"
+ class="net.sourceforge.phpdt.internal.corext.template.php.JavaDocContextType"
+ id="javadoc">
+ </contextType>
+ <contextType
+ name="%templates.html.contextType.name"
+ class="net.sourceforge.phpdt.internal.corext.template.php.HTMLContextType"
+ id="javadoc">
+ </contextType>
+ <include
+ file="templates/default-templates.xml"
+ translations="templates/default-templates.properties">
+ </include>
+ <include
+ file="templates/default-codetemplates.xml"
+ translations="templates/default-templates.properties">
+ </include>
+ </extension>
</plugin>