Skip to content

Commit 07be639

Browse files
author
angelozerr
committed
Add (empty) Refactor/Rename action in the menu. See
#28
1 parent 783e31e commit 07be639

22 files changed

+2676
-120
lines changed

‎eclipse/jsdt/ts.eclipse.ide.jsdt.ui/META-INF/MANIFEST.MF

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ Require-Bundle: org.eclipse.core.runtime,
3131
org.eclipse.wst.jsdt.debug.core,
3232
org.eclipse.ui.views,
3333
org.eclipse.core.filesystem,
34-
org.eclipse.ui.forms
34+
org.eclipse.ui.forms,
35+
org.eclipse.ltk.core.refactoring,
36+
org.eclipse.ltk.ui.refactoring
3537
Bundle-ActivationPolicy: lazy
3638
Bundle-Activator: ts.eclipse.ide.jsdt.internal.ui.JSDTTypeScriptUIPlugin
3739
Import-Package: com.eclipsesource.json;version="[0.9.4,0.9.5)"

‎eclipse/jsdt/ts.eclipse.ide.jsdt.ui/plugin.properties

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,19 @@ ActionDefinition.removeBlockComment.description= Remove the block comment enclos
8888
ActionDefinition.show.outline.name= Quick Outline
8989
ActionDefinition.show.outline.description= Show the quick outline for the editor input
9090

91+
# Refactoring
92+
Refactoring.menu.label= Refac&tor
93+
94+
category.refactoring.name=Refactor - TypeScript
95+
category.refactoring.description=TypeScript Refactoring Actions
96+
97+
ActionDefinition.refactorQuickMenu.name= Show Refactor Quick Menu
98+
ActionDefinition.refactorQuickMenu.description= Shows the refactor quick menu
99+
100+
ActionDefinition.renameElement.name= Rename - Refactoring
101+
ActionDefinition.renameElement.description= Rename the selected element
102+
Refactoring.renameAction.label=Re&name...
103+
91104
##########################################################################
92105
# Debugging support
93106
##########################################################################

‎eclipse/jsdt/ts.eclipse.ide.jsdt.ui/plugin.xml

