/*
 * Copyright 2000-2017 JetBrains s.r.o.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.intellij.debugger.streams.trace.impl.handler.type;

import com.intellij.psi.CommonClassNames;
import com.intellij.psi.PsiType;
import com.intellij.psi.util.InheritanceUtil;
import org.jetbrains.annotations.NotNull;

/**
 * @author Vitaliy.Bibaev
 */
public class GenericTypeUtil {

  @NotNull
  public static GenericType fromStreamPsiType(@NotNull PsiType streamPsiType) {
    if (InheritanceUtil.isInheritor(streamPsiType, CommonClassNames.JAVA_UTIL_STREAM_INT_STREAM)) return GenericType.INT;
    if (InheritanceUtil.isInheritor(streamPsiType, CommonClassNames.JAVA_UTIL_STREAM_LONG_STREAM)) return GenericType.LONG;
    if (InheritanceUtil.isInheritor(streamPsiType, CommonClassNames.JAVA_UTIL_STREAM_DOUBLE_STREAM)) return GenericType.DOUBLE;
    if (PsiType.VOID.equals(streamPsiType)) return GenericType.VOID;

    return GenericType.OBJECT;
  }

  @NotNull
  public static GenericType fromPsiType(@NotNull PsiType type) {
    if (PsiType.VOID.equals(type)) return GenericType.VOID;
    if (PsiType.INT.equals(type)) return GenericType.INT;
    if (PsiType.DOUBLE.equals(type)) return GenericType.DOUBLE;
    if (PsiType.LONG.equals(type)) return GenericType.LONG;
    if (PsiType.BOOLEAN.equals(type)) return GenericType.BOOLEAN;
    return GenericType.OBJECT;
  }
}

@@ -779,16 +779,100 @@
 ceUtil;%0A
+import com.intellij.psi.util.TypeConversionUtil;%0Aimport one.util.streamex.StreamEx;%0A
 import o
@@ -906,16 +906,39 @@
 tNull;%0A%0A
+import java.util.Set;%0A%0A
 /**%0A * @
@@ -993,16 +993,208 @@
 peUtil %7B
+%0A  private static final Set%3CGenericType%3E OPTIONAL_TYPES = StreamEx%0A    .of(GenericType.OPTIONAL, GenericType.OPTIONAL_INT, GenericType.OPTIONAL_LONG, GenericType.OPTIONAL_DOUBLE)%0A    .toSet();
 %0A%0A  @Not
@@ -2142,16 +2142,596 @@
 OOLEAN;%0A
+    return new ClassTypeImpl(TypeConversionUtil.erasure(type).getCanonicalText());%0A  %7D%0A%0A  public static boolean isOptional(@NotNull GenericType type) %7B%0A    return OPTIONAL_TYPES.contains(type);%0A  %7D%0A%0A  @NotNull%0A  public static GenericType unwrapOptional(@NotNull GenericType type) %7B%0A    assert isOptional(type);%0A%0A    if (type.equals(GenericType.OPTIONAL_INT)) %7B%0A      return GenericType.INT;%0A    %7D%0A%0A    if (type.equals(GenericType.OPTIONAL_LONG)) %7B%0A      return GenericType.DOUBLE;%0A    %7D%0A%0A    if (type.equals(GenericType.OPTIONAL_DOUBLE)) %7B%0A      return GenericType.DOUBLE;%0A    %7D%0A%0A
     retu

Add utility methods to check that a GenericType is an Optional