Skip to content

Commit

Permalink
Automate JLS selection toggles in AST view
Browse files Browse the repository at this point in the history 
Rather then explicitly listing versions cycle through the AST supported
versions and create for toggle for each of them.
Mnemonics for these toggles are removed now but they have been broken
already as there have been conflicts (8 and 18, 9 and 19, 10 and 20, 11
and 21, 12 and 22, 13 and 23) rendering mnemonics useless.
This has the good side effect of removing the need to touch AST view for
new Java version support.
  • Loading branch information
@akurtakov
akurtakov committed Jan 23, 2025
1 parent 04fbb18 commit 9a32e95
Showing 1 changed file with 4 additions and 38 deletions.
42 changes: 4 additions & 38 deletions org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,28 +132,9 @@

import org.eclipse.jdt.ui.JavaUI;

import org.eclipse.jdt.internal.ui.util.ASTHelper;


public class ASTView extends ViewPart implements IShowInSource, IShowInTargetList {

private static final int JLS23= ASTHelper.JLS23;
private static final int JLS22= ASTHelper.JLS22;
private static final int JLS21= ASTHelper.JLS21;
private static final int JLS20= ASTHelper.JLS20;
private static final int JLS19= ASTHelper.JLS19;
private static final int JLS18= ASTHelper.JLS18;
private static final int JLS17= ASTHelper.JLS17;
private static final int JLS16= ASTHelper.JLS16;
private static final int JLS15= ASTHelper.JLS15;
private static final int JLS14= ASTHelper.JLS14;
private static final int JLS13= ASTHelper.JLS13;
private static final int JLS12= ASTHelper.JLS12;
private static final int JLS11= ASTHelper.JLS11;
private static final int JLS10= ASTHelper.JLS10;
private static final int JLS9= ASTHelper.JLS9;
private static final int JLS8= ASTHelper.JLS8;

private class ASTViewSelectionProvider implements ISelectionProvider {
ListenerList<ISelectionChangedListener> fListeners= new ListenerList<>(ListenerList.IDENTITY);

Expand Down Expand Up @@ -456,7 +437,7 @@ private boolean isInSwitchExpression(YieldStatement node) {
private Action fAddToTrayAction;
private Action fDeleteAction;

private ASTLevelToggle[] fASTVersionToggleActions;
private List<ASTLevelToggle> fASTVersionToggleActions = new ArrayList<>();
private int fCurrentASTLevel;

private ASTInputKindAction[] fASTInputKindActions;
Expand Down Expand Up @@ -1106,24 +1087,9 @@ public void run() {
fLinkWithEditor.setActionDefinitionId(IWorkbenchCommandConstants.NAVIGATE_TOGGLE_LINK_WITH_EDITOR);
ASTViewImages.setImageDescriptors(fLinkWithEditor, ASTViewImages.LINK_WITH_EDITOR);

fASTVersionToggleActions= new ASTLevelToggle[] {
new ASTLevelToggle("AST Level &8 (8)", JLS8), //$NON-NLS-1$
new ASTLevelToggle("AST Level &9 (9)", JLS9), //$NON-NLS-1$
new ASTLevelToggle("AST Level 1&0 (10)", JLS10), //$NON-NLS-1$
new ASTLevelToggle("AST Level 1&1 (11)", JLS11), //$NON-NLS-1$
new ASTLevelToggle("AST Level 1&2 (12)", JLS12), //$NON-NLS-1$
new ASTLevelToggle("AST Level 1&3 (13)", JLS13), //$NON-NLS-1$
new ASTLevelToggle("AST Level 1&4 (14)", JLS14), //$NON-NLS-1$
new ASTLevelToggle("AST Level 1&5 (15)", JLS15), //$NON-NLS-1$
new ASTLevelToggle("AST Level 1&6 (16)", JLS16), //$NON-NLS-1$
new ASTLevelToggle("AST Level 1&7 (17)", JLS17), //$NON-NLS-1$
new ASTLevelToggle("AST Level 1&8 (18)", JLS18), //$NON-NLS-1$
new ASTLevelToggle("AST Level 1&9 (19)", JLS19), //$NON-NLS-1$
new ASTLevelToggle("AST Level 2&0 (20)", JLS20), //$NON-NLS-1$
new ASTLevelToggle("AST Level 2&1 (21)", JLS21), //$NON-NLS-1$
new ASTLevelToggle("AST Level 2&2 (22)", JLS22), //$NON-NLS-1$
new ASTLevelToggle("AST Level 2&3 (23)", JLS23), //$NON-NLS-1$
};
for (Integer version : AST.getAllSupportedVersions()) {
fASTVersionToggleActions.add(new ASTLevelToggle("AST Level "+version, version));
}

fAddToTrayAction= new Action() {
@Override
Expand Down

0 comments on commit 9a32e95

Please sign in to comment.