Lines changed: 88 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,40 @@
186186
visible="false"
187187
id="ts.eclipse.ide.jsdt.ui.CodingActionSet">
188188
<!-- =========================================================================== -->
189+
<!-- Refactoring Menu -->
190+
<!-- =========================================================================== -->
191+
<menu
192+
label="%Refactoring.menu.label"
193+
path="edit"
194+
id="ts.eclipse.ide.jsdt.ui.refactoring.menu">
195+
<separator name="undoRedoGroup"/>
196+
<separator name="reorgGroup"/>
197+
<separator name="codingGroup"/>
198+
<separator name="reorgGroup2"/>
199+
<separator name="typeGroup"/>
200+
<separator name="typeGroup2"/>
201+
<separator name="codingGroup2"/>
202+
<separator name="typeGroup3"/>
203+
<separator name="scriptGroup"/>
204+
</menu>
205+
206+
<!-- reorg group -->
207+
<!--<action
208+
definitionId="org.eclipse.jdt.ui.edit.text.java.move.element"
209+
label="%Refactoring.moveAction.label"
210+
retarget="true"
211+
menubarPath="org.eclipse.jdt.ui.refactoring.menu/reorgGroup"
212+
id="org.eclipse.jdt.ui.actions.Move">
213+
</action>-->
214+
<action
215+
definitionId="ts.eclipse.ide.jsdt.ui.edit.text.java.rename.element"
216+
label="%Refactoring.renameAction.label"
217+
retarget="true"
218+
menubarPath="ts.eclipse.ide.jsdt.ui.refactoring.menu/reorgGroup"
219+
id="ts.eclipse.ide.jsdt.ui.actions.Rename">
220+
</action>
221+
222+
<!-- =========================================================================== -->
189223
<!-- Source Menu -->
190224
<!-- =========================================================================== -->
191225
<menu
@@ -323,7 +357,25 @@
323357
name="%category.source.name"
324358
description="%category.source.description"
325359
id="ts.eclipse.ide.jsdt.ui.category.source">
326-
</category>
360+
</category>
361+
<category
362+
name="%category.refactoring.name"
363+
description="%category.refactoring.description"
364+
id="ts.eclipse.ide.jsdt.ui.category.refactoring">
365+
</category>
366+
<!-- refactoring -->
367+
<command
368+
name="%ActionDefinition.refactorQuickMenu.name"
369+
description="%ActionDefinition.refactorQuickMenu.description"
370+
categoryId="ts.eclipse.ide.jsdt.ui.category.refactoring"
371+
id="ts.eclipse.ide.jsdt.ui.edit.text.java.refactor.quickMenu">
372+
</command>
373+
<command
374+
name="%ActionDefinition.renameElement.name"
375+
description="%ActionDefinition.renameElement.description"
376+
categoryId="ts.eclipse.ide.jsdt.ui.category.refactoring"
377+
id="ts.eclipse.ide.jsdt.ui.edit.text.java.rename.element">
378+
</command>
327379
<!-- edit -->
328380
<command
329381
name="%ActionDefinition.format.name"
@@ -459,7 +511,41 @@
459511
contextId="ts.eclipse.ide.jsdt.ui.typeScriptViewScope"
460512
commandId="ts.eclipse.ide.jsdt.ui.edit.text.java.show.outline"
461513
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
462-
514+
<!-- refactoring -->
515+
<key
516+
sequence="M2+M3+T"
517+
contextId="ts.eclipse.ide.jsdt.ui.typeScriptViewScope"
518+
commandId="ts.eclipse.ide.jsdt.ui.edit.text.java.refactor.quickMenu"
519+
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
520+
<key
521+
platform="carbon"
522+
sequence="M2+M3+T"
523+
contextId="ts.eclipse.ide.jsdt.ui.typeScriptViewScope"
524+
commandId=""
525+
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
526+
<key
527+
platform="carbon"
528+
sequence="COMMAND+ALT+T"
529+
contextId="ts.eclipse.ide.jsdt.ui.typeScriptViewScope"
530+
commandId="ts.eclipse.ide.jsdt.ui.edit.text.java.refactor.quickMenu"
531+
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
532+
<key
533+
sequence="M2+M3+R"
534+
contextId="ts.eclipse.ide.jsdt.ui.typeScriptViewScope"
535+
commandId="ts.eclipse.ide.jsdt.ui.edit.text.java.rename.element"
536+
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
537+
<key
538+
platform="carbon"
539+
sequence="M2+M3+R"
540+
contextId="ts.eclipse.ide.jsdt.ui.typeScriptViewScope"
541+
commandId=""
542+
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
543+
<key
544+
platform="carbon"
545+
sequence="COMMAND+ALT+R"
546+
contextId="ts.eclipse.ide.jsdt.ui.typeScriptViewScope"
547+
commandId="ts.eclipse.ide.jsdt.ui.edit.text.java.rename.element"
548+
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
463549
</extension>
464550

465551
<!-- I don't know why, but startup should be done, otherwise TypeScriptCompletionProposalComputer is not registered? -->

