Remove OpenDeclareType & OpenTypeHierarchy for Primitive Types & Arrays (#666)

Removed the OpenDeclareType & OpenTypeHierarchy for the primitive types
and the arrays from from the variable view

Fixes: #665

Author: subyssurendran666

org.eclipse.jdt.debug.ui/plugin.xml

@@ -706,6 +706,31 @@
                id="org.eclipse.jdt.debug.ui.actions.OpenVariableConcreteType">
          </action>
       </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.jdt.debug.core.IJavaVariable"
+            id="org.eclipse.jdt.debug.ui.FilteredJavaVariableActions">
+         <filter
+               name="PrimitiveVariableActionFilter"
+               value="isPrimitive">
+         </filter>
+         <action
+               label="%openDeclLocalVarNavigation.label"
+               helpContextId="open_variable_declared_type_hierarchy_action_context"
+               tooltip="%openDeclLocalVarNavigation.tooltip"
+               class="org.eclipse.jdt.internal.debug.ui.actions.NavigateToVarDeclAction"
+               menubarPath="emptyNavigationGroup"
+               enablesFor="1"
+               id="org.eclipse.jdt.debug.ui.actions.OpenDeclLocalVarNavigation">
+         </action>
+         <visibility>
+            <not>
+               <objectState
+                     name="JavaVariableFilter"
+                     value="isLocalVariableValue">
+               </objectState>
+            </not>
+         </visibility>
+      </objectContribution>
       <objectContribution
             objectClass="org.eclipse.jdt.debug.core.IJavaVariable"
             id="org.eclipse.jdt.debug.ui.FilteredJavaVariableActions">
@@ -747,20 +772,11 @@
                enablesFor="1"
                id="org.eclipse.jdt.debug.ui.actions.OpenVariableDeclaredType">
          </action>
-         <action
-               label="%openDeclLocalVarNavigation.label"
-               helpContextId="open_variable_declared_type_hierarchy_action_context"
-               tooltip="%openDeclLocalVarNavigation.tooltip"
-               class="org.eclipse.jdt.internal.debug.ui.actions.NavigateToVarDeclAction"
-               menubarPath="emptyNavigationGroup"
-               enablesFor="1"
-               id="org.eclipse.jdt.debug.ui.actions.OpenDeclLocalVarNavigation">
-         </action>
          <visibility>
             <not>
                <objectState
                      name="JavaVariableFilter"
-                     value="isLocalVariableValue">
+                     value="isNonPrimitiveNonArray">
                </objectState>
             </not>
          </visibility>

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaVarActionFilter.java

@@ -31,6 +31,7 @@
 import org.eclipse.jdt.internal.debug.core.model.JDINullValue;
 import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
 import org.eclipse.jdt.internal.debug.core.model.JDIPlaceholderValue;
+import org.eclipse.jdt.internal.debug.core.model.JDIPrimitiveValue;
 import org.eclipse.jdt.internal.debug.core.model.JDIReferenceListVariable;
 import org.eclipse.jdt.internal.debug.ui.display.JavaInspectExpression;
 import org.eclipse.ui.IActionFilter;
@@ -48,6 +49,7 @@ public class JavaVarActionFilter implements IActionFilter {
 	 * The set or primitive types
 	 */
 	private static final Set<String> fgPrimitiveTypes = initPrimitiveTypes();
+	private static final Set<String> fgArrays = initArrays();
 
 	/**
 	 * The predefined set of primitive types
@@ -67,9 +69,29 @@ private static Set<String> initPrimitiveTypes() {
 		return set;
 	}
 
+	/**
+	 * The predefined set of primitive arrays
+	 *
+	 * @return the set of predefined primitive arrays types
+	 */
+	private static Set<String> initArrays() {
+		HashSet<String> set = new HashSet<>(8);
+		set.add("short[]"); //$NON-NLS-1$
+		set.add("int[]"); //$NON-NLS-1$
+		set.add("long[]"); //$NON-NLS-1$
+		set.add("float[]"); //$NON-NLS-1$
+		set.add("double[]"); //$NON-NLS-1$
+		set.add("boolean[]"); //$NON-NLS-1$
+		set.add("byte[]"); //$NON-NLS-1$
+		set.add("char[]"); //$NON-NLS-1$
+		return set;
+	}
+
 	/**
 	 * Determines if the declared value is the same as the concrete value
-	 * @param var the variable to inspect
+	 *
+	 * @param var
+	 *            the variable to inspect
 	 * @return true if the types are the same, false otherwise
 	 */
 	protected boolean isDeclaredSameAsConcrete(IJavaVariable var) {
@@ -211,6 +233,10 @@ else if (value.equals("isValuePrimitive")) { //$NON-NLS-1$
 					if (value.equals("isLocalVariableValue")) { //$NON-NLS-1$
 						return !(var instanceof JDILocalVariable);
 					}
+					if (value.equals("isNonPrimitiveNonArray")) { //$NON-NLS-1$
+						boolean primArray = fgArrays.contains(var.getJavaType().getName());
+						return (varValue instanceof JDIPrimitiveValue || primArray);
+					}
 				}
 				else if (name.equals("ConcreteVariableActionFilter") && value.equals("isConcrete")) { //$NON-NLS-1$ //$NON-NLS-2$
 					return isDeclaredSameAsConcrete(var);
@@ -279,4 +305,4 @@ else if (name.equals("DetailFormatterFilter")) { //$NON-NLS-1$
 	protected boolean isInstanceRetrievalAvailable(IJavaVariable var) {
 		return ((IJavaDebugTarget)var.getDebugTarget()).supportsInstanceRetrieval() && !(var instanceof JDIReferenceListVariable);
 	}
-}
+}