diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/GroovyResolveResult.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/GroovyResolveResult.java index e3ce5dddfe88..5bfc8d09dd3d 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/GroovyResolveResult.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/GroovyResolveResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -45,14 +45,17 @@ public interface GroovyResolveResult extends ResolveResult { SpreadState getSpreadState(); GroovyResolveResult EMPTY_RESULT = new GroovyResolveResult() { + @Override public boolean isAccessible() { return false; } + @Override public PsiElement getCurrentFileResolveContext() { return null; } + @Override public boolean isStaticsOK() { return true; } @@ -62,16 +65,19 @@ public interface GroovyResolveResult extends ResolveResult { return false; } + @Override @NotNull public PsiSubstitutor getSubstitutor() { return PsiSubstitutor.EMPTY; } + @Override @Nullable public PsiElement getElement() { return null; } + @Override public boolean isValidResult() { return false; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java index d9a5e7720964..4f3a0e8fb609 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java @@ -73,7 +73,7 @@ public class TypesUtil { @NonNls public static final Map ourQNameToUnboxed = new HashMap(); - public static final PsiPrimitiveType[] PRIMITIVES = new PsiPrimitiveType[]{ + public static final PsiPrimitiveType[] PRIMITIVES = { PsiType.BYTE, PsiType.CHAR, PsiType.DOUBLE,