‎eclipse/jsdt/ts.eclipse.ide.jsdt.ui/src/ts/eclipse/ide/jsdt/internal/ui/JSDTTypeScriptUIMessages.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,25 @@ public class JSDTTypeScriptUIMessages extends NLS {
104104
public static String EditTemplateDialog_select_all;
105105
public static String EditTemplateDialog_content_assist;
106106

107+
// Refactoring
108+
public static String RefactorMenu_label;
109+
public static String RenameAction_text;
110+
public static String RefactorActionGroup_no_refactoring_available;
111+
public static String RenameInformationPopup_delayJobName;
112+
public static String RenameInformationPopup_EnterNewName;
113+
public static String RenameInformationPopup_menu;
114+
public static String RenameInformationPopup_OpenDialog;
115+
public static String RenameInformationPopup_OptionsLink;
116+
public static String RenameInformationPopup_preferences;
117+
public static String RenameInformationPopup_Preview;
118+
public static String RenameInformationPopup_RenameInWorkspace;
119+
public static String RenameInformationPopup_snap_bottom_right;
120+
public static String RenameInformationPopup_snap_over_left;
121+
public static String RenameInformationPopup_snap_over_right;
122+
public static String RenameInformationPopup_snap_under_left;
123+
public static String RenameInformationPopup_snap_under_right;
124+
public static String RenameInformationPopup_SnapTo;
125+
107126
public static ResourceBundle getResourceBundle() {
108127
try {
109128
if (fResourceBundle == null)

‎eclipse/jsdt/ts.eclipse.ide.jsdt.ui/src/ts/eclipse/ide/jsdt/internal/ui/JSDTTypeScriptUIMessages.properties

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,23 @@ EditTemplateDialog_copy=&Copy
109109
EditTemplateDialog_paste=&Paste
110110
EditTemplateDialog_select_all=Select &All
111111
EditTemplateDialog_autoinsert=Auto&matically insert
112-
EditTemplateDialog_content_assist=Insert &Variable...
112+
EditTemplateDialog_content_assist=Insert &Variable...
113+
114+
# Refactoring
115+
RefactorMenu_label=Refac&tor
116+
RenameAction_text=Re&name...
117+
RefactorActionGroup_no_refactoring_available= <no refactoring available>
118+
RenameInformationPopup_SnapTo=&Snap To
119+
RenameInformationPopup_snap_under_left=&Under Left
120+
RenameInformationPopup_snap_under_right=U&nder Right
121+
RenameInformationPopup_snap_over_left=&Over Left
122+
RenameInformationPopup_snap_over_right=O&ver Right
123+
RenameInformationPopup_snap_bottom_right=&Bottom Right
124+
RenameInformationPopup_menu=Menu
125+
RenameInformationPopup_RenameInWorkspace=&Refactor
126+
RenameInformationPopup_Preview=Pre&view...
127+
RenameInformationPopup_OpenDialog=&Open Rename Dialog...
128+
RenameInformationPopup_OptionsLink=\ <a>Options...</a>
129+
RenameInformationPopup_preferences=&Preferences...
130+
RenameInformationPopup_EnterNewName=Press {0} to refactor.
131+
RenameInformationPopup_delayJobName=delayed RenameInformationPopup

‎eclipse/jsdt/ts.eclipse.ide.jsdt.ui/src/ts/eclipse/ide/jsdt/internal/ui/JSDTTypeScriptUIPlugin.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import org.eclipse.core.runtime.IStatus;
1717
import org.eclipse.core.runtime.Status;
18+
import org.eclipse.jface.dialogs.IDialogSettings;
1819
import org.eclipse.jface.preference.IPreferenceStore;
1920
import org.eclipse.jface.text.templates.ContextTypeRegistry;
2021
import org.eclipse.jface.text.templates.persistence.TemplateStore;
@@ -205,4 +206,19 @@ public IPreferenceStore getCombinedPreferenceStore() {
205206
return fCombinedPreferenceStore;
206207
}
207208

209+
/**
210+
* Returns a section in the Java plugin's dialog settings. If the section doesn't exist yet, it is created.
211+
*
212+
* @param name the name of the section
213+
* @return the section of the given name
214+
* @since 3.2
215+
*/
216+
public IDialogSettings getDialogSettingsSection(String name) {
217+
IDialogSettings dialogSettings= getDialogSettings();
218+
IDialogSettings section= dialogSettings.getSection(name);
219+
if (section == null) {
220+
section= dialogSettings.addNewSection(name);
221+
}
222+
return section;
223+
}
208224
}

0 commit comments

Comments
 (0)