Projects >> intellij-community >>ad37748c4642e1d1221c5e651c148c6bee0a9e10

Chunk
Conflicting content 
   */
  public static boolean isCalleeShortCut(@NotNull final PyCallExpression call,
                                         @NotNull final FQNamesProvider function,
<<<<<<< HEAD
                                         @NotNull final TypeEvalContext context) {
=======
                                         @Nullable final TypeEvalContext context) {
    if (context == null) {
      return call.isCallee(function);
    }
>>>>>>> 92a04e100068305513ab0dc0dd6f0db5976f9008
    final PyExpression callee = call.getCallee();
    if (callee == null) {
      return false;
Solution content 
   */
  public static boolean isCalleeShortCut(@NotNull final PyCallExpression call,
                                         @NotNull final FQNamesProvider function,
                                         @NotNull final TypeEvalContext context) {
    final PyExpression callee = call.getCallee();
    if (callee == null) {
      return false;
File
NameResolverTools.java
Developer's decision
Version 1
Kind of conflict
If statement
Variable
Chunk
Conflicting content 
      @Nullable
      @Override
  @NotNull
  @Override
  public List findAttributes() {
<<<<<<< HEAD
    /**
     * TODO: This method if insanely heavy since it unstubs foreign files.
     * Need to save stubs and use them somehow.
     *
     */
=======
>>>>>>> 92a04e100068305513ab0dc0dd6f0db5976f9008
    return CachedValuesManager.getManager(getProject()).getCachedValue(this, ATTRIBUTES_KEY, new CachedValueProvider>() {
Solution content 
  @NotNull
  @Override
  public List findAttributes() {
    /**
     * TODO: This method if insanely heavy since it unstubs foreign files.
     * Need to save stubs and use them somehow.
     *
     */
    return CachedValuesManager.getManager(getProject()).getCachedValue(this, ATTRIBUTES_KEY, new CachedValueProvider>() {
      @Nullable
      @Override
File
PyFunctionImpl.java
Developer's decision
Version 1
Kind of conflict
Comment